From 0553a04bd12b45f5d7754d0f25c071e0fc69b8ae Mon Sep 17 00:00:00 2001 From: YiiSh Date: Fri, 19 Aug 2022 21:09:07 +0800 Subject: [PATCH 1/5] Fix bug in Electron environment. --- tools/file_packager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/file_packager.py b/tools/file_packager.py index 7d48556d6b7dc..229c5bfc931c2 100755 --- a/tools/file_packager.py +++ b/tools/file_packager.py @@ -929,7 +929,7 @@ def generate_js(data_target, data_files, metadata): node_support_code = '' if options.support_node: node_support_code = ''' - if (typeof process === 'object' && typeof process.versions === 'object' && typeof process.versions.node === 'string') { + if (typeof process === 'object' && typeof process.browser === 'undefined' && typeof process.versions === 'object' && typeof process.versions.node === 'string') { require('fs').readFile(packageName, function(err, contents) { if (err) { errback(err); From 69f5202e2f978a1a620a532e605f9678feb942f5 Mon Sep 17 00:00:00 2001 From: YiiSh Date: Sat, 20 Aug 2022 07:55:01 +0800 Subject: [PATCH 2/5] Update file_packager.py --- tools/file_packager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/file_packager.py b/tools/file_packager.py index 229c5bfc931c2..901a4e031e04a 100755 --- a/tools/file_packager.py +++ b/tools/file_packager.py @@ -929,7 +929,7 @@ def generate_js(data_target, data_files, metadata): node_support_code = '' if options.support_node: node_support_code = ''' - if (typeof process === 'object' && typeof process.browser === 'undefined' && typeof process.versions === 'object' && typeof process.versions.node === 'string') { + if (typeof process === 'object' && typeof !process.browser && typeof process.versions === 'object' && typeof process.versions.node === 'string') { require('fs').readFile(packageName, function(err, contents) { if (err) { errback(err); From ec6dd38eadc30b625782ee9f3644ad381d8e12f1 Mon Sep 17 00:00:00 2001 From: YiiSh Date: Sat, 20 Aug 2022 07:59:28 +0800 Subject: [PATCH 3/5] Update shell.js --- src/shell.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shell.js b/src/shell.js index 2c68201ff6f1e..570cbb40e32a1 100644 --- a/src/shell.js +++ b/src/shell.js @@ -106,7 +106,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 process == 'object' && !process.browser && typeof process.versions == 'object' && typeof process.versions.node == 'string'; var ENVIRONMENT_IS_SHELL = !ENVIRONMENT_IS_WEB && !ENVIRONMENT_IS_NODE && !ENVIRONMENT_IS_WORKER; #endif // ENVIRONMENT From 1d3d87576e89f36751857ed805251594aadd3fcf Mon Sep 17 00:00:00 2001 From: YiiSh Date: Sat, 20 Aug 2022 08:00:15 +0800 Subject: [PATCH 4/5] Update worker.js --- src/worker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/worker.js b/src/worker.js index 29a0b3c462218..0cf86cfd6fecd 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 process == 'object' && !process.browser && typeof process.versions == 'object' && typeof process.versions.node == 'string'; if (ENVIRONMENT_IS_NODE) { // Create as web-worker-like an environment as we can. From 330d959b477a3b247f3af75bdd959285e3e560e8 Mon Sep 17 00:00:00 2001 From: YiiSh Date: Sat, 20 Aug 2022 08:01:06 +0800 Subject: [PATCH 5/5] Update file_packager.py --- tools/file_packager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/file_packager.py b/tools/file_packager.py index 901a4e031e04a..ada2dddff91f2 100755 --- a/tools/file_packager.py +++ b/tools/file_packager.py @@ -929,7 +929,7 @@ def generate_js(data_target, data_files, metadata): node_support_code = '' if options.support_node: node_support_code = ''' - if (typeof process === 'object' && typeof !process.browser && typeof process.versions === 'object' && typeof process.versions.node === 'string') { + if (typeof process === 'object' && !process.browser && typeof process.versions === 'object' && typeof process.versions.node === 'string') { require('fs').readFile(packageName, function(err, contents) { if (err) { errback(err);