From 61b495a5c19580d72481e41c180d453f9de57979 Mon Sep 17 00:00:00 2001 From: Vladimir Ilic Date: Fri, 12 Oct 2018 11:09:51 -0700 Subject: [PATCH 1/4] Migrating from process.binding('config') to getOptions --- lib/internal/bootstrap/node.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js index 2d99885750fb37..3fdc62cf7925fd 100644 --- a/lib/internal/bootstrap/node.js +++ b/lib/internal/bootstrap/node.js @@ -137,7 +137,7 @@ setupQueueMicrotask(); } - if (process.binding('config').experimentalWorker) { + if (internalBinding('options').getOptions('--experimental-worker')) { setupDOMException(); } @@ -169,9 +169,9 @@ 'DeprecationWarning', 'DEP0062', startup, true); } - if (process.binding('config').experimentalModules || - process.binding('config').experimentalVMModules) { - if (process.binding('config').experimentalModules) { + if (internalBinding('options').getOptions('--experimental-modules') || + internalBinding('options').getOptions('--experimental-vm-modules')) { + if (internalBinding('options').getOptions('--experimental-modules')) { process.emitWarning( 'The ESM module loader is experimental.', 'ExperimentalWarning', undefined); @@ -183,7 +183,7 @@ { // Install legacy getters on the `util` binding for typechecking. // TODO(addaleax): Turn into a full runtime deprecation. - const { pendingDeprecation } = process.binding('config'); + const { pendingDeprecation } = internalBinding('options').getOptions(); const utilBinding = internalBinding('util'); const types = internalBinding('types'); for (const name of [ From 76369122f54f94a5e5c0346f7c410d6c785c1804 Mon Sep 17 00:00:00 2001 From: Vladimir Ilic Date: Thu, 18 Oct 2018 20:36:14 -0700 Subject: [PATCH 2/4] Fixing found issues --- lib/internal/bootstrap/node.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js index 3fdc62cf7925fd..b49ca80907d31f 100644 --- a/lib/internal/bootstrap/node.js +++ b/lib/internal/bootstrap/node.js @@ -183,7 +183,7 @@ { // Install legacy getters on the `util` binding for typechecking. // TODO(addaleax): Turn into a full runtime deprecation. - const { pendingDeprecation } = internalBinding('options').getOptions(); + const { pendingDeprecation } = process.binding('config'); const utilBinding = internalBinding('util'); const types = internalBinding('types'); for (const name of [ @@ -635,9 +635,7 @@ const { kExpandStackSymbol } = NativeModule.require('internal/util'); if (typeof er[kExpandStackSymbol] === 'function') er[kExpandStackSymbol](); - } catch { - // Nothing to be done about it at this point. - } + } catch (er) {} return false; } From 371d0bde46c83879363ccfd18dec8f4b8f88a7af Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Mon, 22 Oct 2018 15:15:08 -0700 Subject: [PATCH 3/4] fixup! Fixing found issues --- lib/internal/bootstrap/node.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js index b49ca80907d31f..d858f565b85417 100644 --- a/lib/internal/bootstrap/node.js +++ b/lib/internal/bootstrap/node.js @@ -111,13 +111,18 @@ NativeModule.require('internal/inspector_async_hook').setup(); } - const options = internalBinding('options'); - if (options.getOptions('--help')) { + const { getOptions } = internalBinding('options'); + const helpOption = getOptions('--help'); + const completionBashOption = getOptions('--completion-bash'); + const experimentalModulesOption = getOptions('--experimental-modules'); + const experimentalVMModulesOption = getOptions('--experimental-vm-modules'); + const experimentalWorkerOption = getOptions('--experimental-worker'); + if (helpOption) { NativeModule.require('internal/print_help').print(process.stdout); return; } - if (options.getOptions('--completion-bash')) { + if (completionBashOption) { NativeModule.require('internal/bash_completion').print(process.stdout); return; } @@ -137,7 +142,7 @@ setupQueueMicrotask(); } - if (internalBinding('options').getOptions('--experimental-worker')) { + if (experimentalWorkerOption) { setupDOMException(); } @@ -169,9 +174,8 @@ 'DeprecationWarning', 'DEP0062', startup, true); } - if (internalBinding('options').getOptions('--experimental-modules') || - internalBinding('options').getOptions('--experimental-vm-modules')) { - if (internalBinding('options').getOptions('--experimental-modules')) { + if (experimentalModulesOption || experimentalVMModulesOption) { + if (experimentalModulesOption) { process.emitWarning( 'The ESM module loader is experimental.', 'ExperimentalWarning', undefined); From fa92ae4711440e4241446bf92025db6107c2cad7 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Mon, 22 Oct 2018 15:16:20 -0700 Subject: [PATCH 4/4] fixup! fixup! Fixing found issues --- lib/internal/bootstrap/node.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js index d858f565b85417..01eec32f344d8e 100644 --- a/lib/internal/bootstrap/node.js +++ b/lib/internal/bootstrap/node.js @@ -639,7 +639,9 @@ const { kExpandStackSymbol } = NativeModule.require('internal/util'); if (typeof er[kExpandStackSymbol] === 'function') er[kExpandStackSymbol](); - } catch (er) {} + } catch { + // Nothing to be done about it at this point. + } return false; }