Use real "package:" imports in pub's plugin-loading code.

sdk/lib/_internal/pub/lib/src/barback/load_transformers.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.
 
 library pub.load_transformers;
 
 import 'dart:async';
 import 'dart:convert';
 import 'dart:isolate';
 
@@ skipping 16 matching lines @@
 /// Load and return all transformers and groups from the library identified by
 /// [id].
 Future<Set> loadTransformers(BuildEnvironment environment,
     BarbackServer transformerServer, TransformerId id) {
   return id.getAssetId(environment.barback).then((assetId) {
     var path = assetId.path.replaceFirst('lib/', '');
     // TODO(nweiz): load from a "package:" URI when issue 12474 is fixed.
 
     var baseUrl = transformerServer.url;
     var uri = '$baseUrl/packages/${id.package}/$path';
-    var code = 'import "$uri";\n' +
-        readAsset(p.join("dart", "transformer_isolate.dart"))
-            .replaceAll('<<URL_BASE>>', baseUrl);
+    var code = """
+        import 'dart:isolate';
+
+        import '$uri';
+
+        import r'$baseUrl/packages/\$pub/transformer_isolate.dart';
+
+        void main(_, SendPort replyTo) => loadTransformers(replyTo);
+        """;
     log.fine("Loading transformers from $assetId");
 
     var port = new ReceivePort();
     return dart.runInIsolate(code, port.sendPort)
         .then((_) => port.first)
         .then((sendPort) {
       return _call(sendPort, {
         'library': uri,
         'mode': environment.mode.name,
         // TODO(nweiz): support non-JSON-encodable configuration maps.
         'configuration': JSON.encode(id.configuration)
       }).then((transformers) {
         transformers = transformers.map(
             (transformer) => _deserializeTransformerOrGroup(transformer, id))
             .toSet();
         log.fine("Transformers from $assetId: $transformers");
         return transformers;
       });
     }).catchError((error, stackTrace) {
       if (error is! dart.CrossIsolateException) throw error;
       if (error.type != 'IsolateSpawnException') throw error;
       // TODO(nweiz): don't parse this as a string once issues 12617 and 12689
       // are fixed.
-      if (!error.message.split('\n')[1].startsWith('import "$uri";')) {
+      if (!error.message.split('\n')[1].endsWith("import '$uri';")) {
         throw error;
       }
 
       // If there was an IsolateSpawnException and the import that actually
       // failed was the one we were loading transformers from, throw an
       // application exception with a more user-friendly message.
       fail('Transformer library "package:${id.package}/$path" not found.',
           error, stackTrace);
     });
   });
@@ skipping 67 matching lines @@
       if (message['type'] == 'getInput') {
         return transform.getInput(_deserializeId(message['id']))
             .then((asset) => serializeAsset(asset));
       }
 
       if (message['type'] == 'addOutput') {
         transform.addOutput(deserializeAsset(message['output']));
         return null;
       }
 
+      if (message['type'] == 'consumePrimary') {
+        transform.consumePrimary();
+        return null;
+      }
+
       assert(message['type'] == 'log');
       var method;
       if (message['level'] == 'Info') {
         method = transform.logger.info;
       } else if (message['level'] == 'Fine') {
         method = transform.logger.fine;
       } else if (message['level'] == 'Warning') {
         method = transform.logger.warning;
       } else {
         assert(message['level'] == 'Error');
@@ skipping 116 matching lines @@
 ///
 /// This handles [AssetNotFoundException]s specially, ensuring that their
 /// metadata is preserved.
 dart.CrossIsolateException _deserializeException(Map error) {
   if (error['type'] == 'AssetNotFoundException') {
     return new _CrossIsolateAssetNotFoundException.deserialize(error);
   } else {
     return new dart.CrossIsolateException.deserialize(error);
   }
 }