Skip to content

Commit 28e72d2

Browse files
[release/8.0] [browser] ENVIRONMENT_IS_WEB is also true on WebWorker (#91627)
* ENVIRONMENT_IS_WEB is now also true on WebWorker * noExitRuntime stay false on pthread --------- Co-authored-by: pavelsavara <pavel.savara@gmail.com>
1 parent d8a419a commit 28e72d2

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/mono/wasm/runtime/globals.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ export let Module: DotnetModuleInternal;
1515
export let INTERNAL: any;
1616

1717
export const ENVIRONMENT_IS_NODE = typeof process == "object" && typeof process.versions == "object" && typeof process.versions.node == "string";
18-
export const ENVIRONMENT_IS_WEB = typeof window == "object";
1918
export const ENVIRONMENT_IS_WORKER = typeof importScripts == "function";
19+
export const ENVIRONMENT_IS_WEB = typeof window == "object" || (ENVIRONMENT_IS_WORKER && !ENVIRONMENT_IS_NODE);
2020
export const ENVIRONMENT_IS_SHELL = !ENVIRONMENT_IS_WEB && !ENVIRONMENT_IS_NODE && !ENVIRONMENT_IS_WORKER;
2121
// these are imported and re-exported from emscripten internals
2222
export let ENVIRONMENT_IS_PTHREAD: boolean;

src/mono/wasm/runtime/loader/globals.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import { hasDebuggingEnabled } from "./config";
1616
import { logDownloadStatsToConsole, purgeUnusedCacheEntriesAsync } from "./assetsCache";
1717

1818
export const ENVIRONMENT_IS_NODE = typeof process == "object" && typeof process.versions == "object" && typeof process.versions.node == "string";
19-
export const ENVIRONMENT_IS_WEB = typeof window == "object";
2019
export const ENVIRONMENT_IS_WORKER = typeof importScripts == "function";
20+
export const ENVIRONMENT_IS_WEB = typeof window == "object" || (ENVIRONMENT_IS_WORKER && !ENVIRONMENT_IS_NODE);
2121
export const ENVIRONMENT_IS_SHELL = !ENVIRONMENT_IS_WEB && !ENVIRONMENT_IS_NODE && !ENVIRONMENT_IS_WORKER;
2222

2323
export let runtimeHelpers: RuntimeHelpers = {} as any;

src/mono/wasm/runtime/polyfills.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import MonoWasmThreads from "consts:monoWasmThreads";
55
import type { EmscriptenReplacements } from "./types/internal";
66
import type { TypedArray } from "./types/emscripten";
7-
import { ENVIRONMENT_IS_NODE, ENVIRONMENT_IS_WEB, INTERNAL, Module, loaderHelpers, runtimeHelpers } from "./globals";
7+
import { ENVIRONMENT_IS_NODE, ENVIRONMENT_IS_PTHREAD, ENVIRONMENT_IS_WEB, INTERNAL, Module, loaderHelpers, runtimeHelpers } from "./globals";
88
import { replaceEmscriptenPThreadLibrary } from "./pthreads/shared/emscripten-replacements";
99

1010
const dummyPerformance = {
@@ -30,7 +30,7 @@ export function initializeReplacements(replacements: EmscriptenReplacements): vo
3030
replacements.fetch = loaderHelpers.fetch_like;
3131

3232
// misc
33-
replacements.noExitRuntime = ENVIRONMENT_IS_WEB;
33+
replacements.noExitRuntime = ENVIRONMENT_IS_WEB && !ENVIRONMENT_IS_PTHREAD;
3434

3535
// threads
3636
if (MonoWasmThreads) {

0 commit comments

Comments
 (0)