Skip to content

[wasm] Switch default modules to es6 #70746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pavelsavara merged 14 commits into from
Jun 24, 2022
Merged

[wasm] Switch default modules to es6 #70746

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0888464
wip
pavelsavara Jun 16, 2022
e60425a
wip
pavelsavara Jun 16, 2022
0ff5c35
Merge branch 'main' into wasm_switch_to_es6
pavelsavara Jun 20, 2022
90b8d61
fix for absolute path on node
pavelsavara Jun 20, 2022
759b5a4
Merge branch 'main' into wasm_switch_to_es6
pavelsavara Jun 22, 2022
0c315ba
fix templates and WBT
pavelsavara Jun 22, 2022
428bfed
fix variables
pavelsavara Jun 23, 2022
89166f7
feedback
pavelsavara Jun 23, 2022
19a2351
Update src/mono/wasm/runtime/CMakeLists.txt
pavelsavara Jun 23, 2022
bb456c0
Update src/mono/wasm/templates/templates/console/app-support.mjs
pavelsavara Jun 23, 2022
1f816f6
feedback
pavelsavara Jun 23, 2022
9498f72
fix
pavelsavara Jun 23, 2022
1966205
fix
pavelsavara Jun 24, 2022
531a7c5
fix
pavelsavara Jun 24, 2022
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
Prev Previous commit
Next Next commit
fix
  • Loading branch information
@pavelsavara
pavelsavara committed Jun 24, 2022
commit 1966205b038ff3ee1baed74c7754ba46f9dad7b6
8 changes: 4 additions & 4 deletions src/mono/wasm/test-main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,8 @@ function processQueryArguments(incomingArguments) {

runArgs.applicationArguments = incomingArguments;
// cheap way to let the testing infrastructure know we're running in a browser context (or not)
runArgs.environment_variables["IsBrowserDomSupported"] = is_browser.toString().toLowerCase();
runArgs.environment_variables["IsNodeJS"] = is_node.toString().toLowerCase();
runArgs.environmentVariables["IsBrowserDomSupported"] = is_browser.toString().toLowerCase();
runArgs.environmentVariables["IsNodeJS"] = is_node.toString().toLowerCase();

return runArgs;
}
Expand Down Expand Up @@ -359,7 +359,7 @@ Promise.all([argsPromise, loadDotnetPromise]).then(async ([_, createDotnetRuntim
applyArguments();

if (is_node) {
const modulesToLoad = runArgs.environment_variables["NPM_MODULES"];
const modulesToLoad = runArgs.environmentVariables["NPM_MODULES"];
if (modulesToLoad) {
modulesToLoad.split(',').forEach(module => {
const { 0: moduleName, 1: globalAlias } = module.split(':');
Expand Down Expand Up @@ -387,7 +387,7 @@ Promise.all([argsPromise, loadDotnetPromise]).then(async ([_, createDotnetRuntim
}

// Must be after loading npm modules.
runArgs.environment_variables["IsWebSocketSupported"] = ("WebSocket" in globalThis).toString().toLowerCase();
runArgs.environmentVariables["IsWebSocketSupported"] = ("WebSocket" in globalThis).toString().toLowerCase();

return createDotnetRuntime(({ MONO, INTERNAL, BINDING, Module }) => ({
disableDotnet6Compatibility: true,
Expand Down