diff --git a/src/library_nodefs.js b/src/library_nodefs.js index bdc643b1ac198..fd22eb4f65705 100644 --- a/src/library_nodefs.js +++ b/src/library_nodefs.js @@ -5,7 +5,7 @@ mergeInto(LibraryManager.library, { $NODEFS__deps: ['$FS', '$PATH'], - $NODEFS__postset: 'if (ENVIRONMENT_IS_NODE) { var fs = require("fs"); var NODEJS_PATH = require("path"); NODEFS.staticInit(); }', + $NODEFS__postset: 'if (ENVIRONMENT_HAS_NODE) { var fs = require("fs"); var NODEJS_PATH = require("path"); NODEFS.staticInit(); }', $NODEFS: { isWindows: false, staticInit: function() { @@ -33,7 +33,7 @@ mergeInto(LibraryManager.library, { return Buffer.alloc ? Buffer.from(arrayBuffer) : new Buffer(arrayBuffer); }, mount: function (mount) { - assert(ENVIRONMENT_IS_NODE); + assert(ENVIRONMENT_HAS_NODE); return NODEFS.createNode(null, '/', NODEFS.getMode(mount.opts.root), 0); }, createNode: function (parent, name, mode, dev) { diff --git a/src/shell.js b/src/shell.js index 4c73ccde75df0..b10ba3c9c9a39 100644 --- a/src/shell.js +++ b/src/shell.js @@ -58,15 +58,18 @@ Module['postRun'] = []; var ENVIRONMENT_IS_WEB = {{{ ENVIRONMENT === 'web' }}}; var ENVIRONMENT_IS_WORKER = {{{ ENVIRONMENT === 'worker' }}}; var ENVIRONMENT_IS_NODE = {{{ ENVIRONMENT === 'node' }}}; +var ENVIRONMENT_HAS_NODE = ENVIRONMENT_IS_NODE; var ENVIRONMENT_IS_SHELL = {{{ ENVIRONMENT === 'shell' }}}; #else // ENVIRONMENT var ENVIRONMENT_IS_WEB = false; var ENVIRONMENT_IS_WORKER = false; var ENVIRONMENT_IS_NODE = false; +var ENVIRONMENT_HAS_NODE = false; var ENVIRONMENT_IS_SHELL = false; ENVIRONMENT_IS_WEB = typeof window === 'object'; ENVIRONMENT_IS_WORKER = typeof importScripts === 'function'; -ENVIRONMENT_IS_NODE = typeof process === 'object' && typeof require === 'function' && !ENVIRONMENT_IS_WEB && !ENVIRONMENT_IS_WORKER; +ENVIRONMENT_HAS_NODE = typeof process === 'object' && typeof require === 'function'; +ENVIRONMENT_IS_NODE = ENVIRONMENT_HAS_NODE && !ENVIRONMENT_IS_WEB && !ENVIRONMENT_IS_WORKER; ENVIRONMENT_IS_SHELL = !ENVIRONMENT_IS_WEB && !ENVIRONMENT_IS_NODE && !ENVIRONMENT_IS_WORKER; #endif // ENVIRONMENT