Replace bootstrap logic with 'boot.js', use 'component/dart' mime-type and add

pkg/polymer/lib/src/build/script_compactor.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /// Transfomer that combines multiple dart script tags into a single one.
 library polymer.src.build.script_compactor;
 
 import 'dart:async';
 import 'dart:convert';
 
 import 'package:html5lib/dom.dart' show Document, Element, Text;
 import 'package:html5lib/dom_parsing.dart';
+import 'package:html5lib/parser.dart' show parseFragment;
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart' hide Element;
 import 'package:analyzer/src/generated/element.dart' as analyzer show Element;
 import 'package:barback/barback.dart';
 import 'package:code_transformers/assets.dart';
 import 'package:path/path.dart' as path;
 import 'package:source_maps/span.dart' show SourceFile;
 import 'package:smoke/codegen/generator.dart';
 import 'package:smoke/codegen/recorder.dart';
 import 'package:code_transformers/resolver.dart';
@@ skipping 40 matching lines @@
   final AssetId docId;
   final AssetId bootstrapId;
 
   /// HTML document parsed from [docId].
   Document document;
 
   /// List of ids for each Dart entry script tag (the main tag and any tag
   /// included on each custom element definition).
   List<AssetId> entryLibraries;
 
-  /// The id of the main Dart program.
-  AssetId mainLibraryId;
-
-  /// Script tag that loads the Dart entry point.
-  Element mainScriptTag;
-
   /// Initializers that will register custom tags or invoke `initMethod`s.
   final List<_Initializer> initializers = [];
 
   /// Attributes published on a custom-tag. We make these available via
   /// reflection even if @published was not used.
   final Map<String, List<String>> publishedAttributes = {};
 
   /// Hook needed to access the analyzer within barback transformers.
   final Resolvers resolvers;
 
@@ skipping 34 matching lines @@
 
   /// Removes unnecessary script tags, and identifies the main entry point Dart
   /// script tag (if any).
   void _processHtml(_) {
     for (var tag in document.querySelectorAll('script')) {
       var src = tag.attributes['src'];
       if (src == 'packages/polymer/boot.js') {
         tag.remove();
         continue;
       }
-      if (tag.attributes['type'] != 'application/dart') continue;
-      if (src == null) {
-        logger.warning('unexpected script without a src url. The '
+      var type = tag.attributes['type'];
+      if (type == 'components/dart') {
+        logger.warning('unexpected script. The '
           'ScriptCompactor transformer should run after running the '
-          'InlineCodeExtractor', span: tag.sourceSpan);
-        continue;
+          'ImportInliner', span: tag.sourceSpan);
       }
-      if (mainLibraryId != null) {
-        logger.warning('unexpected script. Only one Dart script tag '
-          'per document is allowed.', span: tag.sourceSpan);
-        tag.remove();
-        continue;
-      }
-      mainLibraryId = uriToAssetId(docId, src, logger, tag.sourceSpan);
-      mainScriptTag = tag;
     }
   }
 
   /// Emits the main HTML and Dart bootstrap code for the application. If there
   /// were not Dart entry point files, then this simply emits the original HTML.
   Future _emitNewEntrypoint(_) {
-    if (mainScriptTag == null) {
-      // We didn't find any main library, nothing to do.
+    if (entryLibraries.isEmpty) {
+      // We didn't find code, nothing to do.
       transform.addOutput(transform.primaryInput);
       return null;
     }
 
-    // Emit the bootstrap .dart file
-    mainScriptTag.attributes['src'] = path.url.basename(bootstrapId.path);
-    entryLibraries.add(mainLibraryId);
-
     return _initResolver()
         .then(_extractUsesOfMirrors)
         .then(_emitFiles)
-        .then((_) => resolver.release());
+        .whenComplete(() => resolver.release());

[Jennifer Messerly, 2014/04/04 19:39:50]

nice catch!

[Siggi Cherem (dart-lang), 2014/04/04 21:09:11]

yeah, Pete noticed this in code_transformers and then I followed. Whenever test
had failures, we were seeing timeouts because of this (we didn't release on a
failing test, and then the following test would be in deadlock)

   }
 
   /// Load a resolver that computes information for every library in
   /// [entryLibraries], then use it to initialize the [recorder] (for import
   /// resolution) and to resolve specific elements (for analyzing the user's
   /// code).
   Future _initResolver() => resolvers.get(transform, entryLibraries).then((r) {
     resolver = r;
     types = new _ResolvedTypes(resolver);
   });
@@ skipping 174 matching lines @@
       code.writeln("import '$url' as i$i;");
       prefixes[id] = 'i$i';
       i++;
     }
 
     // Include smoke initialization.
     generator.writeImports(code);
     generator.writeTopLevelDeclarations(code);
     code.writeln('\nvoid main() {');
     generator.writeInitCall(code);
-    code.writeln('  configureForDeployment([');
+    code.writeln('  startPolymer([');
 
     // Include initializers to switch from mirrors_loader to static_loader.
     for (var init in initializers) {
       var initCode = init.asCode(prefixes[init.assetId]);
       code.write("      $initCode,\n");
     }
     code..writeln('    ]);')
-        ..writeln('  i${entryLibraries.length - 1}.main();')
         ..writeln('}');
     transform.addOutput(new Asset.fromString(bootstrapId, code.toString()));
+
+
+    // Emit the bootstrap .dart file
+    var srcUrl = path.url.basename(bootstrapId.path);
+    document.body.nodes.add(parseFragment(
+          '<script type="application/dart" src="$srcUrl"></script>'));
     transform.addOutput(new Asset.fromString(docId, document.outerHtml));
   }
 
   _spanForNode(analyzer.Element context, AstNode node) {
     var file = resolver.getSourceFile(context);
     return file.span(node.offset, node.end);
   }
 }
 
 abstract class _Initializer {
@@ skipping 312 matching lines @@
   for (var c in combinators) {
     if (c is ShowElementCombinator) {
       var show = c.shownNames.toSet();
       elements.retainWhere((e) => show.contains(e.displayName));
     } else if (c is HideElementCombinator) {
       var hide = c.hiddenNames.toSet();
       elements.removeWhere((e) => hide.contains(e.displayName));
     }
   }
 }