pkg/polymer/lib/src/build/import_inliner.dart - Issue 178193007: [polymer] fix import inliner to only rewrite URL attributes once per node

Unified Diff: pkg/polymer/lib/src/build/import_inliner.dart

Issue 178193007: [polymer] fix import inliner to only rewrite URL attributes once per node (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Created 6 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: pkg/polymer/lib/src/build/import_inliner.dart

diff --git a/pkg/polymer/lib/src/build/import_inliner.dart b/pkg/polymer/lib/src/build/import_inliner.dart

index 40d5ca58d197a51ebea3106ccf5fb457baad3470..0a52efb6174fc0d59e2c87b6c7149648c1bbbcfc 100644

--- a/pkg/polymer/lib/src/build/import_inliner.dart

+++ b/pkg/polymer/lib/src/build/import_inliner.dart

@@ -40,7 +40,7 @@ class _HtmlInliner extends PolymerTransformer {

Document document;

return readPrimaryAsHtml(transform).then((document) =>

- _visitImports(document, docId).then((importsFound) {

+ _visitImports(document).then((importsFound) {

var output = transform.primaryInput;

if (importsFound) {

@@ -61,7 +61,7 @@ class _HtmlInliner extends PolymerTransformer {

///

/// Returns `true` if and only if the document was changed and should be

/// written out.

- Future<bool> _visitImports(Document document, AssetId sourceId) {

+ Future<bool> _visitImports(Document document) {

bool changed = false;

_moveHeadToBody(document);

@@ -71,8 +71,9 @@ class _HtmlInliner extends PolymerTransformer {

var rel = tag.attributes['rel'];

if (rel != 'import' && rel != 'stylesheet') return null;

+ // Note: URL has already been normalized so use docId.

var href = tag.attributes['href'];

- var id = resolve(sourceId, href, transform.logger, tag.sourceSpan,

+ var id = resolve(docId, href, transform.logger, tag.sourceSpan,

allowAbsolute: rel == 'stylesheet');

if (rel == 'import') {

@@ -107,7 +108,7 @@ class _HtmlInliner extends PolymerTransformer {

var insertionPoint = doc.body.firstChild;

for (var node in doc.head.nodes.toList(growable: false)) {

if (node is! Element) continue;

- var tag = node.tagName;

+ var tag = node.localName;

var type = node.attributes['type'];

var rel = node.attributes['rel'];

if (tag == 'style' || tag == 'script' &&

@@ -121,18 +122,20 @@ class _HtmlInliner extends PolymerTransformer {

// Loads an asset identified by [id], visits its imports and collects its

// html imports. Then inlines it into the main document.

- Future _inlineImport(AssetId id, Element link) =>

- readAsHtml(id, transform).then((doc) => _visitImports(doc, id).then((_) {

- new _UrlNormalizer(transform, id).visit(doc);

- _extractScripts(doc);

- // TODO(jmesserly): figure out how this is working in vulcanizer.

- // Do they produce a <body> tag with a <head> and <body> inside?

- var imported = new DocumentFragment();

- imported.nodes..addAll(doc.head.nodes)..addAll(doc.body.nodes);

- link.replaceWith(imported);

- }));

+ Future _inlineImport(AssetId id, Element link) {

+ return readAsHtml(id, transform).then((doc) {

+ new _UrlNormalizer(transform, id).visit(doc);

+ return _visitImports(doc).then((_) {

+ _extractScripts(doc);

+ // TODO(jmesserly): figure out how this is working in vulcanizer.

+ // Do they produce a <body> tag with a <head> and <body> inside?

+ var imported = new DocumentFragment();

+ imported.nodes..addAll(doc.head.nodes)..addAll(doc.body.nodes);

+ link.replaceWith(imported);

+ });

+ }

Future _inlineStylesheet(AssetId id, Element link) {

return transform.readInputAsString(id).then((css) {

« no previous file with comments | « no previous file | pkg/polymer/test/build/common.dart » ('j') | no next file with comments »