From aaa9cead703fec582293935f8f4a3de4beaf7573 Mon Sep 17 00:00:00 2001 From: sigmundch Date: Fri, 10 Mar 2023 19:24:34 -0800 Subject: [PATCH] [tool][web] Pass invoker flag to dart2js. (#122344) [tool][web] Pass invoker flag to dart2js. --- .../lib/src/build_system/targets/web.dart | 1 + .../build_system/targets/web_test.dart | 23 +++++++++++++++++++ ...ter_build_with_compilation_error_test.dart | 1 + 3 files changed, 25 insertions(+) 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 e08d822e72f..e69dbda3a46 100644 --- a/packages/flutter_tools/lib/src/build_system/targets/web.dart +++ b/packages/flutter_tools/lib/src/build_system/targets/web.dart @@ -211,6 +211,7 @@ class Dart2JSTarget extends Dart2WebTarget { artifacts.getArtifactPath(Artifact.dart2jsSnapshot, platform: TargetPlatform.web_javascript), '--platform-binaries=$platformBinariesPath', ...decodeCommaSeparated(environment.defines, kExtraFrontEndOptions), + '--invoker=flutter_tool', if (nativeNullAssertions) '--native-null-assertions', if (buildMode == BuildMode.profile) 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 91ebd293cea..16893898c43 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 @@ -335,6 +335,7 @@ void main() { command: [ ...kDart2jsLinuxArgs, '--platform-binaries=bin/cache/flutter_web_sdk/kernel', + '--invoker=flutter_tool', '-Ddart.vm.profile=true', '--no-source-maps', '-o', @@ -348,6 +349,7 @@ void main() { command: [ ...kDart2jsLinuxArgs, '--platform-binaries=bin/cache/flutter_web_sdk/kernel', + '--invoker=flutter_tool', '-Ddart.vm.profile=true', '--no-source-maps', '-O4', @@ -373,6 +375,7 @@ void main() { ...kDart2jsLinuxArgs, '--platform-binaries=bin/cache/flutter_web_sdk/kernel', '--enable-experiment=non-nullable', + '--invoker=flutter_tool', '-Ddart.vm.profile=true', '--no-source-maps', '-o', @@ -387,6 +390,7 @@ void main() { ...kDart2jsLinuxArgs, '--platform-binaries=bin/cache/flutter_web_sdk/kernel', '--enable-experiment=non-nullable', + '--invoker=flutter_tool', '-Ddart.vm.profile=true', '--no-source-maps', '-O4', @@ -408,6 +412,7 @@ void main() { command: [ ...kDart2jsLinuxArgs, '--platform-binaries=bin/cache/flutter_web_sdk/kernel', + '--invoker=flutter_tool', '-Ddart.vm.profile=true', '--no-source-maps', '-o', @@ -421,6 +426,7 @@ void main() { command: [ ...kDart2jsLinuxArgs, '--platform-binaries=bin/cache/flutter_web_sdk/kernel', + '--invoker=flutter_tool', '-Ddart.vm.profile=true', '--no-source-maps', '-O4', @@ -442,6 +448,7 @@ void main() { command: [ ...kDart2jsLinuxArgs, '--platform-binaries=bin/cache/flutter_web_sdk/kernel', + '--invoker=flutter_tool', '-Ddart.vm.product=true', '--no-source-maps', '-o', @@ -455,6 +462,7 @@ void main() { command: [ ...kDart2jsLinuxArgs, '--platform-binaries=bin/cache/flutter_web_sdk/kernel', + '--invoker=flutter_tool', '-Ddart.vm.product=true', '--no-source-maps', '-O4', @@ -476,6 +484,7 @@ void main() { command: [ ...kDart2jsLinuxArgs, '--platform-binaries=bin/cache/flutter_web_sdk/kernel', + '--invoker=flutter_tool', '--native-null-assertions', '-Ddart.vm.product=true', '--no-source-maps', @@ -490,6 +499,7 @@ void main() { command: [ ...kDart2jsLinuxArgs, '--platform-binaries=bin/cache/flutter_web_sdk/kernel', + '--invoker=flutter_tool', '--native-null-assertions', '-Ddart.vm.product=true', '--no-source-maps', @@ -512,6 +522,7 @@ void main() { command: [ ...kDart2jsLinuxArgs, '--platform-binaries=bin/cache/flutter_web_sdk/kernel', + '--invoker=flutter_tool', '-Ddart.vm.product=true', '--no-source-maps', '-o', @@ -525,6 +536,7 @@ void main() { command: [ ...kDart2jsLinuxArgs, '--platform-binaries=bin/cache/flutter_web_sdk/kernel', + '--invoker=flutter_tool', '-Ddart.vm.product=true', '--no-source-maps', '-O3', @@ -545,6 +557,7 @@ void main() { command: [ ...kDart2jsLinuxArgs, '--platform-binaries=bin/cache/flutter_web_sdk/kernel', + '--invoker=flutter_tool', '-Ddart.vm.product=true', '--no-source-maps', '-o', @@ -576,6 +589,7 @@ void main() { command: [ ...kDart2jsLinuxArgs, '--platform-binaries=bin/cache/flutter_web_sdk/kernel', + '--invoker=flutter_tool', '-Ddart.vm.product=true', '-DFOO=bar', '-DBAZ=qux', @@ -591,6 +605,7 @@ void main() { command: [ ...kDart2jsLinuxArgs, '--platform-binaries=bin/cache/flutter_web_sdk/kernel', + '--invoker=flutter_tool', '-Ddart.vm.product=true', '-DFOO=bar', '-DBAZ=qux', @@ -614,6 +629,7 @@ void main() { command: [ ...kDart2jsLinuxArgs, '--platform-binaries=bin/cache/flutter_web_sdk/kernel', + '--invoker=flutter_tool', '-Ddart.vm.product=true', '-o', environment.buildDir.childFile('app.dill').absolute.path, @@ -626,6 +642,7 @@ void main() { command: [ ...kDart2jsLinuxArgs, '--platform-binaries=bin/cache/flutter_web_sdk/kernel', + '--invoker=flutter_tool', '-Ddart.vm.product=true', '-O4', '-o', @@ -647,6 +664,7 @@ void main() { command: [ ...kDart2jsLinuxArgs, '--platform-binaries=bin/cache/flutter_web_sdk/kernel', + '--invoker=flutter_tool', '-Ddart.vm.profile=true', '-DFOO=bar', '-DBAZ=qux', @@ -662,6 +680,7 @@ void main() { command: [ ...kDart2jsLinuxArgs, '--platform-binaries=bin/cache/flutter_web_sdk/kernel', + '--invoker=flutter_tool', '-Ddart.vm.profile=true', '-DFOO=bar', '-DBAZ=qux', @@ -686,6 +705,7 @@ void main() { command: [ ...kDart2jsLinuxArgs, '--platform-binaries=bin/cache/flutter_web_sdk/kernel', + '--invoker=flutter_tool', '-Ddart.vm.profile=true', '--no-source-maps', '-o', @@ -699,6 +719,7 @@ void main() { command: [ ...kDart2jsLinuxArgs, '--platform-binaries=bin/cache/flutter_web_sdk/kernel', + '--invoker=flutter_tool', '-Ddart.vm.profile=true', '--no-source-maps', '-O4', @@ -722,6 +743,7 @@ void main() { command: [ ...kDart2jsLinuxArgs, '--platform-binaries=bin/cache/flutter_web_sdk/kernel', + '--invoker=flutter_tool', '-Ddart.vm.profile=true', '--no-source-maps', '-o', @@ -735,6 +757,7 @@ void main() { command: [ ...kDart2jsLinuxArgs, '--platform-binaries=bin/cache/flutter_web_sdk/kernel', + '--invoker=flutter_tool', '-Ddart.vm.profile=true', '--no-source-maps', '-O4', diff --git a/packages/flutter_tools/test/integration.shard/flutter_build_with_compilation_error_test.dart b/packages/flutter_tools/test/integration.shard/flutter_build_with_compilation_error_test.dart index d487f899882..fa997263b5f 100644 --- a/packages/flutter_tools/test/integration.shard/flutter_build_with_compilation_error_test.dart +++ b/packages/flutter_tools/test/integration.shard/flutter_build_with_compilation_error_test.dart @@ -67,6 +67,7 @@ int x = 'String'; result.stderr, contains("A value of type 'String' can't be assigned to a variable of type 'int'."), ); + expect(result.stderr, isNot(contains("Warning: The 'dart2js' entrypoint script is deprecated"))); expect(result.exitCode, 1); }); }