Skip to content

Commit aaa9cea

Browse files
sigmundchsigmundch
authored
[tool][web] Pass invoker flag to dart2js. (#122344)
[tool][web] Pass invoker flag to dart2js.
1 parent ee2fd4b commit aaa9cea

File tree

3 files changed

+25
-0
lines changed

3 files changed

+25
-0
lines changed

‎packages/flutter_tools/lib/src/build_system/targets/web.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ class Dart2JSTarget extends Dart2WebTarget {
211211
artifacts.getArtifactPath(Artifact.dart2jsSnapshot, platform: TargetPlatform.web_javascript),
212212
'--platform-binaries=$platformBinariesPath',
213213
...decodeCommaSeparated(environment.defines, kExtraFrontEndOptions),
214+
'--invoker=flutter_tool',
214215
if (nativeNullAssertions)
215216
'--native-null-assertions',
216217
if (buildMode == BuildMode.profile)

‎packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,7 @@ void main() {
335335
command: <String>[
336336
...kDart2jsLinuxArgs,
337337
'--platform-binaries=bin/cache/flutter_web_sdk/kernel',
338+
'--invoker=flutter_tool',
338339
'-Ddart.vm.profile=true',
339340
'--no-source-maps',
340341
'-o',
@@ -348,6 +349,7 @@ void main() {
348349
command: <String>[
349350
...kDart2jsLinuxArgs,
350351
'--platform-binaries=bin/cache/flutter_web_sdk/kernel',
352+
'--invoker=flutter_tool',
351353
'-Ddart.vm.profile=true',
352354
'--no-source-maps',
353355
'-O4',
@@ -373,6 +375,7 @@ void main() {
373375
...kDart2jsLinuxArgs,
374376
'--platform-binaries=bin/cache/flutter_web_sdk/kernel',
375377
'--enable-experiment=non-nullable',
378+
'--invoker=flutter_tool',
376379
'-Ddart.vm.profile=true',
377380
'--no-source-maps',
378381
'-o',
@@ -387,6 +390,7 @@ void main() {
387390
...kDart2jsLinuxArgs,
388391
'--platform-binaries=bin/cache/flutter_web_sdk/kernel',
389392
'--enable-experiment=non-nullable',
393+
'--invoker=flutter_tool',
390394
'-Ddart.vm.profile=true',
391395
'--no-source-maps',
392396
'-O4',
@@ -408,6 +412,7 @@ void main() {
408412
command: <String>[
409413
...kDart2jsLinuxArgs,
410414
'--platform-binaries=bin/cache/flutter_web_sdk/kernel',
415+
'--invoker=flutter_tool',
411416
'-Ddart.vm.profile=true',
412417
'--no-source-maps',
413418
'-o',
@@ -421,6 +426,7 @@ void main() {
421426
command: <String>[
422427
...kDart2jsLinuxArgs,
423428
'--platform-binaries=bin/cache/flutter_web_sdk/kernel',
429+
'--invoker=flutter_tool',
424430
'-Ddart.vm.profile=true',
425431
'--no-source-maps',
426432
'-O4',
@@ -442,6 +448,7 @@ void main() {
442448
command: <String>[
443449
...kDart2jsLinuxArgs,
444450
'--platform-binaries=bin/cache/flutter_web_sdk/kernel',
451+
'--invoker=flutter_tool',
445452
'-Ddart.vm.product=true',
446453
'--no-source-maps',
447454
'-o',
@@ -455,6 +462,7 @@ void main() {
455462
command: <String>[
456463
...kDart2jsLinuxArgs,
457464
'--platform-binaries=bin/cache/flutter_web_sdk/kernel',
465+
'--invoker=flutter_tool',
458466
'-Ddart.vm.product=true',
459467
'--no-source-maps',
460468
'-O4',
@@ -476,6 +484,7 @@ void main() {
476484
command: <String>[
477485
...kDart2jsLinuxArgs,
478486
'--platform-binaries=bin/cache/flutter_web_sdk/kernel',
487+
'--invoker=flutter_tool',
479488
'--native-null-assertions',
480489
'-Ddart.vm.product=true',
481490
'--no-source-maps',
@@ -490,6 +499,7 @@ void main() {
490499
command: <String>[
491500
...kDart2jsLinuxArgs,
492501
'--platform-binaries=bin/cache/flutter_web_sdk/kernel',
502+
'--invoker=flutter_tool',
493503
'--native-null-assertions',
494504
'-Ddart.vm.product=true',
495505
'--no-source-maps',
@@ -512,6 +522,7 @@ void main() {
512522
command: <String>[
513523
...kDart2jsLinuxArgs,
514524
'--platform-binaries=bin/cache/flutter_web_sdk/kernel',
525+
'--invoker=flutter_tool',
515526
'-Ddart.vm.product=true',
516527
'--no-source-maps',
517528
'-o',
@@ -525,6 +536,7 @@ void main() {
525536
command: <String>[
526537
...kDart2jsLinuxArgs,
527538
'--platform-binaries=bin/cache/flutter_web_sdk/kernel',
539+
'--invoker=flutter_tool',
528540
'-Ddart.vm.product=true',
529541
'--no-source-maps',
530542
'-O3',
@@ -545,6 +557,7 @@ void main() {
545557
command: <String>[
546558
...kDart2jsLinuxArgs,
547559
'--platform-binaries=bin/cache/flutter_web_sdk/kernel',
560+
'--invoker=flutter_tool',
548561
'-Ddart.vm.product=true',
549562
'--no-source-maps',
550563
'-o',
@@ -576,6 +589,7 @@ void main() {
576589
command: <String>[
577590
...kDart2jsLinuxArgs,
578591
'--platform-binaries=bin/cache/flutter_web_sdk/kernel',
592+
'--invoker=flutter_tool',
579593
'-Ddart.vm.product=true',
580594
'-DFOO=bar',
581595
'-DBAZ=qux',
@@ -591,6 +605,7 @@ void main() {
591605
command: <String>[
592606
...kDart2jsLinuxArgs,
593607
'--platform-binaries=bin/cache/flutter_web_sdk/kernel',
608+
'--invoker=flutter_tool',
594609
'-Ddart.vm.product=true',
595610
'-DFOO=bar',
596611
'-DBAZ=qux',
@@ -614,6 +629,7 @@ void main() {
614629
command: <String>[
615630
...kDart2jsLinuxArgs,
616631
'--platform-binaries=bin/cache/flutter_web_sdk/kernel',
632+
'--invoker=flutter_tool',
617633
'-Ddart.vm.product=true',
618634
'-o',
619635
environment.buildDir.childFile('app.dill').absolute.path,
@@ -626,6 +642,7 @@ void main() {
626642
command: <String>[
627643
...kDart2jsLinuxArgs,
628644
'--platform-binaries=bin/cache/flutter_web_sdk/kernel',
645+
'--invoker=flutter_tool',
629646
'-Ddart.vm.product=true',
630647
'-O4',
631648
'-o',
@@ -647,6 +664,7 @@ void main() {
647664
command: <String>[
648665
...kDart2jsLinuxArgs,
649666
'--platform-binaries=bin/cache/flutter_web_sdk/kernel',
667+
'--invoker=flutter_tool',
650668
'-Ddart.vm.profile=true',
651669
'-DFOO=bar',
652670
'-DBAZ=qux',
@@ -662,6 +680,7 @@ void main() {
662680
command: <String>[
663681
...kDart2jsLinuxArgs,
664682
'--platform-binaries=bin/cache/flutter_web_sdk/kernel',
683+
'--invoker=flutter_tool',
665684
'-Ddart.vm.profile=true',
666685
'-DFOO=bar',
667686
'-DBAZ=qux',
@@ -686,6 +705,7 @@ void main() {
686705
command: <String>[
687706
...kDart2jsLinuxArgs,
688707
'--platform-binaries=bin/cache/flutter_web_sdk/kernel',
708+
'--invoker=flutter_tool',
689709
'-Ddart.vm.profile=true',
690710
'--no-source-maps',
691711
'-o',
@@ -699,6 +719,7 @@ void main() {
699719
command: <String>[
700720
...kDart2jsLinuxArgs,
701721
'--platform-binaries=bin/cache/flutter_web_sdk/kernel',
722+
'--invoker=flutter_tool',
702723
'-Ddart.vm.profile=true',
703724
'--no-source-maps',
704725
'-O4',
@@ -722,6 +743,7 @@ void main() {
722743
command: <String>[
723744
...kDart2jsLinuxArgs,
724745
'--platform-binaries=bin/cache/flutter_web_sdk/kernel',
746+
'--invoker=flutter_tool',
725747
'-Ddart.vm.profile=true',
726748
'--no-source-maps',
727749
'-o',
@@ -735,6 +757,7 @@ void main() {
735757
command: <String>[
736758
...kDart2jsLinuxArgs,
737759
'--platform-binaries=bin/cache/flutter_web_sdk/kernel',
760+
'--invoker=flutter_tool',
738761
'-Ddart.vm.profile=true',
739762
'--no-source-maps',
740763
'-O4',

‎packages/flutter_tools/test/integration.shard/flutter_build_with_compilation_error_test.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ int x = 'String';
6767
result.stderr,
6868
contains("A value of type 'String' can't be assigned to a variable of type 'int'."),
6969
);
70+
expect(result.stderr, isNot(contains("Warning: The 'dart2js' entrypoint script is deprecated")));
7071
expect(result.exitCode, 1);
7172
});
7273
}

0 commit comments

Comments
 (0)