src: use the config binding to carry --no-browser-globals

Instead of setting it in the process object, since this is a configure-time option. Also added a shim that can be deprecated and removed some time later. PR-URL: #26228 Reviewed-By: Daniel Bevenius <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>
nodejs · Mar 14, 2019 · 0d810b7 · 0d810b7
1 parent fe6c419
commit 0d810b7
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
@@ -180,8 +180,7 @@ if (config.hasInspector) {
   internalBinding('inspector').registerAsyncHook(enable, disable);
 }
 
-const browserGlobals = !process._noBrowserGlobals;
-if (browserGlobals) {
+if (!config.noBrowserGlobals) {
   // Override global console from the one provided by the VM
   // to the one implemented by Node.js
   // https://console.spec.whatwg.org/#console-namespace

diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
@@ -135,6 +135,20 @@ function initializeDeprecations() {
                 'DEP0103') :
       types[name];
   }
+
+  // TODO(joyeecheung): this is a legacy property exposed to process.
+  // Now that we use the config binding to carry this information, remove
+  // it from the process. We may consider exposing it properly in
+  // process.features.
+  const { noBrowserGlobals } = internalBinding('config');
+  if (noBrowserGlobals) {
+    Object.defineProperty(process, '_noBrowserGlobals', {
+      writable: false,
+      enumerable: true,
+      configurable: true,
+      value: noBrowserGlobals
+    });
+  }
 }
 
 function setupChildProcessIpcChannel() {

diff --git a/src/node_config.cc b/src/node_config.cc
@@ -70,6 +70,13 @@ static void Initialize(Local<Object> target,
   READONLY_FALSE_PROPERTY(target, "hasInspector");
 #endif
 
+// configure --no-browser-globals
+#ifdef NODE_NO_BROWSER_GLOBALS
+  READONLY_TRUE_PROPERTY(target, "noBrowserGlobals");
+#else
+  READONLY_FALSE_PROPERTY(target, "noBrowserGlobals");
+#endif  // NODE_NO_BROWSER_GLOBALS
+
   READONLY_PROPERTY(target,
                     "bits",
                     Number::New(env->isolate(), 8 * sizeof(intptr_t)));

diff --git a/src/node_process_object.cc b/src/node_process_object.cc
@@ -233,11 +233,6 @@ MaybeLocal<Object> CreateProcessObject(
     READONLY_PROPERTY(process, "throwDeprecation", True(env->isolate()));
   }
 
-#ifdef NODE_NO_BROWSER_GLOBALS
-  // configure --no-browser-globals
-  READONLY_PROPERTY(process, "_noBrowserGlobals", True(env->isolate()));
-#endif  // NODE_NO_BROWSER_GLOBALS
-
   // --prof-process
   // TODO(addaleax): Remove this.
   if (env->options()->prof_process) {