diff --git a/CHANGELOG.md b/CHANGELOG.md
index 068e580..4630daf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+#### 0.12.0+4
+  * The transformer will now give an informative error on package names with
+    hyphens.
+
 #### 0.12.0+3
   * Update analyzer dependency to `<0.27.0` and fix up some tests.
 
@@ -15,7 +19,7 @@
     (here)[http://webcomponents.org/articles/polyfills-0-6-0/].
   * Also added all the individual polyfills as well as the
     `webcomponents-lite.js` version, which does not include shadow dom.
-    
+
 #### 0.11.4+2
   * Don't inline type="css" imports.
 
@@ -146,8 +150,8 @@
     *Note*: Html imports included this way cannot contain dart script tags. The
     mirror based implementation injects the imports dynamically and dart script
     tags are not allowed to be injected in that way.
-    
-    *Note*:  Relative urls cannot be used in inlined script tags. Either move 
+
+    *Note*:  Relative urls cannot be used in inlined script tags. Either move
     the script code to a Dart file, use a `package:` url, or use a normal HTML
     import. See https://github.com/dart-lang/web-components/issues/6.
 
@@ -161,7 +165,7 @@
         - web_components:
             entry_points:
               - web/index.html
-    
+
     If no `entry_points` option is supplied then any html file under `web` or
     `test` will be treated as an entry point.
 
@@ -194,7 +198,7 @@
     providing Dart APIs for js custom elements.
 
 #### 0.8.0
-  * Re-apply changes from 0.7.1+1 and also cherry pick 
+  * Re-apply changes from 0.7.1+1 and also cherry pick
     [efdbbc](https://github.com/polymer/CustomElements/commit/efdbbc) to fix
     the customElementsTakeRecords function.
   * **Breaking Change** The customElementsTakeRecords function now has an
@@ -222,7 +226,7 @@
   * Updated to 0.4.0-5a7353d release, with same cherry pick as 0.6.0+1.
   * Many features were moved into the polymer package, this package is now
     purely focused on polyfills.
-  * Change Platform.deliverDeclarations to 
+  * Change Platform.deliverDeclarations to
     Platform.consumeDeclarations(callback).
   * Cherry pick https://github.com/Polymer/ShadowDOM/pull/505 to fix mem leak.
 
@@ -235,7 +239,7 @@
     This is more recent than the 0.3.5 release as there were multiple breakages
     that required updating past that.
   * There is a bug in this version where selecting non-rendered elements doesn't
-    work, but it shouldn't affect most people. See 
+    work, but it shouldn't affect most people. See
     https://github.com/Polymer/ShadowDOM/issues/495.
 
 #### 0.5.0+1
diff --git a/lib/build/script_compactor.dart b/lib/build/script_compactor.dart
index 12655b3..f177638 100644
--- a/lib/build/script_compactor.dart
+++ b/lib/build/script_compactor.dart
@@ -108,7 +108,7 @@
         primaryInput.path.replaceFirst('.html', '.bootstrap.dart'));
 
     var buffer = new StringBuffer();
-    buffer.writeln('library ${_libraryNameFor(bootstrapId)};');
+    buffer.writeln('library ${_libraryNameFor(bootstrapId, logger)};');
     buffer.writeln();
     var i = 0;
     for (var script in importScripts) {
@@ -147,7 +147,7 @@
       // TODO(sigmund): ensure this path is unique (dartbug.com/12618).
       var newId = primaryInput.addExtension('.$count.dart');
       if (!_hasLibraryDirective(code)) {
-        var libName = _libraryNameFor(primaryInput, count);
+        var libName = _libraryNameFor(primaryInput, logger, count);
         code = "library $libName;\n$code";
       }
 
@@ -228,15 +228,21 @@
 }
 
 /// Generate a library name for an asset.
-String _libraryNameFor(AssetId id, [int suffix]) {
+String _libraryNameFor(AssetId id, BuildLogger logger, [int suffix]) {
+  if (id.package.contains(_invalidLibCharsRegex)) {
+    logger.error('Invalid package name `${id.package}`. Package names should '
+        'be valid dart identifiers, as indicated at '
+        'https://www.dartlang.org/tools/pub/pubspec.html#name.');
+  }
   var name = '${path.withoutExtension(id.path)}_'
       '${path.extension(id.path).substring(1)}';
   if (name.startsWith('lib/')) name = name.substring(4);
-  name = name.split('/').map((part) {
-    part = part.replaceAll(_invalidLibCharsRegex, '_');
-    if (part.startsWith(_numRegex)) part = '_${part}';
-    return part;
-  }).join(".");
+  validLibName(String name) {
+    name = name.replaceAll(_invalidLibCharsRegex, '_');
+    if (name.startsWith(_numRegex)) name = '_${name}';
+    return name;
+  }
+  name = name.split('/').map(validLibName).join(".");
   var suffixString = suffix != null ? '_$suffix' : '';
   return '${id.package}.${name}$suffixString';
 }
diff --git a/pubspec.yaml b/pubspec.yaml
index 2c9e114..a6672d8 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: web_components
-version: 0.12.0+3
+version: 0.12.0+4
 author: Polymer.dart Authors <web-ui-dev@dartlang.org>
 homepage: https://github.com/dart-lang/web-components/
 description: >
diff --git a/test/build/import_inliner_test.dart b/test/build/import_inliner_test.dart
index f0dbef6..046fcf4 100644
--- a/test/build/import_inliner_test.dart
+++ b/test/build/import_inliner_test.dart
@@ -15,30 +15,851 @@
 main() {
   useCompactVMConfiguration();
 
-  group('rel=import', importTests);
-  group('url attributes', urlAttributeTests);
-  group('deep entrypoints', entryPointTests);
+//  group('rel=import', importTests);
+//  group('url attributes', urlAttributeTests);
+//  group('deep entrypoints', entryPointTests);
+  group('templates', templateTests);
 }
 
-void importTests() {
-  testPhases('no imports', phases, {
-    'a|web/index.html': '''
-        <!DOCTYPE html><html><head></head><body></body></html>''',
-  }, {
-    'a|web/index.html': '''
-        <!DOCTYPE html><html><head></head><body></body></html>''',
-  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
+//void importTests() {
+//  testPhases('no imports', phases, {
+//    'a|web/index.html': '''
+//        <!DOCTYPE html><html><head></head><body></body></html>''',
+//  }, {
+//    'a|web/index.html': '''
+//        <!DOCTYPE html><html><head></head><body></body></html>''',
+//  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
+//
+//  testPhases('one import, removes dart script', phases, {
+//    'a|web/index.html': '''
+//        <!DOCTYPE html>
+//        <html>
+//          <head><link rel="import" href="packages/a/foo.html"></head>
+//          <body></body>
+//        </html>''',
+//    'a|lib/foo.html': '''
+//        <div>hello from foo!</div>
+//        <script type="application/dart" src="foo.dart"></script>
+//        ''',
+//  }, {
+//    'a|web/index.html': '''
+//        <!DOCTYPE html>
+//        <html>
+//          <head></head>
+//          <body>
+//            <div hidden="">
+//              <div>hello from foo!</div>
+//            </div>
+//          </body>
+//        </html>''',
+//  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
+//
+//  testPhases('preserves order of scripts', phases, {
+//    'a|web/index.html': '''
+//        <!DOCTYPE html><html><head>
+//        <script type="text/javascript">/*first*/</script>
+//        <script src="second.js"></script>
+//        <link rel="import" href="packages/a/foo.html">
+//        <script>/*forth*/</script>
+//        </head></html>''',
+//    'a|lib/foo.html': '''
+//        <!DOCTYPE html><html><head><script>/*third*/</script>
+//        </head><body><polymer-element>2</polymer-element></html>''',
+//    'a|web/second.js': '/*second*/'
+//  }, {
+//    'a|web/index.html': '''
+//        <!DOCTYPE html><html><head>
+//        <script type="text/javascript">/*first*/</script>
+//        <script src="second.js"></script>
+//        </head><body>
+//        <div hidden="">
+//        <script>/*third*/</script>
+//        <polymer-element>2</polymer-element>
+//        <script>/*forth*/</script>
+//        </div>
+//        </body></html>''',
+//  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
+//
+//  testPhases('preserves order of scripts, extract Dart scripts', phases, {
+//    'a|web/index.html': '''
+//        <!DOCTYPE html>
+//        <html>
+//          <head>
+//            <script type="text/javascript">/*first*/</script>
+//            <script src="second.js"></script>
+//            <link rel="import" href="test2.html">
+//            <script type="application/dart">/*fifth*/</script>
+//          </head>
+//        </html>''',
+//    'a|web/test2.html': '''
+//        <!DOCTYPE html>
+//        <html>
+//          <head>
+//            <script>/*third*/</script>
+//            <script type="application/dart">/*forth*/</script>
+//          </head>
+//          <body>
+//            <polymer-element>2</polymer-element>
+//          </body>
+//        </html>''',
+//    'a|web/second.js': '/*second*/'
+//  }, {
+//    'a|web/index.html': '''
+//        <!DOCTYPE html>
+//        <html>
+//          <head>
+//            <script type="text/javascript">/*first*/</script>
+//            <script src="second.js"></script>
+//          </head>
+//          <body>
+//            <div hidden="">
+//            <script>/*third*/</script>
+//            <polymer-element>2</polymer-element>
+//            <script type="application/dart">/*fifth*/</script>
+//            </div>
+//          </body>
+//        </html>''',
+//    'a|web/test2.html': '''
+//        <!DOCTYPE html>
+//        <html>
+//          <head>
+//            <script>/*third*/</script>
+//            <script type="application/dart">/*forth*/</script>
+//          </head>
+//          <body>
+//            <polymer-element>2</polymer-element>
+//          </body>
+//        </html>''',
+//  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
+//
+//  testPhases('no transformation outside web/', phases, {
+//    'a|lib/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="test2.html">
+//        </head></html>''',
+//    'a|lib/test2.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body><polymer-element>2</polymer-element></html>''',
+//  }, {
+//    'a|lib/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="test2.html">
+//        </head></html>''',
+//    'a|lib/test2.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body><polymer-element>2</polymer-element></html>''',
+//  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
+//
+//  testPhases('shallow, elements, many', phases, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="test2.html">
+//        <link rel="import" href="test3.html">
+//        </head></html>''',
+//    'a|web/test2.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body><polymer-element>2</polymer-element></html>''',
+//    'a|web/test3.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body><polymer-element>3</polymer-element></html>''',
+//  }, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body>
+//        <div hidden="">
+//        <polymer-element>2</polymer-element>
+//        <polymer-element>3</polymer-element>
+//        </div>
+//        </body></html>''',
+//    'a|web/test2.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body><polymer-element>2</polymer-element></html>''',
+//    'a|web/test3.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body><polymer-element>3</polymer-element></html>''',
+//  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
+//
+//  testPhases('deep, elements, one per file', phases, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="test2.html">
+//        </head></html>''',
+//    'a|web/test2.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="assets/b/test3.html">
+//        </head><body><polymer-element>2</polymer-element></html>''',
+//    'b|asset/test3.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="../../packages/c/test4.html">
+//        </head><body><polymer-element>3</polymer-element></html>''',
+//    'c|lib/test4.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body><polymer-element>4</polymer-element></html>''',
+//  }, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body>
+//        <div hidden="">
+//        <polymer-element>4</polymer-element>
+//        <polymer-element>3</polymer-element>
+//        <polymer-element>2</polymer-element>
+//        </div>
+//        </body></html>''',
+//    'a|web/test2.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body>
+//        <div hidden="">
+//        <polymer-element>4</polymer-element>
+//        <polymer-element>3</polymer-element>
+//        </div>
+//        <polymer-element>2</polymer-element>
+//        </body></html>''',
+//    'b|asset/test3.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="../../packages/c/test4.html">
+//        </head><body><polymer-element>3</polymer-element></html>''',
+//    'c|lib/test4.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body><polymer-element>4</polymer-element></html>''',
+//  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
+//
+//  testPhases('deep, elements, many imports', phases, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="test2a.html">
+//        <link rel="import" href="test2b.html">
+//        </head></html>''',
+//    'a|web/test2a.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="test3a.html">
+//        <link rel="import" href="test3b.html">
+//        </head><body><polymer-element>2a</polymer-element></body></html>''',
+//    'a|web/test2b.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="test4a.html">
+//        <link rel="import" href="test4b.html">
+//        </head><body><polymer-element>2b</polymer-element></body></html>''',
+//    'a|web/test3a.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body><polymer-element>3a</polymer-element></body></html>''',
+//    'a|web/test3b.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body><polymer-element>3b</polymer-element></body></html>''',
+//    'a|web/test4a.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body><polymer-element>4a</polymer-element></body></html>''',
+//    'a|web/test4b.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body><polymer-element>4b</polymer-element></body></html>''',
+//  }, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body>
+//        <div hidden="">
+//        <polymer-element>3a</polymer-element>
+//        <polymer-element>3b</polymer-element>
+//        <polymer-element>2a</polymer-element>
+//        <polymer-element>4a</polymer-element>
+//        <polymer-element>4b</polymer-element>
+//        <polymer-element>2b</polymer-element>
+//        </div>
+//        </body></html>''',
+//    'a|web/test2a.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body>
+//        <div hidden="">
+//        <polymer-element>3a</polymer-element>
+//        <polymer-element>3b</polymer-element>
+//        </div>
+//        <polymer-element>2a</polymer-element>
+//        </body></html>''',
+//    'a|web/test2b.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body>
+//        <div hidden="">
+//        <polymer-element>4a</polymer-element>
+//        <polymer-element>4b</polymer-element>
+//        </div>
+//        <polymer-element>2b</polymer-element>
+//        </body></html>''',
+//    'a|web/test3a.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body>
+//        <polymer-element>3a</polymer-element>
+//        </body></html>''',
+//    'a|web/test3b.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body>
+//        <polymer-element>3b</polymer-element>
+//        </body></html>''',
+//    'a|web/test4a.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body>
+//        <polymer-element>4a</polymer-element>
+//        </body></html>''',
+//    'a|web/test4b.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body>
+//        <polymer-element>4b</polymer-element>
+//        </body></html>''',
+//  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
+//
+//  testPhases('imports cycle, 1-step lasso', phases, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="test_1.html">
+//        </head></html>''',
+//    'a|web/test_1.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="test_2.html">
+//        </head><body><polymer-element>1</polymer-element></html>''',
+//    'a|web/test_2.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="test_1.html">
+//        </head><body><polymer-element>2</polymer-element></html>''',
+//  }, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body>
+//        <div hidden="">
+//        <polymer-element>2</polymer-element>
+//        <polymer-element>1</polymer-element>
+//        </div>
+//        </body></html>''',
+//    'a|web/test_1.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body>
+//        <div hidden="">
+//        <polymer-element>2</polymer-element>
+//        </div>
+//        <polymer-element>1</polymer-element></body></html>''',
+//    'a|web/test_2.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body>
+//        <div hidden="">
+//        <polymer-element>1</polymer-element>
+//        </div>
+//        <polymer-element>2</polymer-element></body></html>''',
+//  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
+//
+//  testPhases('imports cycle, 1-step lasso, scripts too', phases, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="test_1.html">
+//        </head></html>''',
+//    'a|web/test_1.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="test_2.html">
+//        </head><body><polymer-element>1</polymer-element>
+//        <script src="s1"></script></html>''',
+//    'a|web/test_2.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="test_1.html">
+//        </head><body><polymer-element>2</polymer-element>
+//        <script src="s2"></script></html>''',
+//  }, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body>
+//        <div hidden="">
+//        <polymer-element>2</polymer-element>
+//        <script src="s2"></script>
+//        <polymer-element>1</polymer-element>
+//        <script src="s1"></script>
+//        </div>
+//        </body></html>''',
+//    'a|web/test_1.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body>
+//        <div hidden="">
+//        <polymer-element>2</polymer-element>
+//        <script src="s2"></script>
+//        </div>
+//        <polymer-element>1</polymer-element>
+//        <script src="s1"></script></body></html>''',
+//    'a|web/test_2.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body>
+//        <div hidden="">
+//        <polymer-element>1</polymer-element>
+//        <script src="s1"></script>
+//        </div>
+//        <polymer-element>2</polymer-element>
+//        <script src="s2"></script></body></html>''',
+//  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
+//
+//  testPhases('imports cycle, 1-step lasso, Dart scripts too', phases, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="test_1.html">
+//        </head></html>''',
+//    'a|web/test_1.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="test_2.html">
+//        </head><body><polymer-element>1</polymer-element>
+//        <script type="application/dart" src="s1.dart"></script>
+//        </html>''',
+//    'a|web/test_2.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="test_1.html">
+//        </head><body><polymer-element>2
+//        <script type="application/dart" src="s2.dart"></script>
+//        </polymer-element>
+//        </html>''',
+//    'a|web/s1.dart': '',
+//    'a|web/s2.dart': '',
+//  }, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body>
+//        <div hidden="">
+//        <polymer-element>2</polymer-element>
+//        <polymer-element>1</polymer-element>
+//        </div>
+//        </body></html>''',
+//    'a|web/test_1.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body>
+//        <div hidden="">
+//        <polymer-element>2</polymer-element>
+//        </div>
+//        <polymer-element>1</polymer-element>
+//        <script type="application/dart" src="s1.dart"></script>
+//        </body></html>''',
+//    'a|web/test_2.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body>
+//        <div hidden="">
+//        <polymer-element>1</polymer-element>
+//        </div>
+//        <polymer-element>2
+//        <script type="application/dart" src="s2.dart"></script>
+//        </polymer-element>
+//        </body></html>''',
+//  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
+//
+//  testPhases('imports with Dart script after JS script', phases, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="test_1.html">
+//        </head></html>''',
+//    'a|web/test_1.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="test_1.html">
+//        </head><body>
+//        <foo>42</foo><bar-baz></bar-baz>
+//        <polymer-element>1'
+//        <script src="s1.js"></script>
+//        <script type="application/dart" src="s1.dart"></script>
+//        </polymer-element>
+//        'FOO'</body></html>''',
+//    'a|web/s1.dart': '',
+//  }, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body>
+//        <div hidden="">
+//        <foo>42</foo><bar-baz></bar-baz>
+//        <polymer-element>1'
+//        <script src="s1.js"></script>
+//        </polymer-element>
+//        'FOO'
+//        </div>
+//        </body></html>''',
+//    'a|web/test_1.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body>
+//        <foo>42</foo><bar-baz></bar-baz>
+//        <polymer-element>1'
+//        <script src="s1.js"></script>
+//        <script type="application/dart" src="s1.dart"></script>
+//        </polymer-element>
+//        'FOO'</body></html>''',
+//  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
+//
+//  testPhases('imports cycle, 2-step lasso', phases, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="test_1.html">
+//        </head></html>''',
+//    'a|web/test_1.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="test_2.html">
+//        </head><body><polymer-element>1</polymer-element></html>''',
+//    'a|web/test_2.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="test_3.html">
+//        </head><body><polymer-element>2</polymer-element></html>''',
+//    'a|web/test_3.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="test_1.html">
+//        </head><body><polymer-element>3</polymer-element></html>''',
+//  }, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body>
+//        <div hidden="">
+//        <polymer-element>3</polymer-element>
+//        <polymer-element>2</polymer-element>
+//        <polymer-element>1</polymer-element>
+//        </div>
+//        </body></html>''',
+//    'a|web/test_1.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body>
+//        <div hidden="">
+//        <polymer-element>3</polymer-element>
+//        <polymer-element>2</polymer-element>
+//        </div>
+//        <polymer-element>1</polymer-element></body></html>''',
+//    'a|web/test_2.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body>
+//        <div hidden="">
+//        <polymer-element>1</polymer-element>
+//        <polymer-element>3</polymer-element>
+//        </div>
+//        <polymer-element>2</polymer-element></body></html>''',
+//    'a|web/test_3.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body>
+//        <div hidden="">
+//        <polymer-element>2</polymer-element>
+//        <polymer-element>1</polymer-element>
+//        </div>
+//        <polymer-element>3</polymer-element></body></html>''',
+//  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
+//
+//  testPhases('imports cycle, self cycle', phases, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="test_1.html">
+//        </head></html>''',
+//    'a|web/test_1.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="test_1.html">
+//        </head><body><polymer-element>1</polymer-element></html>''',
+//  }, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body>
+//        <div hidden="">
+//        <polymer-element>1</polymer-element>
+//        </div>
+//        </body></html>''',
+//    'a|web/test_1.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body>
+//        <polymer-element>1</polymer-element></body></html>''',
+//  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
+//
+//  testPhases('imports DAG', phases, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="test_1.html">
+//        <link rel="import" href="test_2.html">
+//        </head></html>''',
+//    'a|web/test_1.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="test_3.html">
+//        </head><body><polymer-element>1</polymer-element></body></html>''',
+//    'a|web/test_2.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="test_3.html">
+//        </head><body><polymer-element>2</polymer-element></body></html>''',
+//    'a|web/test_3.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body><polymer-element>3</polymer-element></body></html>''',
+//  }, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body>
+//        <div hidden="">
+//        <polymer-element>3</polymer-element>
+//        <polymer-element>1</polymer-element>
+//        <polymer-element>2</polymer-element>
+//        </div>
+//        </body></html>''',
+//    'a|web/test_1.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body>
+//        <div hidden="">
+//        <polymer-element>3</polymer-element>
+//        </div>
+//        <polymer-element>1</polymer-element></body></html>''',
+//    'a|web/test_2.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body>
+//        <div hidden="">
+//        <polymer-element>3</polymer-element>
+//        </div>
+//        <polymer-element>2</polymer-element></body></html>''',
+//    'a|web/test_3.html': '''
+//        <!DOCTYPE html><html><head>
+//        </head><body>
+//        <polymer-element>3</polymer-element></body></html>''',
+//  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
+//
+//  testPhases('missing html imports throw errors', phases, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="foo.html">
+//        </head></html>''',
+//  }, {}, [
+//    'warning: ${inlineImportFail.create({
+//          'error': 'Could not find asset a|web/foo.html.'
+//      }).snippet} '
+//        '(web/test.html 1 8)',
+//  ], StringFormatter.noNewlinesOrSurroundingWhitespace);
+//
+//  testPhases('absolute uri', phases, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="stylesheet" href="/foo.css">
+//        </head></html>''',
+//    'a|web/test2.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="stylesheet" href="http://example.com/bar.css">
+//        </head></html>''',
+//  }, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="stylesheet" href="/foo.css">
+//        </head></html>''',
+//    'a|web/test2.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="stylesheet" href="http://example.com/bar.css">
+//        </head></html>''',
+//  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
+//}
+//
+//void urlAttributeTests() {
+//  testPhases('url attributes are normalized', phases, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="foo/test_1.html">
+//        <link rel="import" href="foo/test_2.html">
+//        </head></html>''',
+//    'a|web/foo/test_1.html': '''
+//        <script src="baz.jpg"></script>''',
+//    'a|web/foo/test_2.html': '''
+//        <foo-element src="baz.jpg"></foo-element>''',
+//  }, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head></head><body>
+//        <div hidden="">
+//        <script src="foo/baz.jpg"></script>
+//        <foo-element src="baz.jpg"></foo-element>
+//        </div>
+//        </body></html>''',
+//    'a|web/foo/test_1.html': '''
+//        <script src="baz.jpg"></script>''',
+//    'a|web/foo/test_2.html': '''
+//        <foo-element src="baz.jpg"></foo-element>''',
+//  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
+//
+//  testPhases('paths with an invalid prefix are not normalized', phases, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="packages/a/test.html">
+//        </head></html>''',
+//    'a|lib/test.html': '''
+//        <img src="[[bar]]">''',
+//  }, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head></head><body>
+//        <div hidden="">
+//        <img src="[[bar]]">
+//        </div>
+//        </body></html>''',
+//  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
+//
+//  testPhases('relative paths followed by invalid characters are normalized',
+//      phases, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="foo/test.html">
+//        </head></html>''',
+//    'a|web/foo/test.html': '''
+//        <img src="baz/{{bar}}">
+//        <img src="./{{bar}}">''',
+//  }, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head></head><body>
+//        <div hidden="">
+//        <img src="foo/baz/{{bar}}">
+//        <img src="foo/{{bar}}">
+//        </div>
+//        </body></html>''',
+//  }, null, StringFormatter.noNewlinesOrSurroundingWhitespace);
+//
+//  testPhases('relative paths in _* attributes are normalized', phases, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="foo/test.html">
+//        </head></html>''',
+//    'a|web/foo/test.html': '''
+//        <img _src="./{{bar}}">
+//        <a _href="./{{bar}}">test</a>''',
+//  }, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head></head><body>
+//        <div hidden="">
+//        <img _src="foo/{{bar}}">
+//        <a _href="foo/{{bar}}">test</a>
+//        </div>
+//        </body></html>''',
+//  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
+//
+//  testPhases('paths starting with a binding are treated as absolute', phases, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="packages/a/foo.html">
+//        </head></html>''',
+//    'a|lib/foo.html': '''
+//        <img _src="{{bar}}">
+//        <img _src="[[bar]]">''',
+//  }, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head></head><body>
+//        <div hidden="">
+//          <img _src="{{bar}}">
+//          <img _src="[[bar]]">
+//        </div>
+//        </body></html>''',
+//  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
+//
+//  testPhases('arbitrary bindings can exist in paths', phases, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head></head><body>
+//        <img src="./{{(bar[2] + baz[\'foo\']) * 14 / foobar() - 0.5}}.jpg">
+//        <img src="./[[bar[2]]].jpg">
+//        </body></html>''',
+//  }, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head></head><body>
+//        <img src="{{(bar[2] + baz[\'foo\']) * 14 / foobar() - 0.5}}.jpg">
+//        <img src="[[bar[2]]].jpg">
+//        </body></html>''',
+//  }, null, StringFormatter.noNewlinesOrSurroundingWhitespace);
+//
+//  testPhases('multiple bindings can exist in paths', phases, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head></head><body>
+//        <img src="./{{bar[0]}}/{{baz[1]}}.{{extension}}">
+//        </body></html>''',
+//  }, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head></head><body>
+//        <img src="{{bar[0]}}/{{baz[1]}}.{{extension}}">
+//        </body></html>''',
+//  }, null, StringFormatter.noNewlinesOrSurroundingWhitespace);
+//
+//  testPhases('relative paths in deep imports', phases, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="foo/foo.html">
+//        </head></html>''',
+//    'a|web/foo/foo.html': '''
+//        <link rel="import" href="bar.html">''',
+//    'a|web/foo/bar.html': '''
+//        <style rel="stylesheet" href="baz.css"></style>
+//        <style rel="stylesheet" href="../css/zap.css"></style>''',
+//    'a|web/foo/baz.css': '',
+//    'a|web/css/zap.css': '',
+//  }, {
+//    'a|web/test.html': '''
+//        <!DOCTYPE html><html><head></head><body>
+//        <div hidden="">
+//          <style rel="stylesheet" href="foo/baz.css"></style>
+//          <style rel="stylesheet" href="css/zap.css"></style>
+//        </div>
+//        </body></html>''',
+//  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
+//}
+//
+//void entryPointTests() {
+//  testPhases('one level deep entry points normalize correctly', phases, {
+//    'a|web/test/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="../../packages/a/foo/foo.html">
+//        </head></html>''',
+//    'a|lib/foo/foo.html': '''
+//        <script rel="import" href="../../../packages/b/bar/bar.js">
+//        </script>''',
+//    'b|lib/bar/bar.js': '''
+//        console.log("here");''',
+//  }, {
+//    'a|web/test/test.html': '''
+//        <!DOCTYPE html><html><head></head><body>
+//        <div hidden="">
+//        <script rel="import" href="../packages/b/bar/bar.js"></script>
+//        </div>
+//        </body></html>''',
+//  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
+//
+//  testPhases('includes in entry points normalize correctly', phases, {
+//    'a|web/test/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        <script src="packages/a/foo/bar.js"></script>
+//        </head></html>''',
+//    'a|lib/foo/bar.js': '''
+//        console.log("here");''',
+//  }, {
+//    'a|web/test/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        <script src="../packages/a/foo/bar.js"></script>
+//        </head><body>
+//        </body></html>''',
+//  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
+//
+//  testPhases('two level deep entry points normalize correctly', phases, {
+//    'a|web/test/well/test.html': '''
+//        <!DOCTYPE html><html><head>
+//        <link rel="import" href="../../../packages/a/foo/foo.html">
+//        </head></html>''',
+//    'a|lib/foo/foo.html': '''
+//        <script rel="import" href="../../../packages/b/bar/bar.js"></script>''',
+//    'b|lib/bar/bar.js': '''
+//        console.log("here");''',
+//  }, {
+//    'a|web/test/well/test.html': '''
+//        <!DOCTYPE html><html><head></head><body>
+//        <div hidden="">
+//        <script rel="import" href="../../packages/b/bar/bar.js"></script>
+//        </div>
+//        </body></html>''',
+//  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
+//}
 
-  testPhases('one import, removes dart script', phases, {
+void templateTests() {
+  testPhases('allows template inside table', phases, {
     'a|web/index.html': '''
         <!DOCTYPE html>
         <html>
           <head><link rel="import" href="packages/a/foo.html"></head>
-          <body></body>
+          <body>
+            <dom-module id="hello-element">
+              <template>
+                <table>
+                  <thead>
+                    <tr><th>first</th><th>last</th></tr>
+                  </thead>
+                  <tbody>
+                    <template is="dom-repeat" items="{{data}}">
+                      <tr>
+                        <td>{{item.first}}</td>
+                        <td>{{item.last}}</td>
+                      </tr>
+                    </template>
+                  </tbody>
+                </table>
+              </template>
+            </dom-module>
+          </body>
         </html>''',
     'a|lib/foo.html': '''
-        <div>hello from foo!</div>
-        <script type="application/dart" src="foo.dart"></script>
+        <div>hello!</div>
         ''',
   }, {
     'a|web/index.html': '''
@@ -47,786 +868,26 @@
           <head></head>
           <body>
             <div hidden="">
-              <div>hello from foo!</div>
+              <div>hello!</div>
             </div>
+            <dom-module id="hello-element">
+              <template>
+                <table>
+                  <thead>
+                    <tr><th>first</th><th>last</th></tr>
+                  </thead>
+                  <tbody>
+                    <template is="dom-repeat" items="{{data}}">
+                      <tr>
+                        <td>{{item.first}}</td>
+                        <td>{{item.last}}</td>
+                      </tr>
+                    </template>
+                  </tbody>
+                </table>
+              </template>
+            </dom-module>
           </body>
         </html>''',
   }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
-
-  testPhases('preserves order of scripts', phases, {
-    'a|web/index.html': '''
-        <!DOCTYPE html><html><head>
-        <script type="text/javascript">/*first*/</script>
-        <script src="second.js"></script>
-        <link rel="import" href="packages/a/foo.html">
-        <script>/*forth*/</script>
-        </head></html>''',
-    'a|lib/foo.html': '''
-        <!DOCTYPE html><html><head><script>/*third*/</script>
-        </head><body><polymer-element>2</polymer-element></html>''',
-    'a|web/second.js': '/*second*/'
-  }, {
-    'a|web/index.html': '''
-        <!DOCTYPE html><html><head>
-        <script type="text/javascript">/*first*/</script>
-        <script src="second.js"></script>
-        </head><body>
-        <div hidden="">
-        <script>/*third*/</script>
-        <polymer-element>2</polymer-element>
-        <script>/*forth*/</script>
-        </div>
-        </body></html>''',
-  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
-
-  testPhases('preserves order of scripts, extract Dart scripts', phases, {
-    'a|web/index.html': '''
-        <!DOCTYPE html>
-        <html>
-          <head>
-            <script type="text/javascript">/*first*/</script>
-            <script src="second.js"></script>
-            <link rel="import" href="test2.html">
-            <script type="application/dart">/*fifth*/</script>
-          </head>
-        </html>''',
-    'a|web/test2.html': '''
-        <!DOCTYPE html>
-        <html>
-          <head>
-            <script>/*third*/</script>
-            <script type="application/dart">/*forth*/</script>
-          </head>
-          <body>
-            <polymer-element>2</polymer-element>
-          </body>
-        </html>''',
-    'a|web/second.js': '/*second*/'
-  }, {
-    'a|web/index.html': '''
-        <!DOCTYPE html>
-        <html>
-          <head>
-            <script type="text/javascript">/*first*/</script>
-            <script src="second.js"></script>
-          </head>
-          <body>
-            <div hidden="">
-            <script>/*third*/</script>
-            <polymer-element>2</polymer-element>
-            <script type="application/dart">/*fifth*/</script>
-            </div>
-          </body>
-        </html>''',
-    'a|web/test2.html': '''
-        <!DOCTYPE html>
-        <html>
-          <head>
-            <script>/*third*/</script>
-            <script type="application/dart">/*forth*/</script>
-          </head>
-          <body>
-            <polymer-element>2</polymer-element>
-          </body>
-        </html>''',
-  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
-
-  testPhases('no transformation outside web/', phases, {
-    'a|lib/test.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="test2.html">
-        </head></html>''',
-    'a|lib/test2.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body><polymer-element>2</polymer-element></html>''',
-  }, {
-    'a|lib/test.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="test2.html">
-        </head></html>''',
-    'a|lib/test2.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body><polymer-element>2</polymer-element></html>''',
-  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
-
-  testPhases('shallow, elements, many', phases, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="test2.html">
-        <link rel="import" href="test3.html">
-        </head></html>''',
-    'a|web/test2.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body><polymer-element>2</polymer-element></html>''',
-    'a|web/test3.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body><polymer-element>3</polymer-element></html>''',
-  }, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body>
-        <div hidden="">
-        <polymer-element>2</polymer-element>
-        <polymer-element>3</polymer-element>
-        </div>
-        </body></html>''',
-    'a|web/test2.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body><polymer-element>2</polymer-element></html>''',
-    'a|web/test3.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body><polymer-element>3</polymer-element></html>''',
-  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
-
-  testPhases('deep, elements, one per file', phases, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="test2.html">
-        </head></html>''',
-    'a|web/test2.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="assets/b/test3.html">
-        </head><body><polymer-element>2</polymer-element></html>''',
-    'b|asset/test3.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="../../packages/c/test4.html">
-        </head><body><polymer-element>3</polymer-element></html>''',
-    'c|lib/test4.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body><polymer-element>4</polymer-element></html>''',
-  }, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body>
-        <div hidden="">
-        <polymer-element>4</polymer-element>
-        <polymer-element>3</polymer-element>
-        <polymer-element>2</polymer-element>
-        </div>
-        </body></html>''',
-    'a|web/test2.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body>
-        <div hidden="">
-        <polymer-element>4</polymer-element>
-        <polymer-element>3</polymer-element>
-        </div>
-        <polymer-element>2</polymer-element>
-        </body></html>''',
-    'b|asset/test3.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="../../packages/c/test4.html">
-        </head><body><polymer-element>3</polymer-element></html>''',
-    'c|lib/test4.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body><polymer-element>4</polymer-element></html>''',
-  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
-
-  testPhases('deep, elements, many imports', phases, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="test2a.html">
-        <link rel="import" href="test2b.html">
-        </head></html>''',
-    'a|web/test2a.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="test3a.html">
-        <link rel="import" href="test3b.html">
-        </head><body><polymer-element>2a</polymer-element></body></html>''',
-    'a|web/test2b.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="test4a.html">
-        <link rel="import" href="test4b.html">
-        </head><body><polymer-element>2b</polymer-element></body></html>''',
-    'a|web/test3a.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body><polymer-element>3a</polymer-element></body></html>''',
-    'a|web/test3b.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body><polymer-element>3b</polymer-element></body></html>''',
-    'a|web/test4a.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body><polymer-element>4a</polymer-element></body></html>''',
-    'a|web/test4b.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body><polymer-element>4b</polymer-element></body></html>''',
-  }, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body>
-        <div hidden="">
-        <polymer-element>3a</polymer-element>
-        <polymer-element>3b</polymer-element>
-        <polymer-element>2a</polymer-element>
-        <polymer-element>4a</polymer-element>
-        <polymer-element>4b</polymer-element>
-        <polymer-element>2b</polymer-element>
-        </div>
-        </body></html>''',
-    'a|web/test2a.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body>
-        <div hidden="">
-        <polymer-element>3a</polymer-element>
-        <polymer-element>3b</polymer-element>
-        </div>
-        <polymer-element>2a</polymer-element>
-        </body></html>''',
-    'a|web/test2b.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body>
-        <div hidden="">
-        <polymer-element>4a</polymer-element>
-        <polymer-element>4b</polymer-element>
-        </div>
-        <polymer-element>2b</polymer-element>
-        </body></html>''',
-    'a|web/test3a.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body>
-        <polymer-element>3a</polymer-element>
-        </body></html>''',
-    'a|web/test3b.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body>
-        <polymer-element>3b</polymer-element>
-        </body></html>''',
-    'a|web/test4a.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body>
-        <polymer-element>4a</polymer-element>
-        </body></html>''',
-    'a|web/test4b.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body>
-        <polymer-element>4b</polymer-element>
-        </body></html>''',
-  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
-
-  testPhases('imports cycle, 1-step lasso', phases, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="test_1.html">
-        </head></html>''',
-    'a|web/test_1.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="test_2.html">
-        </head><body><polymer-element>1</polymer-element></html>''',
-    'a|web/test_2.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="test_1.html">
-        </head><body><polymer-element>2</polymer-element></html>''',
-  }, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body>
-        <div hidden="">
-        <polymer-element>2</polymer-element>
-        <polymer-element>1</polymer-element>
-        </div>
-        </body></html>''',
-    'a|web/test_1.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body>
-        <div hidden="">
-        <polymer-element>2</polymer-element>
-        </div>
-        <polymer-element>1</polymer-element></body></html>''',
-    'a|web/test_2.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body>
-        <div hidden="">
-        <polymer-element>1</polymer-element>
-        </div>
-        <polymer-element>2</polymer-element></body></html>''',
-  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
-
-  testPhases('imports cycle, 1-step lasso, scripts too', phases, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="test_1.html">
-        </head></html>''',
-    'a|web/test_1.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="test_2.html">
-        </head><body><polymer-element>1</polymer-element>
-        <script src="s1"></script></html>''',
-    'a|web/test_2.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="test_1.html">
-        </head><body><polymer-element>2</polymer-element>
-        <script src="s2"></script></html>''',
-  }, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body>
-        <div hidden="">
-        <polymer-element>2</polymer-element>
-        <script src="s2"></script>
-        <polymer-element>1</polymer-element>
-        <script src="s1"></script>
-        </div>
-        </body></html>''',
-    'a|web/test_1.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body>
-        <div hidden="">
-        <polymer-element>2</polymer-element>
-        <script src="s2"></script>
-        </div>
-        <polymer-element>1</polymer-element>
-        <script src="s1"></script></body></html>''',
-    'a|web/test_2.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body>
-        <div hidden="">
-        <polymer-element>1</polymer-element>
-        <script src="s1"></script>
-        </div>
-        <polymer-element>2</polymer-element>
-        <script src="s2"></script></body></html>''',
-  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
-
-  testPhases('imports cycle, 1-step lasso, Dart scripts too', phases, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="test_1.html">
-        </head></html>''',
-    'a|web/test_1.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="test_2.html">
-        </head><body><polymer-element>1</polymer-element>
-        <script type="application/dart" src="s1.dart"></script>
-        </html>''',
-    'a|web/test_2.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="test_1.html">
-        </head><body><polymer-element>2
-        <script type="application/dart" src="s2.dart"></script>
-        </polymer-element>
-        </html>''',
-    'a|web/s1.dart': '',
-    'a|web/s2.dart': '',
-  }, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body>
-        <div hidden="">
-        <polymer-element>2</polymer-element>
-        <polymer-element>1</polymer-element>
-        </div>
-        </body></html>''',
-    'a|web/test_1.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body>
-        <div hidden="">
-        <polymer-element>2</polymer-element>
-        </div>
-        <polymer-element>1</polymer-element>
-        <script type="application/dart" src="s1.dart"></script>
-        </body></html>''',
-    'a|web/test_2.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body>
-        <div hidden="">
-        <polymer-element>1</polymer-element>
-        </div>
-        <polymer-element>2
-        <script type="application/dart" src="s2.dart"></script>
-        </polymer-element>
-        </body></html>''',
-  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
-
-  testPhases('imports with Dart script after JS script', phases, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="test_1.html">
-        </head></html>''',
-    'a|web/test_1.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="test_1.html">
-        </head><body>
-        <foo>42</foo><bar-baz></bar-baz>
-        <polymer-element>1'
-        <script src="s1.js"></script>
-        <script type="application/dart" src="s1.dart"></script>
-        </polymer-element>
-        'FOO'</body></html>''',
-    'a|web/s1.dart': '',
-  }, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body>
-        <div hidden="">
-        <foo>42</foo><bar-baz></bar-baz>
-        <polymer-element>1'
-        <script src="s1.js"></script>
-        </polymer-element>
-        'FOO'
-        </div>
-        </body></html>''',
-    'a|web/test_1.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body>
-        <foo>42</foo><bar-baz></bar-baz>
-        <polymer-element>1'
-        <script src="s1.js"></script>
-        <script type="application/dart" src="s1.dart"></script>
-        </polymer-element>
-        'FOO'</body></html>''',
-  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
-
-  testPhases('imports cycle, 2-step lasso', phases, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="test_1.html">
-        </head></html>''',
-    'a|web/test_1.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="test_2.html">
-        </head><body><polymer-element>1</polymer-element></html>''',
-    'a|web/test_2.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="test_3.html">
-        </head><body><polymer-element>2</polymer-element></html>''',
-    'a|web/test_3.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="test_1.html">
-        </head><body><polymer-element>3</polymer-element></html>''',
-  }, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body>
-        <div hidden="">
-        <polymer-element>3</polymer-element>
-        <polymer-element>2</polymer-element>
-        <polymer-element>1</polymer-element>
-        </div>
-        </body></html>''',
-    'a|web/test_1.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body>
-        <div hidden="">
-        <polymer-element>3</polymer-element>
-        <polymer-element>2</polymer-element>
-        </div>
-        <polymer-element>1</polymer-element></body></html>''',
-    'a|web/test_2.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body>
-        <div hidden="">
-        <polymer-element>1</polymer-element>
-        <polymer-element>3</polymer-element>
-        </div>
-        <polymer-element>2</polymer-element></body></html>''',
-    'a|web/test_3.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body>
-        <div hidden="">
-        <polymer-element>2</polymer-element>
-        <polymer-element>1</polymer-element>
-        </div>
-        <polymer-element>3</polymer-element></body></html>''',
-  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
-
-  testPhases('imports cycle, self cycle', phases, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="test_1.html">
-        </head></html>''',
-    'a|web/test_1.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="test_1.html">
-        </head><body><polymer-element>1</polymer-element></html>''',
-  }, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body>
-        <div hidden="">
-        <polymer-element>1</polymer-element>
-        </div>
-        </body></html>''',
-    'a|web/test_1.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body>
-        <polymer-element>1</polymer-element></body></html>''',
-  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
-
-  testPhases('imports DAG', phases, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="test_1.html">
-        <link rel="import" href="test_2.html">
-        </head></html>''',
-    'a|web/test_1.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="test_3.html">
-        </head><body><polymer-element>1</polymer-element></body></html>''',
-    'a|web/test_2.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="test_3.html">
-        </head><body><polymer-element>2</polymer-element></body></html>''',
-    'a|web/test_3.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body><polymer-element>3</polymer-element></body></html>''',
-  }, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body>
-        <div hidden="">
-        <polymer-element>3</polymer-element>
-        <polymer-element>1</polymer-element>
-        <polymer-element>2</polymer-element>
-        </div>
-        </body></html>''',
-    'a|web/test_1.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body>
-        <div hidden="">
-        <polymer-element>3</polymer-element>
-        </div>
-        <polymer-element>1</polymer-element></body></html>''',
-    'a|web/test_2.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body>
-        <div hidden="">
-        <polymer-element>3</polymer-element>
-        </div>
-        <polymer-element>2</polymer-element></body></html>''',
-    'a|web/test_3.html': '''
-        <!DOCTYPE html><html><head>
-        </head><body>
-        <polymer-element>3</polymer-element></body></html>''',
-  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
-
-  testPhases('missing html imports throw errors', phases, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="foo.html">
-        </head></html>''',
-  }, {}, [
-    'warning: ${inlineImportFail.create({
-          'error': 'Could not find asset a|web/foo.html.'
-      }).snippet} '
-        '(web/test.html 1 8)',
-  ], StringFormatter.noNewlinesOrSurroundingWhitespace);
-
-  testPhases('absolute uri', phases, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="stylesheet" href="/foo.css">
-        </head></html>''',
-    'a|web/test2.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="stylesheet" href="http://example.com/bar.css">
-        </head></html>''',
-  }, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="stylesheet" href="/foo.css">
-        </head></html>''',
-    'a|web/test2.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="stylesheet" href="http://example.com/bar.css">
-        </head></html>''',
-  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
-}
-
-void urlAttributeTests() {
-  testPhases('url attributes are normalized', phases, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="foo/test_1.html">
-        <link rel="import" href="foo/test_2.html">
-        </head></html>''',
-    'a|web/foo/test_1.html': '''
-        <script src="baz.jpg"></script>''',
-    'a|web/foo/test_2.html': '''
-        <foo-element src="baz.jpg"></foo-element>''',
-  }, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head></head><body>
-        <div hidden="">
-        <script src="foo/baz.jpg"></script>
-        <foo-element src="baz.jpg"></foo-element>
-        </div>
-        </body></html>''',
-    'a|web/foo/test_1.html': '''
-        <script src="baz.jpg"></script>''',
-    'a|web/foo/test_2.html': '''
-        <foo-element src="baz.jpg"></foo-element>''',
-  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
-
-  testPhases('paths with an invalid prefix are not normalized', phases, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="packages/a/test.html">
-        </head></html>''',
-    'a|lib/test.html': '''
-        <img src="[[bar]]">''',
-  }, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head></head><body>
-        <div hidden="">
-        <img src="[[bar]]">
-        </div>
-        </body></html>''',
-  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
-
-  testPhases('relative paths followed by invalid characters are normalized',
-      phases, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="foo/test.html">
-        </head></html>''',
-    'a|web/foo/test.html': '''
-        <img src="baz/{{bar}}">
-        <img src="./{{bar}}">''',
-  }, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head></head><body>
-        <div hidden="">
-        <img src="foo/baz/{{bar}}">
-        <img src="foo/{{bar}}">
-        </div>
-        </body></html>''',
-  }, null, StringFormatter.noNewlinesOrSurroundingWhitespace);
-
-  testPhases('relative paths in _* attributes are normalized', phases, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="foo/test.html">
-        </head></html>''',
-    'a|web/foo/test.html': '''
-        <img _src="./{{bar}}">
-        <a _href="./{{bar}}">test</a>''',
-  }, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head></head><body>
-        <div hidden="">
-        <img _src="foo/{{bar}}">
-        <a _href="foo/{{bar}}">test</a>
-        </div>
-        </body></html>''',
-  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
-
-  testPhases('paths starting with a binding are treated as absolute', phases, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="packages/a/foo.html">
-        </head></html>''',
-    'a|lib/foo.html': '''
-        <img _src="{{bar}}">
-        <img _src="[[bar]]">''',
-  }, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head></head><body>
-        <div hidden="">
-          <img _src="{{bar}}">
-          <img _src="[[bar]]">
-        </div>
-        </body></html>''',
-  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
-
-  testPhases('arbitrary bindings can exist in paths', phases, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head></head><body>
-        <img src="./{{(bar[2] + baz[\'foo\']) * 14 / foobar() - 0.5}}.jpg">
-        <img src="./[[bar[2]]].jpg">
-        </body></html>''',
-  }, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head></head><body>
-        <img src="{{(bar[2] + baz[\'foo\']) * 14 / foobar() - 0.5}}.jpg">
-        <img src="[[bar[2]]].jpg">
-        </body></html>''',
-  }, null, StringFormatter.noNewlinesOrSurroundingWhitespace);
-
-  testPhases('multiple bindings can exist in paths', phases, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head></head><body>
-        <img src="./{{bar[0]}}/{{baz[1]}}.{{extension}}">
-        </body></html>''',
-  }, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head></head><body>
-        <img src="{{bar[0]}}/{{baz[1]}}.{{extension}}">
-        </body></html>''',
-  }, null, StringFormatter.noNewlinesOrSurroundingWhitespace);
-
-  testPhases('relative paths in deep imports', phases, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="foo/foo.html">
-        </head></html>''',
-    'a|web/foo/foo.html': '''
-        <link rel="import" href="bar.html">''',
-    'a|web/foo/bar.html': '''
-        <style rel="stylesheet" href="baz.css"></style>
-        <style rel="stylesheet" href="../css/zap.css"></style>''',
-    'a|web/foo/baz.css': '',
-    'a|web/css/zap.css': '',
-  }, {
-    'a|web/test.html': '''
-        <!DOCTYPE html><html><head></head><body>
-        <div hidden="">
-          <style rel="stylesheet" href="foo/baz.css"></style>
-          <style rel="stylesheet" href="css/zap.css"></style>
-        </div>
-        </body></html>''',
-  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
-}
-
-void entryPointTests() {
-  testPhases('one level deep entry points normalize correctly', phases, {
-    'a|web/test/test.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="../../packages/a/foo/foo.html">
-        </head></html>''',
-    'a|lib/foo/foo.html': '''
-        <script rel="import" href="../../../packages/b/bar/bar.js">
-        </script>''',
-    'b|lib/bar/bar.js': '''
-        console.log("here");''',
-  }, {
-    'a|web/test/test.html': '''
-        <!DOCTYPE html><html><head></head><body>
-        <div hidden="">
-        <script rel="import" href="../packages/b/bar/bar.js"></script>
-        </div>
-        </body></html>''',
-  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
-
-  testPhases('includes in entry points normalize correctly', phases, {
-    'a|web/test/test.html': '''
-        <!DOCTYPE html><html><head>
-        <script src="packages/a/foo/bar.js"></script>
-        </head></html>''',
-    'a|lib/foo/bar.js': '''
-        console.log("here");''',
-  }, {
-    'a|web/test/test.html': '''
-        <!DOCTYPE html><html><head>
-        <script src="../packages/a/foo/bar.js"></script>
-        </head><body>
-        </body></html>''',
-  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
-
-  testPhases('two level deep entry points normalize correctly', phases, {
-    'a|web/test/well/test.html': '''
-        <!DOCTYPE html><html><head>
-        <link rel="import" href="../../../packages/a/foo/foo.html">
-        </head></html>''',
-    'a|lib/foo/foo.html': '''
-        <script rel="import" href="../../../packages/b/bar/bar.js"></script>''',
-    'b|lib/bar/bar.js': '''
-        console.log("here");''',
-  }, {
-    'a|web/test/well/test.html': '''
-        <!DOCTYPE html><html><head></head><body>
-        <div hidden="">
-        <script rel="import" href="../../packages/b/bar/bar.js"></script>
-        </div>
-        </body></html>''',
-  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
 }
diff --git a/test/build/script_compactor_test.dart b/test/build/script_compactor_test.dart
index a5b07f6..a72f3e6 100644
--- a/test/build/script_compactor_test.dart
+++ b/test/build/script_compactor_test.dart
@@ -173,6 +173,44 @@
     // Replace invalid character followed by number.
     'a|web/%05_test.html.0.dart': 'library a.web._05_test_html_0;\n/*5*/',
   }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
+
+  testPhases('file names with hyphens are ok', phases, {
+    'a|web/a-b.html': '''
+        <!DOCTYPE html><html><head></head><body>
+          <script type="application/dart" src="a-b.dart"></script>
+        </body></html>''',
+    'a|web/a-b.dart': '''
+        library a.a_b;
+        main(){}''',
+  }, {
+    'a|web/a-b.html': '''
+        <!DOCTYPE html><html><head></head><body>
+        <script type="application/dart" src="a-b.bootstrap.dart"></script>
+        </body></html>''',
+    'a|web/a-b.bootstrap.dart': '''
+        library a.web.a_b_bootstrap_dart;
+
+        import 'a-b.dart' as i0;
+
+        main() => i0.main();''',
+    'a|web/a-b.dart': '''
+        library a.a_b;
+        main(){}''',
+  }, [], StringFormatter.noNewlinesOrSurroundingWhitespace);
+
+  testPhases('package names with hyphens give an error', phases, {
+    'a-b|web/a.html': '''
+        <!DOCTYPE html><html><head></head><body>
+          <script type="application/dart" src="a.dart"></script>
+        </body></html>''',
+    'a-b|web/a.dart': '''
+        library a.a;
+        main(){}''',
+  }, {}, [
+    'error: Invalid package name `a-b`. Package names should be '
+    'valid dart identifiers, as indicated at '
+    'https://www.dartlang.org/tools/pub/pubspec.html#name.'
+  ], StringFormatter.noNewlinesOrSurroundingWhitespace);
 }
 
 void codeExtractorTests() {