tidy

Author: joshualitt

pkgs/test/lib/src/runner/wasm/platform.dart

@@ -52,6 +52,8 @@ class BrowserWasmPlatform extends PlatformPlugin
             Uri.parse('package:test/src/runner/browser/static/favicon.ico'))),
         p.fromUri(packageConfig.resolve(
             Uri.parse('package:test/src/runner/wasm/static/default.html.tpl'))),
+        p.fromUri(packageConfig.resolve(
+            Uri.parse('package:test/src/runner/wasm/static/run_wasm_chrome.js'))),
         root: root);
   }
 
@@ -117,8 +119,11 @@ class BrowserWasmPlatform extends PlatformPlugin
   /// The default template for html tests.
   final String _defaultTemplatePath;
 
+  /// The `package:test` side wrapper for the Dart2Wasm runtime.
+  final String _jsRuntimeWrapper;
+
   BrowserWasmPlatform._(this._server, Configuration config, String faviconPath,
-      this._defaultTemplatePath,
+      this._defaultTemplatePath, this._jsRuntimeWrapper,
       {String? root})
       : _config = config,
         _root = root ?? p.current {
@@ -159,9 +164,11 @@ class BrowserWasmPlatform extends PlatformPlugin
       var testName = htmlEscape.convert(test);
       var template = _config.customHtmlTemplatePath ?? _defaultTemplatePath;
       var contents = File(template).readAsStringSync();
+      var jsRuntime = 'dart2wasm_runtime.mjs';
       var processedContents = contents
           // Checked during loading phase that there is only one {{testScript}} placeholder.
           .replaceFirst('{{testScript}}', link)
+          .replaceFirst('{{jsRuntimeUrl}}', jsRuntime)
           .replaceFirst('{{wasmUrl}}',
               p.basename('$test.browser_test.dart.wasm'))
           .replaceAll('{{testName}}', testName);
@@ -242,7 +249,8 @@ class BrowserWasmPlatform extends PlatformPlugin
       var baseUrl =
           '${p.toUri(p.relative(dartPath, from: _root)).path}.browser_test.dart';
       var wasmUrl = '$baseUrl.wasm';
-      var jsUrl = '$baseUrl.js';
+      var jsRuntimeWrapperUrl = '$baseUrl.js';
+      var jsRuntimeUrl = p.join(p.dirname(dartPath), 'dart2wasm_runtime.mjs');
       var htmlUrl = '$baseUrl.html';
 
       // TODO: This may need to be specialized, or it may just work. Not sure.
@@ -266,9 +274,14 @@ class BrowserWasmPlatform extends PlatformPlugin
             headers: {'Content-Type': 'application/wasm'});
       });
 
-      var jsPath = '$baseCompiledPath.js';
-      _wasmHandler.add(jsUrl, (request) {
-        return shelf.Response.ok(File(jsPath).readAsBytesSync(),
+      _wasmHandler.add(jsRuntimeWrapperUrl, (request) {
+        return shelf.Response.ok(File(_jsRuntimeWrapper).readAsBytesSync(),
+            headers: {'Content-Type': 'application/javascript'});
+      });
+
+      var jsRuntimePath = p.join(dir, 'dart2wasm_runtime.mjs');
+      _wasmHandler.add(jsRuntimeUrl, (request) {
+        return shelf.Response.ok(File(jsRuntimePath).readAsBytesSync(),
             headers: {'Content-Type': 'application/javascript'});
       });
 

pkgs/test/lib/src/runner/wasm/static/default.html.tpl

@@ -4,6 +4,7 @@
     <title>{{testName}} Test</title>
     {{testScript}}
     <div id="WasmUrl">{{wasmUrl}}</div>
+    <div id="JSRuntimeUrl">{{jsRuntimeUrl}}</div>
     <script src="packages/test/dart.js"></script>
   </head>
 </html>

pkgs/test/lib/src/runner/wasm/static/run_wasm_chrome.js

@@ -0,0 +1,24 @@
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+// TODO(joshualitt): Investigate making this a module. Currently, Dart2Wasm is
+// borken in D8 with modules because of an issue with async. This may or may not
+// affect chrome.
+const main = async () => {
+  // Fetch and compile Wasm binary.
+  let wasmUrl = document.getElementById('WasmUrl').textContent;
+  let modulePromise = WebAssembly.compileStreaming(fetch(wasmUrl));
+
+  // Instantiate the Dart module, importing from the global scope.
+  let jsRuntimeUrl = document.getElementById('JSRuntimeUrl').textContent;
+  let dart2wasm = await import('./' + jsRuntimeUrl);
+  let dartInstance = await dart2wasm.instantiate(modulePromise, {});
+
+  // Call `main`. If tasks are placed into the event loop (by scheduling tasks
+  // explicitly or awaiting Futures), these will automatically keep the script
+  // alive even after `main` returns.
+  await dart2wasm.invoke(dartInstance);
+};
+main();
+

pkgs/test_core/lib/src/runner/wasm_compiler_pool.dart

@@ -33,11 +33,11 @@ class WasmCompilerPool extends CompilerPool {
       var wrapperPath = p.join(dir, 'main.dart');
       File(wrapperPath).writeAsStringSync(code);
       var outWasmPath = '$path.wasm';
-      var outJSPath = '$path.js';
+      var outJSPath = p.join(p.dirname(path), 'dart2wasm_runtime.mjs');
       var dartBinPath = Platform.resolvedExecutable;
       var sdkRoot = p.join(p.dirname(dartBinPath), '../');
       var platformRoot = p.join(sdkRoot, '../');
-      var jsRuntimePath = p.join(platformRoot, 'run_wasm_chrome.js');
+      var jsRuntimePath = p.join(sdkRoot, 'bin', 'dart2wasm_runtime.mjs');
       File(jsRuntimePath).copy(outJSPath);
       var platformDill = p.join(platformRoot, 'dart2wasm_platform.dill');
       var dartPrecompiledRuntimePath = p.join(platformRoot,