Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 7abc5f1

Browse files
authored
[web] Update felt to use generated JS runtime for Dart2Wasm. (#38786)
1 parent 764a9e0 commit 7abc5f1

File tree

2 files changed

+3
-17
lines changed

2 files changed

+3
-17
lines changed

lib/web_ui/dev/steps/compile_tests_step.dart

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ class CompileTestsStep implements PipelineStep {
4646
await environment.webUiBuildDir.create();
4747
if (isWasm) {
4848
await copyDart2WasmTestScript();
49-
await copyDart2WasmRuntime();
5049
}
5150
await copyCanvasKitFiles(useLocalCanvasKit: useLocalCanvasKit);
5251
await buildHostPage();
@@ -129,20 +128,6 @@ Future<void> copySkiaTestImages() async {
129128
}
130129
}
131130

132-
Future<void> copyDart2WasmRuntime() async {
133-
final io.File sourceFile = io.File(pathlib.join(
134-
environment.dartSdkDir.path,
135-
'bin',
136-
'dart2wasm_runtime.mjs',
137-
));
138-
final io.Directory targetDir = io.Directory(pathlib.join(
139-
environment.webUiBuildDir.path,
140-
'dart2wasm_runtime.mjs',
141-
));
142-
143-
await sourceFile.copy(targetDir.path);
144-
}
145-
146131
Future<void> copyDart2WasmTestScript() async {
147132
final io.File sourceFile = io.File(pathlib.join(
148133
environment.webUiDevDir.path,

lib/web_ui/dev/test_dart2wasm.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,9 @@ window.onload = async function () {
5454
let dart2wasm_runtime;
5555
let moduleInstance;
5656
try {
57-
dart2wasm_runtime = await import('./dart2wasm_runtime.mjs');
58-
const dartModulePromise = WebAssembly.compileStreaming(fetch(link.href + ".browser_test.dart.wasm"));
57+
let baseName = link.href + '.browser_test.dart';
58+
dart2wasm_runtime = await import(baseName + '.mjs');
59+
const dartModulePromise = WebAssembly.compileStreaming(fetch(baseName + '.wasm'));
5960
moduleInstance = await dart2wasm_runtime.instantiate(dartModulePromise, {});
6061
} catch (exception) {
6162
const message = `Failed to fetch and instantiate wasm module: ${exception}`;

0 commit comments

Comments
 (0)