tool/web: correctly log all options to web wasm compile (#126379)

Filtering on 'true' omitted non-bool values
engine-flutter-autoroll · May 10, 2023 · 1b831a2 · 1b831a2
1 parent 01ac99a
commit 1b831a2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/packages/flutter_tools/lib/src/web/compiler_config.dart b/packages/flutter_tools/lib/src/web/compiler_config.dart
@@ -179,11 +179,7 @@ class WasmCompilerConfig extends WebCompilerConfig {
   @override
   Map<String, Object> get buildEventAnalyticsValues => <String, Object>{
     ...super.buildEventAnalyticsValues,
-    for (MapEntry<String, String> entry in toBuildSystemEnvironment()
-        .entries
-        .where(
-            (MapEntry<String, String> element) => element.value == 'true'))
-      entry.key: entry.value,
+    ...toBuildSystemEnvironment(),
   };
 }
 

diff --git a/packages/flutter_tools/test/general.shard/web/compile_web_test.dart b/packages/flutter_tools/test/general.shard/web/compile_web_test.dart
@@ -80,17 +80,28 @@ void main() {
     expect(logger.statusText, contains('Compiling target for the Web...'));
     expect(logger.errorText, isEmpty);
     // Runs ScrubGeneratedPluginRegistrant migrator.
-    expect(logger.traceText, contains('generated_plugin_registrant.dart not found. Skipping.'));
+    expect(
+      logger.traceText,
+      contains('generated_plugin_registrant.dart not found. Skipping.'),
+    );
 
     // Sends build config event
-    expect(testUsage.events, unorderedEquals(<TestUsageEvent>[
+    expect(
+      testUsage.events,
+      unorderedEquals(
+        <TestUsageEvent>[
       const TestUsageEvent(
         'build',
         'web',
         label: 'web-compile',
-        parameters: CustomDimensions(buildEventSettings: 'wasm-compile: true; web-renderer: auto;')
+            parameters: CustomDimensions(
+              buildEventSettings:
+                  'RunWasmOpt: none; WasmOmitTypeChecks: false; wasm-compile: true; web-renderer: auto;',
+      ),
+          ),
+        ],
       ),
-    ]));
+    );
 
     // Sends timing event.
     final TestTimingEvent timingEvent = testUsage.timings.single;