Refactor flutter.js to do dart2wasm bootstrapping and CanvasKit/Skwasm preloading.

ci/licenses_golden/licenses_flutter

@@ -5872,7 +5872,16 @@ ORIGIN: ../../../flutter/lib/ui/window/pointer_data_packet_converter.cc + ../../
 ORIGIN: ../../../flutter/lib/ui/window/pointer_data_packet_converter.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/ui/window/viewport_metrics.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/ui/window/viewport_metrics.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/flutter_js/src/base_uri.js + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/flutter_js/src/browser_environment.js + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/flutter_js/src/canvaskit_loader.js + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/flutter_js/src/entrypoint_loader.js + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/flutter_js/src/flutter.js + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/flutter_js/src/instantiate_wasm.js + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/flutter_js/src/loader.js + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/flutter_js/src/service_worker_loader.js + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/flutter_js/src/skwasm_loader.js + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/flutter_js/src/trusted_types.js + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/annotations.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/canvas.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/channel_buffers.dart + ../../../flutter/LICENSE
@@ -8692,7 +8701,17 @@ FILE: ../../../flutter/lib/ui/window/pointer_data_packet_converter.cc
 FILE: ../../../flutter/lib/ui/window/pointer_data_packet_converter.h
 FILE: ../../../flutter/lib/ui/window/viewport_metrics.cc
 FILE: ../../../flutter/lib/ui/window/viewport_metrics.h
+FILE: ../../../flutter/lib/web_ui/flutter_js/src/base_uri.js
+FILE: ../../../flutter/lib/web_ui/flutter_js/src/browser_environment.js
+FILE: ../../../flutter/lib/web_ui/flutter_js/src/canvaskit_loader.js
+FILE: ../../../flutter/lib/web_ui/flutter_js/src/entrypoint_loader.js
 FILE: ../../../flutter/lib/web_ui/flutter_js/src/flutter.js
+FILE: ../../../flutter/lib/web_ui/flutter_js/src/instantiate_wasm.js
+FILE: ../../../flutter/lib/web_ui/flutter_js/src/loader.js
+FILE: ../../../flutter/lib/web_ui/flutter_js/src/service_worker_loader.js
+FILE: ../../../flutter/lib/web_ui/flutter_js/src/skwasm_loader.js
+FILE: ../../../flutter/lib/web_ui/flutter_js/src/trusted_types.js
+FILE: ../../../flutter/lib/web_ui/flutter_js/src/types.d.ts
 FILE: ../../../flutter/lib/web_ui/lib/annotations.dart
 FILE: ../../../flutter/lib/web_ui/lib/canvas.dart
 FILE: ../../../flutter/lib/web_ui/lib/channel_buffers.dart

lib/web_ui/dev/chrome.dart

@@ -23,14 +23,11 @@ import 'package_lock.dart';
 /// Provides an environment for desktop Chrome.
 class ChromeEnvironment implements BrowserEnvironment {
   ChromeEnvironment({
-    required bool enableWasmGC,
     required bool useDwarf,
-  }) : _enableWasmGC = enableWasmGC,
-       _useDwarf = useDwarf;
+  }) : _useDwarf = useDwarf;
 
   late final BrowserInstallation _installation;
 
-  final bool _enableWasmGC;
   final bool _useDwarf;
 
   @override
@@ -42,7 +39,6 @@ class ChromeEnvironment implements BrowserEnvironment {
       url,
       _installation,
       debug: debug,
-      enableWasmGC: _enableWasmGC,
       useDwarf: _useDwarf
     );
   }
@@ -83,7 +79,6 @@ class Chrome extends Browser {
     Uri url,
     BrowserInstallation installation, {
     required bool debug,
-    required bool enableWasmGC,
     required bool useDwarf,
   }) {
     final Completer<Uri> remoteDebuggerCompleter = Completer<Uri>.sync();
@@ -101,13 +96,7 @@ class Chrome extends Browser {
       final bool isChromeNoSandbox =
           Platform.environment['CHROME_NO_SANDBOX'] == 'true';
       final String dir = await generateUserDirectory(installation, useDwarf);
-      final String jsFlags = enableWasmGC ? <String>[
-        '--experimental-wasm-gc',
-        '--experimental-wasm-stack-switching',
-        '--experimental-wasm-type-reflection',
-      ].join(' ') : '';
       final List<String> args = <String>[
-        if (jsFlags.isNotEmpty) '--js-flags=$jsFlags',
         '--user-data-dir=$dir',
         url.toString(),
         if (!debug)

lib/web_ui/dev/common.dart

@@ -240,12 +240,11 @@ const List<String> kAllBrowserNames = <String>[
 /// The [browserName] matches the browser name passed as the `--browser` option.
 BrowserEnvironment getBrowserEnvironment(
   BrowserName browserName, {
-  required bool enableWasmGC,
   required bool useDwarf,
 }) {
   switch (browserName) {
     case BrowserName.chrome:
-      return ChromeEnvironment(enableWasmGC: enableWasmGC, useDwarf: useDwarf);
+      return ChromeEnvironment(useDwarf: useDwarf);
     case BrowserName.edge:
       return EdgeEnvironment();
     case BrowserName.firefox:

lib/web_ui/dev/felt_config.dart

@@ -32,11 +32,11 @@ class TestSet {
 }
 
 class TestBundle {
-  TestBundle(this.name, this.testSet, this.compileConfig);
+  TestBundle(this.name, this.testSet, this.compileConfigs);
 
   final String name;
   final TestSet testSet;
-  final CompileConfiguration compileConfig;
+  final List<CompileConfiguration> compileConfigs;
 }
 
 enum CanvasKitVariant {
@@ -157,12 +157,16 @@ class FeltConfig {
       if (testSet == null) {
         throw AssertionError('Test set not found with name: `$testSetName` (referenced by test bundle: `$name`)');
       }
-      final String compileConfigName = testBundleYaml['compile-config'] as String;
-      final CompileConfiguration? compileConfig = compileConfigsByName[compileConfigName];
-      if (compileConfig == null) {
-        throw AssertionError('Compile config not found with name: `$compileConfigName` (referenced by test bundle: `$name`)');
+      final dynamic compileConfigsValue = testBundleYaml['compile-configs'];
+      final List<CompileConfiguration> compileConfigs;
+      if (compileConfigsValue is String) {
+        compileConfigs = <CompileConfiguration>[compileConfigsByName[compileConfigsValue]!];
+      } else {
+        compileConfigs = (compileConfigsValue as List<dynamic>).map(
+          (dynamic configName) => compileConfigsByName[configName as String]!
+        ).toList();
       }
-      final TestBundle bundle = TestBundle(name, testSet, compileConfig);
+      final TestBundle bundle = TestBundle(name, testSet, compileConfigs);
       testBundles.add(bundle);
       if (testBundlesByName.containsKey(name)) {
         throw AssertionError('Duplicate test bundle name: $name');
@@ -202,11 +206,6 @@ class FeltConfig {
       if (runConfig == null) {
         throw AssertionError('Run config not found with name: `$runConfigName` (referenced by test suite: `$name`)');
       }
-      if (bundle.compileConfig.renderer == Renderer.canvaskit && runConfig.variant == null) {
-        throw AssertionError(
-            'Run config `$runConfigName` was used with a CanvasKit test bundle `$testBundleName` '
-            'but did not specify a CanvasKit variant (referenced by test suite: `$name`)');
-      }
       bool canvasKit = false;
       bool canvasKitChromium = false;
       bool skwasm = false;

lib/web_ui/dev/generate_builder_json.dart

@@ -120,11 +120,7 @@ Iterable<dynamic> _getAllTestSteps(List<TestSuite> suites) {
       suite.runConfig.browser == BrowserName.safari
     ),
     ..._getTestStepsForPlatform(suites, 'Windows', (TestSuite suite) =>
-      suite.runConfig.browser == BrowserName.chrome &&
-
-      // TODO(jacksongardner): Enable dart2wasm tests on Windows
-      // https://github.com/flutter/flutter/issues/124082
-      suite.testBundle.compileConfig.compiler != Compiler.dart2wasm
+      suite.runConfig.browser == BrowserName.chrome
     ),
   ];
 }

lib/web_ui/dev/steps/compile_bundle_step.dart

@@ -61,20 +61,20 @@ class CompileBundleStep implements PipelineStep {
       .toList();
   }
 
-  TestCompiler _createCompiler() {
-    switch (bundle.compileConfig.compiler) {
+  TestCompiler _createCompiler(CompileConfiguration config) {
+    switch (config.compiler) {
       case Compiler.dart2js:
         return Dart2JSCompiler(
           testSetDirectory,
           outputBundleDirectory,
-          renderer: bundle.compileConfig.renderer,
+          renderer: config.renderer,
           isVerbose: isVerbose,
         );
       case Compiler.dart2wasm:
         return Dart2WasmCompiler(
           testSetDirectory,
           outputBundleDirectory,
-          renderer: bundle.compileConfig.renderer,
+          renderer: config.renderer,
           isVerbose: isVerbose,
         );
     }
@@ -84,7 +84,9 @@ class CompileBundleStep implements PipelineStep {
   Future<void> run() async {
     print('Compiling test bundle ${bundle.name.ansiMagenta}...');
     final List<FilePath> allTests = _findTestFiles();
-    final TestCompiler compiler = _createCompiler();
+    final List<TestCompiler> compilers = bundle.compileConfigs.map(
+      (CompileConfiguration config) => _createCompiler(config)
+    ).toList();
     final Stopwatch stopwatch = Stopwatch()..start();
     final String testSetDirectoryPath = testSetDirectory.path;
 
@@ -94,35 +96,40 @@ class CompileBundleStep implements PipelineStep {
     }
 
     final List<Future<MapEntry<String, CompileResult>>> pendingResults = <Future<MapEntry<String, CompileResult>>>[];
-    for (final FilePath testFile in allTests) {
-      final String relativePath = pathlib.relative(
-        testFile.absolute,
-        from: testSetDirectoryPath);
-      final Future<MapEntry<String, CompileResult>> result = compilePool.withResource(() async {
-        if (testFiles != null && !testFiles!.contains(testFile)) {
-          return MapEntry<String, CompileResult>(relativePath, CompileResult.filtered);
-        }
-        final bool success = await compiler.compileTest(testFile);
-        const int maxTestNameLength = 80;
-        final String truncatedPath = relativePath.length > maxTestNameLength
-          ? relativePath.replaceRange(maxTestNameLength - 3, relativePath.length, '...')
-          : relativePath;
-        final String expandedPath = truncatedPath.padRight(maxTestNameLength);
-        io.stdout.write('\r  ${success ? expandedPath.ansiGreen : expandedPath.ansiRed}');
-        return success
-          ? MapEntry<String, CompileResult>(relativePath, CompileResult.success)
-          : MapEntry<String, CompileResult>(relativePath, CompileResult.compilationFailure);
-      });
-      pendingResults.add(result);
+    for (final TestCompiler compiler in compilers) {
+      for (final FilePath testFile in allTests) {
+        final String relativePath = pathlib.relative(
+          testFile.absolute,
+          from: testSetDirectoryPath);
+        final Future<MapEntry<String, CompileResult>> result = compilePool.withResource(() async {
+          if (testFiles != null && !testFiles!.contains(testFile)) {
+            return MapEntry<String, CompileResult>(relativePath, CompileResult.filtered);
+          }
+          final bool success = await compiler.compileTest(testFile);
+          const int maxTestNameLength = 80;
+          final String truncatedPath = relativePath.length > maxTestNameLength
+            ? relativePath.replaceRange(maxTestNameLength - 3, relativePath.length, '...')
+            : relativePath;
+          final String expandedPath = truncatedPath.padRight(maxTestNameLength);
+          io.stdout.write('\r  ${success ? expandedPath.ansiGreen : expandedPath.ansiRed}');
+          return success
+            ? MapEntry<String, CompileResult>(relativePath, CompileResult.success)
+            : MapEntry<String, CompileResult>(relativePath, CompileResult.compilationFailure);
+        });
+        pendingResults.add(result);
+      }
     }
     final Map<String, CompileResult> results = Map<String, CompileResult>.fromEntries(await Future.wait(pendingResults));
     stopwatch.stop();
 
     final String resultsJson = const JsonEncoder.withIndent('  ').convert(<String, dynamic>{
       'name': bundle.name,
       'directory': bundle.testSet.directory,
-      'compiler': bundle.compileConfig.compiler.name,
-      'renderer': bundle.compileConfig.renderer.name,
+      'builds': bundle.compileConfigs.map(
+        (CompileConfiguration config) => <String, dynamic>{
+          'compiler': config.compiler.name,
+          'renderer': config.renderer.name,
+        }).toList(),
       'compileTimeInMs': stopwatch.elapsedMilliseconds,
       'results': results.map((String k, CompileResult v) => MapEntry<String, String>(k, v.name)),
     });

lib/web_ui/dev/steps/copy_artifacts_step.dart

@@ -33,7 +33,6 @@ class CopyArtifactsStep implements PipelineStep {
   @override
   Future<void> run() async {
     await environment.webTestsArtifactsDir.create(recursive: true);
-    await copyTestBootstrapScripts();
     await buildHostPage();
     await copyTestFonts();
     await copySkiaTestImages();
@@ -52,23 +51,6 @@ class CopyArtifactsStep implements PipelineStep {
     }
   }
 
-  Future<void> copyTestBootstrapScripts() async {
-    for (final String filename in <String>[
-      'test_dart2js.js',
-      'test_dart2wasm.js',
-    ]) {
-      final io.File sourceFile = io.File(pathlib.join(
-        environment.webUiDevDir.path,
-        filename,
-      ));
-      final io.File targetFile = io.File(pathlib.join(
-        environment.webTestsArtifactsDir.path,
-        filename,
-      ));
-      await sourceFile.copy(targetFile.path);
-    }
-  }
-
   Future<void> copyTestFonts() async {
     const Map<String, String> testFonts = <String, String>{
       'Ahem': 'ahem.ttf',

lib/web_ui/dev/steps/run_suite_step.dart

@@ -49,8 +49,6 @@ class RunSuiteStep implements PipelineStep {
   /// Require Skia Gold to be available and reachable.
   final bool requireSkiaGold;
 
-  bool get isWasm => suite.testBundle.compileConfig.compiler == Compiler.dart2wasm;
-
   @override
   String get description => 'run_suite';
 
@@ -65,7 +63,6 @@ class RunSuiteStep implements PipelineStep {
     _prepareTestResultsDirectory();
     final BrowserEnvironment browserEnvironment = getBrowserEnvironment(
       suite.runConfig.browser,
-      enableWasmGC: isWasm,
       useDwarf: useDwarf,
     );
     await browserEnvironment.prepare();
@@ -177,12 +174,18 @@ class RunSuiteStep implements PipelineStep {
   }
 
   Future<SkiaGoldClient?> _createSkiaClient() async {
-    final Renderer renderer = suite.testBundle.compileConfig.renderer;
+    if (suite.testBundle.compileConfigs.length > 1) {
+      // Multiple compile configs are only used for our fallback tests, which
+      // do not collect goldens.
+      return null;
+    }
+    final Renderer renderer = suite.testBundle.compileConfigs.first.renderer;
     final CanvasKitVariant? variant = suite.runConfig.variant;
     final io.Directory workDirectory = getSkiaGoldDirectoryForSuite(suite);
     if (workDirectory.existsSync()) {
       workDirectory.deleteSync(recursive: true);
     }
+    final bool isWasm = suite.testBundle.compileConfigs.first.compiler == Compiler.dart2wasm;
     final SkiaGoldClient skiaClient = SkiaGoldClient(
       workDirectory,
       dimensions: <String, String> {

lib/web_ui/dev/suite_filter.dart

@@ -70,18 +70,28 @@ class FileFilter extends BundleNameFilter {
   }
 }
 
-class CompilerFilter extends AllowListSuiteFilter<Compiler> {
-  CompilerFilter({required super.allowList});
+class CompilerFilter extends SuiteFilter {
+  CompilerFilter({required this.allowList});
+
+  final Set<Compiler> allowList;
 
   @override
-  Compiler getAttributeForSuite(TestSuite suite) => suite.testBundle.compileConfig.compiler;
+  SuiteFilterResult filterSuite(TestSuite suite) => suite.testBundle.compileConfigs.any(
+    (CompileConfiguration config) => allowList.contains(config.compiler)
+  ) ? SuiteFilterResult.accepted()
+    : SuiteFilterResult.rejected('Selected compilers not used in suite.');
 }
 
-class RendererFilter extends AllowListSuiteFilter<Renderer> {
-  RendererFilter({required super.allowList});
+class RendererFilter extends SuiteFilter {
+  RendererFilter({required this.allowList});
+
+  final Set<Renderer> allowList;
 
   @override
-  Renderer getAttributeForSuite(TestSuite suite) => suite.testBundle.compileConfig.renderer;
+  SuiteFilterResult filterSuite(TestSuite suite) => suite.testBundle.compileConfigs.any(
+    (CompileConfiguration config) => allowList.contains(config.renderer)
+  ) ? SuiteFilterResult.accepted()
+    : SuiteFilterResult.rejected('Selected renderers not used in suite.');
 }
 
 class CanvasKitVariantFilter extends AllowListSuiteFilter<CanvasKitVariant> {