inject polyfills after base tags

PikeTheCrow · May 21, 2015 · 730b6ea · 730b6ea
1 parent 762d783
commit 730b6ea
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+#### 0.16.3+3
+  * Inject the polyfills after any `<base>` tags in the head.
+
 #### 0.16.3+2
   * Fix invalid warning about missing polymer.html import from the linter.
   * Update logging package to `<0.12.0`.

diff --git a/lib/src/build/polyfill_injector.dart b/lib/src/build/polyfill_injector.dart
@@ -97,8 +97,17 @@ class PolyfillInjector extends Transformer with PolymerTransformer {
             parseFragment('<script src="packages/browser/dart.js"></script>'));
       }
 
-      _addScript(urlSegment, [Node parent, int position = 0]) {
+      _addScript(urlSegment, [Element parent, int position]) {
         if (parent == null) parent = document.head;
+        // Default to either the top of `parent` or right after the <base> tag.
+        if (position == null) {
+          var base = parent.querySelector('base');
+          if (base != null) {
+            position = parent.nodes.indexOf(base) + 1;
+          } else {
+            position = 0;
+          }
+        }
         var pathToPackages =
             '../' * (path.url.split(transform.primaryInput.id.path).length - 2);
         parent.nodes.insert(position, parseFragment(

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: polymer
-version: 0.16.3+2
+version: 0.16.3+3
 author: Polymer.dart Authors <[email protected]>
 description: >
   Polymer.dart is a new type of library for the web, built on top of Web

diff --git a/test/build/polyfill_injector_test.dart b/test/build/polyfill_injector_test.dart
@@ -98,6 +98,22 @@ void runTests({bool js: true}) {
         '</body></html>',
   });
 
+  testPhases('polyfills after base tags', phases, {
+    'a|web/test.html': '<!DOCTYPE html><html><head>'
+        '<base href="/">'
+        '</head><body>'
+        '<script type="application/dart" src="a.dart"></script>'
+        '$dartJsTag'
+  }, {
+    'a|web/test.html': '<!DOCTYPE html><html><head>'
+        '<base href="/">'
+        '$COMPATIBILITY_JS_TAGS'
+        '</head><body>'
+        '<script ${type}src="a.dart$ext"$async></script>'
+        '$dartJsTag'
+        '</body></html>',
+  });
+
   testPhases('platform.js -> webcomponents.js', phases, {
     'a|web/test.html': '<!DOCTYPE html><html><head>'
         '$PLATFORM_JS_TAG'