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

[dart2wasm] Move web wasm embedder to new dart2wasm embedder API #55037

Merged
merged 3 commits into from
Sep 12, 2024
Merged

[dart2wasm] Move web wasm embedder to new dart2wasm embedder API #55037

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d025c60
[dart2wasm] Move web wasm embedder to new dart2wasm embedder API
mkustermann Sep 12, 2024
e831382
add missing await
mkustermann Sep 12, 2024
5a619da
also await imports promise
mkustermann Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions lib/web_ui/flutter_js/src/entrypoint_loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,11 @@ export class FlutterEntrypointLoader {
}
const jsSupportRuntime = await import(jsSupportRuntimeUri);

const dartModulePromise = jsSupportRuntime.compileStreaming(fetch(moduleUri));
const compiledDartAppPromise = jsSupportRuntime.compileStreaming(fetch(moduleUri));

let imports;
let importsPromise;
if (build.renderer === "skwasm") {
imports = (async () => {
importsPromise = (async () => {
const skwasmInstance = await deps.skwasm;
window._flutter_skwasmInstance = skwasmInstance;
return {
Expand All @@ -171,10 +171,11 @@ export class FlutterEntrypointLoader {
};
})();
} else {
imports = {};
importsPromise = Promise.resolve({});
}
const moduleInstance = await jsSupportRuntime.instantiate(dartModulePromise, imports);
await jsSupportRuntime.invoke(moduleInstance);
const compiledDartApp = await compiledDartAppPromise;
const dartApp = await compiledDartApp.instantiate(await importsPromise);
await dartApp.invokeMain();
}
}

Expand Down