From ab516774f7a9b6c62b0309c07d6ce3ccbf5fb852 Mon Sep 17 00:00:00 2001 From: Roj Date: Mon, 15 May 2023 12:43:18 +0300 Subject: [PATCH] Check globalThis.Deno when setting `ENVIRONMENT_IS_NODE` This makes the source codes generated work better outside Node.js. Co-authored-by: X. --- AUTHORS | 2 ++ src/shell.js | 2 +- src/worker.js | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index 7e42decb1d5f3..1c39ce390b7fa 100644 --- a/AUTHORS +++ b/AUTHORS @@ -592,3 +592,5 @@ a license to everyone to use it as detailed in LICENSE.) * Alexandra Cherdantseva * Michael Schmuki * Skye Gibney +* Roj +* X. diff --git a/src/shell.js b/src/shell.js index b1ed99a73b115..44cad8aa61aa4 100644 --- a/src/shell.js +++ b/src/shell.js @@ -113,7 +113,7 @@ var ENVIRONMENT_IS_WEB = typeof window == 'object'; var ENVIRONMENT_IS_WORKER = typeof importScripts == 'function'; // N.b. Electron.js environment is simultaneously a NODE-environment, but // also a web environment. -var ENVIRONMENT_IS_NODE = typeof process == 'object' && typeof process.versions == 'object' && typeof process.versions.node == 'string'; +var ENVIRONMENT_IS_NODE = typeof Deno == void 0 && typeof process == 'object' && typeof process.versions == 'object' && typeof process.versions.node == 'string'; #if AUDIO_WORKLET var ENVIRONMENT_IS_SHELL = !ENVIRONMENT_IS_WEB && !ENVIRONMENT_IS_NODE && !ENVIRONMENT_IS_WORKER && !ENVIRONMENT_IS_AUDIO_WORKLET; #else diff --git a/src/worker.js b/src/worker.js index 4c8fe3cebc4f7..8b35c572b3874 100644 --- a/src/worker.js +++ b/src/worker.js @@ -14,7 +14,7 @@ var Module = {}; #if ENVIRONMENT_MAY_BE_NODE // Node.js support -var ENVIRONMENT_IS_NODE = typeof process == 'object' && typeof process.versions == 'object' && typeof process.versions.node == 'string'; +var ENVIRONMENT_IS_NODE = typeof Deno == void 0 && typeof process == 'object' && typeof process.versions == 'object' && typeof process.versions.node == 'string'; if (ENVIRONMENT_IS_NODE) { // Create as web-worker-like an environment as we can.