src: use the config binding to carry --no-browser-globals · nodejs/node@0d810b7 · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 633
• Pull requests 759
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 0d810b7

Browse filesBrowse the repository at this point in the historyBrowse files

joyeecheung

authored and

BridgeAR

committed

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 <daniel.bevenius@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>

1 parent fe6c419 commit 0d810b7
Copy full SHA for 0d810b7

4 files changed

+22-7Lines changed: 22 additions & 7 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• lib/internal/bootstrap
  • node.js
  • pre_execution.js
• src
  • node_config.cc
  • node_process_object.cc

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎lib/internal/bootstrap/node.js‎

Copy file name to clipboardExpand all lines: lib/internal/bootstrap/node.js

+1-2Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -180,8 +180,7 @@ if (config.hasInspector) {
180	180	internalBinding('inspector').registerAsyncHook(enable, disable);
181	181	}
182	182
183		- const browserGlobals = !process._noBrowserGlobals;
184		- if (browserGlobals) {
	183	+ if (!config.noBrowserGlobals) {
185	184	// Override global console from the one provided by the VM
186	185	// to the one implemented by Node.js
187	186	// https://console.spec.whatwg.org/#console-namespace

Collapse file

‎lib/internal/bootstrap/pre_execution.js‎

Copy file name to clipboardExpand all lines: lib/internal/bootstrap/pre_execution.js

+14Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -135,6 +135,20 @@ function initializeDeprecations() {
135	135	'DEP0103') :
136	136	types[name];
137	137	}
	138	+
	139	+ // TODO(joyeecheung): this is a legacy property exposed to process.
	140	+ // Now that we use the config binding to carry this information, remove
	141	+ // it from the process. We may consider exposing it properly in
	142	+ // process.features.
	143	+ const { noBrowserGlobals } = internalBinding('config');
	144	+ if (noBrowserGlobals) {
	145	+ Object.defineProperty(process, '_noBrowserGlobals', {
	146	+ writable: false,
	147	+ enumerable: true,
	148	+ configurable: true,
	149	+ value: noBrowserGlobals
	150	+ });
	151	+ }
138	152	}
139	153
140	154	function setupChildProcessIpcChannel() {

Collapse file

‎src/node_config.cc‎

Copy file name to clipboardExpand all lines: src/node_config.cc

+7Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -70,6 +70,13 @@ static void Initialize(Local<Object> target,
70	70	READONLY_FALSE_PROPERTY(target, "hasInspector");
71	71	#endif
72	72
	73	+ // configure --no-browser-globals
	74	+ #ifdef NODE_NO_BROWSER_GLOBALS
	75	+ READONLY_TRUE_PROPERTY(target, "noBrowserGlobals");
	76	+ #else
	77	+ READONLY_FALSE_PROPERTY(target, "noBrowserGlobals");
	78	+ #endif // NODE_NO_BROWSER_GLOBALS
	79	+
73	80	READONLY_PROPERTY(target,
74	81	"bits",
75	82	Number::New(env->isolate(), 8 * sizeof(intptr_t)));

Collapse file

‎src/node_process_object.cc‎

Copy file name to clipboardExpand all lines: src/node_process_object.cc

-5Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
@@ -233,11 +233,6 @@ MaybeLocal<Object> CreateProcessObject(
233	233	READONLY_PROPERTY(process, "throwDeprecation", True(env->isolate()));
234	234	}
235	235
236		- #ifdef NODE_NO_BROWSER_GLOBALS
237		- // configure --no-browser-globals
238		- READONLY_PROPERTY(process, "_noBrowserGlobals", True(env->isolate()));
239		- #endif // NODE_NO_BROWSER_GLOBALS
240		-
241	236	// --prof-process
242	237	// TODO(addaleax): Remove this.
243	238	if (env->options()->prof_process) {

0 commit comments

Comments

0 (0)