Use workspaces

.gitignore

@@ -8,7 +8,7 @@ pubspec.lock
 /*/build/
 
 # Include .packages files from tests which are hand coded
-!build_runner_core/test/fixtures/**/.packages
+!build_runner_core/test/fixtures/**/.dart_tool/
 !build_runner_core/test/fixtures/**/pubspec.lock
 
 # Extra files from dart2js that we don't want

_test/analysis_options.yaml

@@ -1 +1 @@
-include: ../analysis/analysis_options.yaml
+include: ../analysis_options.yaml

_test/pkgs/provides_builder/pubspec.yaml

@@ -1,5 +1,5 @@
 name: provides_builder
-
+resolution: workspace
 environment:
   sdk: ^3.5.0-259.0.dev
 

_test/pubspec.yaml

@@ -1,5 +1,6 @@
 name: _test
 publish_to: none
+resolution: workspace
 
 environment:
   sdk: ^3.5.0-259.0.dev
@@ -14,32 +15,9 @@ dev_dependencies:
   build_runner_core: any
   build_test: any
   build_web_compilers: any
-  dart_flutter_team_lints: ^3.1.0
   io: ^1.0.0
   path: ^1.8.0
   provides_builder:
     path: pkgs/provides_builder/
   test: ^1.16.0
   test_process: ^2.0.0
-
-dependency_overrides:
-  build:
-    path: ../build
-  build_config:
-    path: ../build_config
-  build_daemon:
-    path: ../build_daemon
-  build_modules:
-    path: ../build_modules
-  build_resolvers:
-    path: ../build_resolvers
-  build_runner:
-    path: ../build_runner
-  build_runner_core:
-    path: ../build_runner_core
-  build_test:
-    path: ../build_test
-  build_web_compilers:
-    path: ../build_web_compilers
-  scratch_space:
-    path: ../scratch_space

_test/test/common/utils.dart

@@ -5,6 +5,7 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
+import 'dart:isolate';
 
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
@@ -30,11 +31,12 @@ Future<ProcessResult> runCommand(List<String> args) =>
 /// build to complete.
 ///
 /// To ensure a clean build, set [ensureCleanBuild] to `true`.
-Future<void> startServer({bool? ensureCleanBuild, List<String>? buildArgs}) =>
+Future<void> startServer(
+        {bool? ensureCleanBuild, List<String>? buildArgs}) async =>
     _startServer(
       'dart',
       [
-        '--packages=.dart_tool/package_config.json',
+        '--packages=${(await Isolate.packageConfig).toString()}',
         p.join('..', 'build_runner', 'bin', 'build_runner.dart'),
         'serve',
         '--verbose',

_test_common/analysis_options.yaml

@@ -1 +1 @@
-include: ../analysis/analysis_options.yaml
+include: ../analysis_options.yaml

_test_common/lib/package_graphs.dart

@@ -21,10 +21,10 @@ PackageNode package(String packageName,
         DependencyType? type,
         LanguageVersion? languageVersion}) =>
     PackageNode(packageName, path ?? '/$packageName',
-        type ?? DependencyType.path, languageVersion ?? LanguageVersion(0, 0));
+        type ?? DependencyType.path, languageVersion);
 
 PackageNode rootPackage(String packageName,
         {String? path, LanguageVersion? languageVersion}) =>
     PackageNode(packageName, path ?? '/$packageName', DependencyType.path,
-        languageVersion ?? LanguageVersion(0, 0),
+        languageVersion,
         isRoot: true);

_test_common/pubspec.yaml

@@ -1,6 +1,7 @@
 name: _test_common
 publish_to: none
 description: Test infra for writing build tests. Is not published.
+resolution: workspace
 
 environment:
   sdk: ^3.5.0-259.0.dev
@@ -18,18 +19,3 @@ dependencies:
   test: ^1.16.0
   test_descriptor: ^2.0.0
   watcher: ^1.0.0
-
-dev_dependencies:
-  dart_flutter_team_lints: ^3.1.0
-
-dependency_overrides:
-  build:
-    path: ../build
-  build_config:
-    path: ../build_config
-  build_resolvers:
-    path: ../build_resolvers
-  build_runner_core:
-    path: ../build_runner_core
-  build_test:
-    path: ../build_test

build/analysis_options.yaml

@@ -1 +1 @@
-include: ../analysis/analysis_options.yaml
+include: ../analysis_options.yaml

build/pubspec.yaml

@@ -2,6 +2,7 @@ name: build
 version: 2.4.2-wip
 description: A package for authoring build_runner compatible code generators.
 repository: https://github.com/dart-lang/build/tree/master/build
+resolution: workspace
 
 environment:
   sdk: ^3.5.0-259.0.dev
@@ -20,7 +21,6 @@ dependencies:
 dev_dependencies:
   build_resolvers: ^2.4.0
   build_test: ^2.0.0
-  dart_flutter_team_lints: ^3.1.0
   test: ^1.16.0
 
 topics:

build_config/analysis_options.yaml

@@ -1 +1 @@
-include: ../analysis/analysis_options.yaml
+include: ../analysis_options.yaml

build_config/pubspec.yaml

@@ -3,6 +3,7 @@ version: 1.1.2-wip
 description: >-
   Format definition and support for parsing `build.yaml` configuration.
 repository: https://github.com/dart-lang/build/tree/master/build_config
+resolution: workspace
 
 environment:
   sdk: ^3.5.0-259.0.dev
@@ -16,7 +17,6 @@ dependencies:
 
 dev_dependencies:
   build_runner: ^2.0.0
-  dart_flutter_team_lints: ^3.1.0
   json_serializable: ^6.0.0
   term_glyph: ^1.2.0
   test: ^1.16.0

build_daemon/analysis_options.yaml

@@ -1 +1 @@
-include: ../analysis/analysis_options.yaml
+include: ../analysis_options.yaml

build_daemon/pubspec.yaml

@@ -2,6 +2,7 @@ name: build_daemon
 version:  4.0.3-wip
 description: A daemon for running Dart builds.
 repository: https://github.com/dart-lang/build/tree/master/build_daemon
+resolution: workspace
 
 environment:
   sdk: ^3.5.0-259.0.dev
@@ -25,15 +26,10 @@ dev_dependencies:
   build_runner: ^2.0.0
   # TODO: untangle analyzer dependency
   built_value_generator: ^8.1.0
-  dart_flutter_team_lints: ^3.1.0
   mockito: ^5.0.0
   test: ^1.25.5
   test_descriptor: ^2.0.0
   uuid: ^3.0.0
 
-dependency_overrides:
-  build_runner:
-    path: ../build_runner
-
 topics:
  - build-runner

build_modules/analysis_options.yaml

@@ -1 +1 @@
-include: ../analysis/analysis_options.yaml
+include: ../analysis_options.yaml

build_modules/lib/src/scratch_space.dart

@@ -5,6 +5,7 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
+import 'dart:isolate';
 import 'dart:math' as math;
 
 import 'package:build/build.dart';
@@ -22,15 +23,15 @@ final scratchSpace = ScratchSpace();
 
 /// A shared [Resource] for a [ScratchSpace], which cleans up the contents of
 /// the [ScratchSpace] in dispose, but doesn't delete it entirely.
-final scratchSpaceResource = Resource<ScratchSpace>(() {
+final scratchSpaceResource = Resource<ScratchSpace>(() async {
   if (!scratchSpace.exists) {
     scratchSpace.tempDir.createSync(recursive: true);
     scratchSpace.exists = true;
   }
   var packageConfigFile = File(
       p.join(scratchSpace.tempDir.path, '.dart_tool', 'package_config.json'));
   if (!packageConfigFile.existsSync()) {
-    var originalConfigFile = File(p.join('.dart_tool', 'package_config.json'));
+    var originalConfigFile = File.fromUri((await Isolate.packageConfig)!);
     var packageConfigContents = _scratchSpacePackageConfig(
         originalConfigFile.readAsStringSync(), originalConfigFile.absolute.uri);
     packageConfigFile
@@ -94,6 +95,9 @@ String _scratchSpacePackageConfig(String rootConfig, Uri packageConfigUri) {
   var foundRoot = false;
   for (var package in packages) {
     var rootUri = packageConfigUri.resolve(package['rootUri'] as String);
+    if (!rootUri.path.endsWith('/') && _currentDirUri.path.endsWith('/')) {
+      rootUri = rootUri.replace(path: '${rootUri.path}/');
+    }
     // We expect to see exactly one package where the root uri is equal to
     // the current directory, and that is the current packge.
     if (rootUri == _currentDirUri) {

build_modules/pubspec.yaml

@@ -4,9 +4,10 @@ description: >-
   Builders to analyze and split Dart code into individually compilable modules
   based on imports.
 repository: https://github.com/dart-lang/build/tree/master/build_modules
+resolution: workspace
 
 environment:
-  sdk: '>=3.0.0 <3.6.0'
+  sdk: '>=3.5.0-259.0.dev <3.6.0'
 
 dependencies:
   analyzer: '>=5.1.0 <7.0.0'
@@ -32,7 +33,6 @@ dev_dependencies:
   # Used inside tests
   build_runner: ^2.0.0
   build_test: ^2.0.0
-  dart_flutter_team_lints: ^3.1.0
   json_serializable: ^6.0.0
   test: ^1.16.0
 

build_modules/test/fixtures/a/pubspec.yaml

@@ -1,5 +1,5 @@
 name: a
-
+resolution: workspace
 environment:
   sdk: ^3.5.0-259.0.dev
 

build_modules/test/fixtures/b/pubspec.yaml

@@ -1,5 +1,5 @@
 name: b
-
+resolution: workspace
 environment:
   sdk: ^3.5.0-259.0.dev
 

build_resolvers/analysis_options.yaml

@@ -1 +1 @@
-include: ../analysis/analysis_options.yaml
+include: ../analysis_options.yaml

build_resolvers/pubspec.yaml

@@ -2,6 +2,7 @@ name: build_resolvers
 version: 2.4.3-wip
 description: Resolve Dart code in a Builder
 repository: https://github.com/dart-lang/build/tree/master/build_resolvers
+resolution: workspace
 
 environment:
   sdk: ^3.5.0-259.0.dev
@@ -24,7 +25,6 @@ dependencies:
 
 dev_dependencies:
   build_test: ^2.0.0
-  dart_flutter_team_lints: ^3.1.0
   test: ^1.16.0
 
 topics:

build_runner/analysis_options.yaml

@@ -1 +1 @@
-include: ../analysis/analysis_options.yaml
+include: ../analysis_options.yaml

build_runner/lib/src/generate/watch_impl.dart

@@ -332,8 +332,14 @@ class WatchImpl implements BuildState {
     () async {
       await logTimedAsync(_logger, 'Waiting for all file watchers to be ready',
           () => graphWatcher.ready);
-      originalRootPackageConfigDigest = md5.convert(
-          await watcherEnvironment.reader.readAsBytes(rootPackageConfigId));
+      if (await watcherEnvironment.reader.canRead(rootPackageConfigId)) {
+        originalRootPackageConfigDigest = md5.convert(
+            await watcherEnvironment.reader.readAsBytes(rootPackageConfigId));
+      } else {
+        _logger.warning(
+            'Root package config not readable, manual restarts will be needed '
+            'after running `pub upgrade`.');
+      }
 
       BuildResult firstBuild;
       BuildImpl? build;

build_runner/pubspec.yaml

@@ -2,6 +2,7 @@ name: build_runner
 version: 2.4.12-wip
 description: A build system for Dart code generation and modular compilation.
 repository: https://github.com/dart-lang/build/tree/master/build_runner
+resolution: workspace
 
 environment:
   sdk: ^3.5.0-259.0.dev
@@ -52,7 +53,6 @@ dev_dependencies:
     path: ../_test_common
   build_test: ^2.0.0
   build_web_compilers: ^4.0.0
-  dart_flutter_team_lints: ^3.1.0
   stream_channel: ^2.0.0
   test: ^1.25.5
   test_descriptor: ^2.0.0