| Index: pkg/polymer/lib/src/build/common.dart
|
| diff --git a/pkg/polymer/lib/src/build/common.dart b/pkg/polymer/lib/src/build/common.dart
|
| index fc2acf5ab0164f4a08f4a01c72274f1bd8a9fad9..1ae2a90de1f376984d7741c26ff5cec0b26b6046 100644
|
| --- a/pkg/polymer/lib/src/build/common.dart
|
| +++ b/pkg/polymer/lib/src/build/common.dart
|
| @@ -36,10 +36,9 @@ Document _parseHtml(String contents, String sourcePath, TransformLogger logger,
|
|
|
| /** Additional options used by polymer transformers */
|
| class TransformOptions {
|
| - String currentPackage;
|
| List<String> entryPoints;
|
|
|
| - TransformOptions([this.currentPackage, entryPoints])
|
| + TransformOptions([entryPoints])
|
| : entryPoints = entryPoints == null ? null
|
| : entryPoints.map(_systemToAssetPath).toList();
|
|
|
| @@ -48,11 +47,11 @@ class TransformOptions {
|
| if (id.extension != '.html') return false;
|
|
|
| // Note: [id.path] is a relative path from the root of a package.
|
| - if (currentPackage == null || entryPoints == null) {
|
| + if (entryPoints == null) {
|
| return id.path.startsWith('web/') || id.path.startsWith('test/');
|
| }
|
|
|
| - return id.package == currentPackage && entryPoints.contains(id.path);
|
| + return entryPoints.contains(id.path);
|
| }
|
| }
|
|
|
| @@ -71,11 +70,12 @@ abstract class PolymerTransformer {
|
|
|
| Future<Document> readAsHtml(AssetId id, Transform transform) {
|
| var primaryId = transform.primaryInput.id;
|
| - var url = (id.package == primaryId.package) ? id.path
|
| + bool samePackage = id.package == primaryId.package;
|
| + var url = samePackage ? id.path
|
| : assetUrlFor(id, primaryId, transform.logger, allowAssetUrl: true);
|
| return transform.readInputAsString(id).then((content) {
|
| return _parseHtml(content, url, transform.logger,
|
| - checkDocType: options.isHtmlEntryPoint(id));
|
| + checkDocType: samePackage && options.isHtmlEntryPoint(id));
|
| });
|
| }
|
|
|
|
|