| Index: sdk/lib/_internal/pub/lib/src/barback/asset_environment.dart
|
| diff --git a/sdk/lib/_internal/pub/lib/src/barback/asset_environment.dart b/sdk/lib/_internal/pub/lib/src/barback/asset_environment.dart
|
| index 197f93b6237a4b3d42775be1fdf8dbacd2f5a929..3ddb0ad097fc39cd5be62c3ad83b61c6347e90ee 100644
|
| --- a/sdk/lib/_internal/pub/lib/src/barback/asset_environment.dart
|
| +++ b/sdk/lib/_internal/pub/lib/src/barback/asset_environment.dart
|
| @@ -70,8 +70,8 @@ class AssetEnvironment {
|
| if (hostname == null) hostname = "localhost";
|
| if (basePort == null) basePort = 0;
|
|
|
| - return entrypoint.loadPackageGraph().then((graph) {
|
| - log.fine("Loaded package graph.");
|
| + return log.progress("Loading asset environment", () async {
|
| + var graph = await entrypoint.loadPackageGraph();
|
| graph = _adjustPackageGraph(graph, mode, packages);
|
| var barback = new Barback(new PubPackageProvider(graph));
|
| barback.log.listen(_log);
|
| @@ -79,9 +79,9 @@ class AssetEnvironment {
|
| var environment = new AssetEnvironment._(graph, barback, mode,
|
| watcherType, hostname, basePort);
|
|
|
| - return environment._load(entrypoints: entrypoints, useDart2JS: useDart2JS)
|
| - .then((_) => environment);
|
| - });
|
| + await environment._load(entrypoints: entrypoints, useDart2JS: useDart2JS);
|
| + return environment;
|
| + }, fine: true);
|
| }
|
|
|
| /// Return a version of [graph] that's restricted to [packages] (if passed)
|
| @@ -474,7 +474,7 @@ class AssetEnvironment {
|
| }
|
|
|
| // Bind a server that we can use to load the transformers.
|
| - var transformerServer = await BarbackServer.bind(this, _hostname, 0);
|
| + var transformerServer = BarbackServer.bind(this, _hostname, 0);
|
|
|
| var errorStream = barback.errors.map((error) {
|
| // Even most normally non-fatal barback errors should take down pub if
|
|
|