expose librariesPath in DevCompilerBuilder (#2404)

Only change required to resolve import issues with package:http. Mirrors the way libraries was exposed from the kernel builder. flutter/flutter#34858
dart-lang · Aug 12, 2019 · c23f943 · c23f943
1 parent d4bd2de
commit c23f943
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/build_web_compilers/CHANGELOG.md b/build_web_compilers/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.2.0
+
+- Make `librariesPath` configurable in `DevCompilerBuilder`.
+
 ## 2.1.5
 
 - Add pre-emptive support for an upcoming breaking change in ddc

diff --git a/build_web_compilers/lib/src/dev_compiler_builder.dart b/build_web_compilers/lib/src/dev_compiler_builder.dart
@@ -39,13 +39,21 @@ class DevCompilerBuilder implements Builder {
   /// directory, which contains the platform kernel files.
   final String platformSdk;
 
+  /// The absolute path to the libraries file for the current platform.
+  ///
+  /// If not provided, defaults to "lib/libraries.json" in the sdk directory.
+  final String librariesPath;
+
   DevCompilerBuilder(
       {bool useIncrementalCompiler,
       @required this.platform,
       this.sdkKernelPath,
+      String librariesPath,
       String platformSdk})
       : useIncrementalCompiler = useIncrementalCompiler ?? true,
         platformSdk = platformSdk ?? sdkDir,
+        librariesPath = librariesPath ??
+            p.join(platformSdk ?? sdkDir, 'lib', 'libraries.json'),
         buildExtensions = {
           moduleExtension(platform): [
             jsModuleExtension,
@@ -77,7 +85,7 @@ class DevCompilerBuilder implements Builder {
 
     try {
       await _createDevCompilerModule(module, buildStep, useIncrementalCompiler,
-          platformSdk, sdkKernelPath);
+          platformSdk, sdkKernelPath, librariesPath);
     } on DartDevcCompilationException catch (e) {
       await handleError(e);
     } on MissingModulesException catch (e) {
@@ -87,8 +95,13 @@ class DevCompilerBuilder implements Builder {
 }
 
 /// Compile [module] with the dev compiler.
-Future<void> _createDevCompilerModule(Module module, BuildStep buildStep,
-    bool useIncrementalCompiler, String dartSdk, String sdkKernelPath,
+Future<void> _createDevCompilerModule(
+    Module module,
+    BuildStep buildStep,
+    bool useIncrementalCompiler,
+    String dartSdk,
+    String sdkKernelPath,
+    String librariesPath,
     {bool debugMode = true}) async {
   var transitiveDeps = await buildStep.trackStage('CollectTransitiveDeps',
       () => module.computeTransitiveDependencies(buildStep));
@@ -122,6 +135,7 @@ Future<void> _createDevCompilerModule(Module module, BuildStep buildStep,
       '--multi-root=.',
       '--track-widget-creation',
       '--inline-source-map',
+      '--libraries-file=${p.toUri(librariesPath)}',
       if (useIncrementalCompiler) ...[
         '--reuse-compiler-result',
         '--use-incremental-compiler',

diff --git a/build_web_compilers/pubspec.yaml b/build_web_compilers/pubspec.yaml
@@ -1,5 +1,5 @@
 name: build_web_compilers
-version: 2.1.5
+version: 2.2.0
 description: Builder implementations wrapping Dart compilers.
 author: Dart Team <misc@dartlang.org>
 homepage: https://github.com/dart-lang/build/tree/master/build_web_compilers