diff --git a/bin/internal/engine.version b/bin/internal/engine.version index c1175c154f..2734d455fb 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -ea756c55f29a1f1143a17379c70422d5438ad891 +83b9a591a3d55d3bb5ccdff8c1919c943a92bb45 diff --git a/bin/internal/fuchsia-linux.version b/bin/internal/fuchsia-linux.version index 745816395a..04d68c0712 100644 --- a/bin/internal/fuchsia-linux.version +++ b/bin/internal/fuchsia-linux.version @@ -1 +1 @@ -F1U6IH2NfVsK5l7JlKW_deE1-ApiQdSgyAVr2VC9Y98C +aRT7s0Yct4Lq9GgwT91hdeaKh02yh-YUWqS_Vmy3kowC diff --git a/packages/flutter_tools/lib/src/build_system/targets/web.dart b/packages/flutter_tools/lib/src/build_system/targets/web.dart index 6982fab50f..35b7b4e765 100644 --- a/packages/flutter_tools/lib/src/build_system/targets/web.dart +++ b/packages/flutter_tools/lib/src/build_system/targets/web.dart @@ -207,7 +207,7 @@ class Dart2JSTarget extends Target { ...sharedCommandOptions, '-o', environment.buildDir.childFile('app.dill').path, - '--packages=.packages', + '--packages=.dart_tool/package_config.json', '--cfe-only', environment.buildDir.childFile('main.dart').path, // dartfile ]); diff --git a/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart index 38c94045fd..ac54d6c018 100644 --- a/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart +++ b/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart @@ -337,7 +337,7 @@ void main() { '--no-source-maps', '-o', environment.buildDir.childFile('app.dill').absolute.path, - '--packages=.packages', + '--packages=.dart_tool/package_config.json', '--cfe-only', environment.buildDir.childFile('main.dart').absolute.path, ] @@ -373,7 +373,7 @@ void main() { '--no-source-maps', '-o', environment.buildDir.childFile('app.dill').absolute.path, - '--packages=.packages', + '--packages=.dart_tool/package_config.json', '--cfe-only', environment.buildDir.childFile('main.dart').absolute.path, ] @@ -406,7 +406,7 @@ void main() { '--no-source-maps', '-o', environment.buildDir.childFile('app.dill').absolute.path, - '--packages=.packages', + '--packages=.dart_tool/package_config.json', '--cfe-only', environment.buildDir.childFile('main.dart').absolute.path, ] @@ -438,7 +438,7 @@ void main() { '--no-source-maps', '-o', environment.buildDir.childFile('app.dill').absolute.path, - '--packages=.packages', + '--packages=.dart_tool/package_config.json', '--cfe-only', environment.buildDir.childFile('main.dart').absolute.path, ] @@ -471,7 +471,7 @@ void main() { '--no-source-maps', '-o', environment.buildDir.childFile('app.dill').absolute.path, - '--packages=.packages', + '--packages=.dart_tool/package_config.json', '--cfe-only', environment.buildDir.childFile('main.dart').absolute.path, ] @@ -504,7 +504,7 @@ void main() { '--no-source-maps', '-o', environment.buildDir.childFile('app.dill').absolute.path, - '--packages=.packages', + '--packages=.dart_tool/package_config.json', '--cfe-only', environment.buildDir.childFile('main.dart').absolute.path, ] @@ -535,7 +535,7 @@ void main() { '--no-source-maps', '-o', environment.buildDir.childFile('app.dill').absolute.path, - '--packages=.packages', + '--packages=.dart_tool/package_config.json', '--cfe-only', environment.buildDir.childFile('main.dart').absolute.path, ], onRun: () { @@ -567,7 +567,7 @@ void main() { '--no-source-maps', '-o', environment.buildDir.childFile('app.dill').absolute.path, - '--packages=.packages', + '--packages=.dart_tool/package_config.json', '--cfe-only', environment.buildDir.childFile('main.dart').absolute.path, ] @@ -600,7 +600,7 @@ void main() { '-Ddart.vm.product=true', '-o', environment.buildDir.childFile('app.dill').absolute.path, - '--packages=.packages', + '--packages=.dart_tool/package_config.json', '--cfe-only', environment.buildDir.childFile('main.dart').absolute.path, ] @@ -634,7 +634,7 @@ void main() { '--no-source-maps', '-o', environment.buildDir.childFile('app.dill').absolute.path, - '--packages=.packages', + '--packages=.dart_tool/package_config.json', '--cfe-only', environment.buildDir.childFile('main.dart').absolute.path, ] diff --git a/packages/flutter_tools/test/integration.shard/web_plugin_registrant_test.dart b/packages/flutter_tools/test/integration.shard/web_plugin_registrant_test.dart index 48e0b287ee..562871b7d6 100644 --- a/packages/flutter_tools/test/integration.shard/web_plugin_registrant_test.dart +++ b/packages/flutter_tools/test/integration.shard/web_plugin_registrant_test.dart @@ -135,7 +135,7 @@ Future _ensureFlutterToolsSnapshot() async { ), ); final String dotPackages = globals.fs.path.absolute(globals.fs.path.join( - '.packages', + '.dart_tool/package_config.json', )); final File snapshotFile = globals.fs.file(flutterToolsSnapshotPath);