Chromium Code Reviews| Index: pkg/polymer/lib/src/transform/script_compactor.dart |
| diff --git a/pkg/polymer/lib/src/transform/script_compactor.dart b/pkg/polymer/lib/src/transform/script_compactor.dart |
| index 2fcb1c6f8861fb356100dda99cd0cdaba55daa81..1fb7f486601502444a0a4507f6d89ba8cd8776c3 100644 |
| --- a/pkg/polymer/lib/src/transform/script_compactor.dart |
| +++ b/pkg/polymer/lib/src/transform/script_compactor.dart |
| @@ -29,13 +29,13 @@ import 'common.dart'; |
| */ |
| class ScriptCompactor extends Transformer { |
| /** Only run on entrypoint .html files under web or test. */ |
| - Future<bool> isPrimary(Asset input) => isHtmlInWebOrTest(input.id); |
| + Future<bool> isPrimary(Asset input) => |
| + new Future.value(isHtmlInWebOrTest(input.id)); |
| Future apply(Transform transform) { |
| var id = transform.primaryInput.id; |
| var logger = transform.logger; |
| - return transform.primaryInput.readAsString().then((content) { |
| - var document = parseHtml(content, id.path, logger); |
| + return readPrimaryAsHtml(transform).then((document) { |
| var libraries = []; |
| bool changed = false; |
| var dartLoaderTag = null; |
| @@ -68,7 +68,7 @@ class ScriptCompactor extends Transformer { |
| } |
| if (!changed) { |
| - transform.addOutput(new Asset.fromString(id, content)); |
| + transform.addOutput(transform.primaryInput); |
| return; |
| } |
| @@ -87,7 +87,7 @@ class ScriptCompactor extends Transformer { |
| document.body.insertBefore(bootstrapScript, dartLoaderTag); |
| } |
| - var urls = libraries.map((id) => importUrlFor(id, bootstrapId, logger)) |
| + var urls = libraries.map((id) => assetUrlFor(id, bootstrapId, logger)) |
|
Jennifer Messerly
2013/09/04 03:13:27
as noted earlier, I don't think we want Dart files
Siggi Cherem (dart-lang)
2013/09/04 17:57:27
good point. added a check for that here.
|
| .where((url) => url != null).toList(); |
| var buffer = new StringBuffer()..write(_header); |
| for (int i = 0; i < urls.length; i++) { |
| @@ -101,27 +101,6 @@ class ScriptCompactor extends Transformer { |
| transform.addOutput(new Asset.fromString(id, document.outerHtml)); |
| }); |
| } |
| - |
| - /** |
| - * Generate the import url for a file described by [id], referenced by a file |
| - * with [sourceId]. |
| - */ |
| - String importUrlFor(AssetId id, AssetId sourceId, TransformLogger logger) { |
| - // use package: urls if possible |
| - if (id.path.startsWith('lib/')) { |
| - return 'package:${id.package}/${id.path.substring(4)}'; |
| - } |
| - |
| - // Use relative urls only if it's possible. |
| - if (id.package != sourceId.package) { |
| - logger.error("don't know how to import $id from $sourceId"); |
| - return null; |
| - } |
| - |
| - var builder = path.url; |
| - return builder.relative(builder.join('/', id.path), |
| - from: builder.join('/', builder.dirname(sourceId.path))); |
| - } |
| } |
| const _header = """ |