combine script extractor and import inliner

pkg/polymer/lib/transformer.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 used for pub-serve and pub-deploy.
 library polymer.transformer;
 
 import 'package:barback/barback.dart';
 import 'package:observe/transformer.dart';
 
 import 'src/build/build_filter.dart';
-import 'src/build/code_extractor.dart';
 import 'src/build/common.dart';
 import 'src/build/import_inliner.dart';
 import 'src/build/linter.dart';
 import 'src/build/polyfill_injector.dart';
 import 'src/build/script_compactor.dart';
 
 /// The Polymer transformer, which internally runs several phases that will:
 ///   * Extract inlined script tags into their separate files
 ///   * Apply the observable transformer on every Dart script.
 ///   * Inline imported html files
@@ skipping 36 matching lines @@
     error = false;
   } else {
     error = true;
   }
   if (error) {
     print('Invalid value for "entry_points" in the polymer transformer.');
   }
   return entryPoints;
 }
 
+/// Create deploy phases for Polymer. Note that inlining HTML Imports
+/// comes first (other than linter), which allows the rest of the
+/// HTML-processing phases to operate only on HTML that is actually imported.
 List<List<Transformer>> _createDeployPhases(TransformOptions options) {
   return [
     [new Linter(options)],
-    [new InlineCodeExtractor(options)],
+    [new ImportInliner(options)],
     [new ObservableTransformer()],
-    [new ImportInliner(options)],
     [new ScriptCompactor(options)],
     [new PolyfillInjector(options)],
     [new BuildFilter(options)]
   ];
 }