summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGus Caplan <me@gus.host>2018-09-22 09:49:52 -0500
committerDaniel Bevenius <daniel.bevenius@gmail.com>2018-10-04 11:55:34 +0200
commite7f710c1d4729890806610e5450d7a0edfb4ac11 (patch)
tree2190bc3bca442a3f485a8c48dbf27bb9a16e099a
parent9800fd7aaa7226fff3f21edd7f77f563b9a69753 (diff)
downloadandroid-node-v8-e7f710c1d4729890806610e5450d7a0edfb4ac11.tar.gz
android-node-v8-e7f710c1d4729890806610e5450d7a0edfb4ac11.tar.bz2
android-node-v8-e7f710c1d4729890806610e5450d7a0edfb4ac11.zip
bootstrapper: move internalBinding to NativeModule
internalBinding is used so often that it should just automatically be available for usage in internals. PR-URL: https://github.com/nodejs/node/pull/23025 Refs: https://github.com/nodejs/node/commit/2a9eb31 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Michaƫl Zasso <targos@protonmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
-rw-r--r--lib/.eslintrc.yaml1
-rw-r--r--lib/_http_client.js1
-rw-r--r--lib/_http_common.js1
-rw-r--r--lib/_http_server.js1
-rw-r--r--lib/_tls_common.js1
-rw-r--r--lib/_tls_wrap.js1
-rw-r--r--lib/buffer.js1
-rw-r--r--lib/child_process.js1
-rw-r--r--lib/console.js1
-rw-r--r--lib/crypto.js1
-rw-r--r--lib/dgram.js1
-rw-r--r--lib/dns.js1
-rw-r--r--lib/domain.js1
-rw-r--r--lib/internal/async_hooks.js1
-rw-r--r--lib/internal/bash_completion.js1
-rw-r--r--lib/internal/bootstrap/loaders.js4
-rw-r--r--lib/internal/child_process.js1
-rw-r--r--lib/internal/cluster/round_robin_handle.js1
-rw-r--r--lib/internal/crypto/certificate.js1
-rw-r--r--lib/internal/crypto/cipher.js1
-rw-r--r--lib/internal/crypto/keygen.js1
-rw-r--r--lib/internal/crypto/pbkdf2.js1
-rw-r--r--lib/internal/crypto/random.js1
-rw-r--r--lib/internal/crypto/scrypt.js1
-rw-r--r--lib/internal/crypto/sig.js1
-rw-r--r--lib/internal/crypto/util.js1
-rw-r--r--lib/internal/dgram.js1
-rw-r--r--lib/internal/dns/promises.js1
-rw-r--r--lib/internal/dns/utils.js1
-rw-r--r--lib/internal/domexception.js1
-rw-r--r--lib/internal/encoding.js1
-rw-r--r--lib/internal/errors.js1
-rw-r--r--lib/internal/fs/watchers.js1
-rw-r--r--lib/internal/http2/compat.js1
-rw-r--r--lib/internal/http2/core.js1
-rw-r--r--lib/internal/http2/util.js1
-rw-r--r--lib/internal/modules/cjs/loader.js2
-rw-r--r--lib/internal/modules/esm/create_dynamic_module.js1
-rw-r--r--lib/internal/modules/esm/default_resolve.js2
-rw-r--r--lib/internal/modules/esm/module_job.js1
-rw-r--r--lib/internal/modules/esm/translators.js2
-rw-r--r--lib/internal/print_help.js1
-rw-r--r--lib/internal/process/esm_loader.js1
-rw-r--r--lib/internal/process/promises.js1
-rw-r--r--lib/internal/process/stdio.js2
-rw-r--r--lib/internal/queue_microtask.js1
-rw-r--r--lib/internal/stream_base_commons.js1
-rw-r--r--lib/internal/test/binding.js1
-rw-r--r--lib/internal/test/heap.js1
-rw-r--r--lib/internal/timers.js1
-rw-r--r--lib/internal/trace_events_async_hooks.js1
-rw-r--r--lib/internal/url.js1
-rw-r--r--lib/internal/util.js1
-rw-r--r--lib/internal/util/comparisons.js1
-rw-r--r--lib/internal/util/inspect.js2
-rw-r--r--lib/internal/vm/source_text_module.js1
-rw-r--r--lib/internal/worker.js1
-rw-r--r--lib/internal/wrap_js_stream.js1
-rw-r--r--lib/net.js1
-rw-r--r--lib/os.js1
-rw-r--r--lib/perf_hooks.js1
-rw-r--r--lib/repl.js1
-rw-r--r--lib/stream.js1
-rw-r--r--lib/string_decoder.js1
-rw-r--r--lib/timers.js1
-rw-r--r--lib/tls.js1
-rw-r--r--lib/trace_events.js1
-rw-r--r--lib/tty.js1
-rw-r--r--lib/util.js2
-rw-r--r--lib/v8.js1
-rw-r--r--lib/vm.js1
71 files changed, 6 insertions, 74 deletions
diff --git a/lib/.eslintrc.yaml b/lib/.eslintrc.yaml
index a1a0b9490a..65c7c88ba0 100644
--- a/lib/.eslintrc.yaml
+++ b/lib/.eslintrc.yaml
@@ -44,3 +44,4 @@ globals:
DCHECK_LE: false
DCHECK_LT: false
DCHECK_NE: false
+ internalBinding: false
diff --git a/lib/_http_client.js b/lib/_http_client.js
index cbc7774489..c83800a93b 100644
--- a/lib/_http_client.js
+++ b/lib/_http_client.js
@@ -24,7 +24,6 @@
const util = require('util');
const net = require('net');
const url = require('url');
-const { internalBinding } = require('internal/bootstrap/loaders');
const { HTTPParser } = internalBinding('http_parser');
const assert = require('assert').ok;
const {
diff --git a/lib/_http_common.js b/lib/_http_common.js
index 09f9aebe9b..1de0ee6025 100644
--- a/lib/_http_common.js
+++ b/lib/_http_common.js
@@ -21,7 +21,6 @@
'use strict';
-const { internalBinding } = require('internal/bootstrap/loaders');
const { methods, HTTPParser } = internalBinding('http_parser');
const FreeList = require('internal/freelist');
diff --git a/lib/_http_server.js b/lib/_http_server.js
index b216eab32a..cc1a428cd6 100644
--- a/lib/_http_server.js
+++ b/lib/_http_server.js
@@ -23,7 +23,6 @@
const util = require('util');
const net = require('net');
-const { internalBinding } = require('internal/bootstrap/loaders');
const { HTTPParser } = internalBinding('http_parser');
const assert = require('assert').ok;
const {
diff --git a/lib/_tls_common.js b/lib/_tls_common.js
index 2401bd0b4b..b8e68eec15 100644
--- a/lib/_tls_common.js
+++ b/lib/_tls_common.js
@@ -34,7 +34,6 @@ const { SSL_OP_CIPHER_SERVER_PREFERENCE } = process.binding('constants').crypto;
// Lazily loaded from internal/crypto/util.
let toBuf = null;
-const { internalBinding } = require('internal/bootstrap/loaders');
const { SecureContext: NativeSecureContext } = internalBinding('crypto');
function SecureContext(secureProtocol, secureOptions, context) {
if (!(this instanceof SecureContext)) {
diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
index 7df4b66122..fb9662c922 100644
--- a/lib/_tls_wrap.js
+++ b/lib/_tls_wrap.js
@@ -32,7 +32,6 @@ const common = require('_tls_common');
const { StreamWrap } = require('_stream_wrap');
const { Buffer } = require('buffer');
const debug = util.debuglog('tls');
-const { internalBinding } = require('internal/bootstrap/loaders');
const { TCP, constants: TCPConstants } = internalBinding('tcp_wrap');
const tls_wrap = internalBinding('tls_wrap');
const { Pipe, constants: PipeConstants } = internalBinding('pipe_wrap');
diff --git a/lib/buffer.js b/lib/buffer.js
index da1563ec3a..f274c51739 100644
--- a/lib/buffer.js
+++ b/lib/buffer.js
@@ -41,7 +41,6 @@ const {
// that test/parallel/test-buffer-bindingobj-no-zerofill.js is written.
let isAnyArrayBuffer;
try {
- const { internalBinding } = require('internal/bootstrap/loaders');
isAnyArrayBuffer = internalBinding('types').isAnyArrayBuffer;
} catch (e) {
isAnyArrayBuffer = require('util').types.isAnyArrayBuffer;
diff --git a/lib/child_process.js b/lib/child_process.js
index 2962f5cf05..7ac3a3bcc0 100644
--- a/lib/child_process.js
+++ b/lib/child_process.js
@@ -28,7 +28,6 @@ const {
const { isArrayBufferView } = require('internal/util/types');
const debug = util.debuglog('child_process');
const { Buffer } = require('buffer');
-const { internalBinding } = require('internal/bootstrap/loaders');
const { Pipe, constants: PipeConstants } = internalBinding('pipe_wrap');
const {
ERR_INVALID_ARG_VALUE,
diff --git a/lib/console.js b/lib/console.js
index 406f7007e2..c254a3889b 100644
--- a/lib/console.js
+++ b/lib/console.js
@@ -29,7 +29,6 @@ const {
ERR_INVALID_ARG_VALUE,
},
} = require('internal/errors');
-const { internalBinding } = require('internal/bootstrap/loaders');
const { previewEntries } = internalBinding('util');
const { Buffer: { isBuffer } } = require('buffer');
const util = require('util');
diff --git a/lib/crypto.js b/lib/crypto.js
index ed902272de..bff21f6dd6 100644
--- a/lib/crypto.js
+++ b/lib/crypto.js
@@ -30,7 +30,6 @@ const {
} = require('internal/util');
assertCrypto();
-const { internalBinding } = require('internal/bootstrap/loaders');
const {
ERR_CRYPTO_FIPS_FORCED,
ERR_CRYPTO_FIPS_UNAVAILABLE
diff --git a/lib/dgram.js b/lib/dgram.js
index cfaea69abd..c4819f0eb0 100644
--- a/lib/dgram.js
+++ b/lib/dgram.js
@@ -52,7 +52,6 @@ const {
defaultTriggerAsyncIdScope,
symbols: { async_id_symbol, owner_symbol }
} = require('internal/async_hooks');
-const { internalBinding } = require('internal/bootstrap/loaders');
const { UV_UDP_REUSEADDR } = process.binding('constants').os;
const { UDP, SendWrap } = internalBinding('udp_wrap');
diff --git a/lib/dns.js b/lib/dns.js
index 44fdb1764a..326499497b 100644
--- a/lib/dns.js
+++ b/lib/dns.js
@@ -21,7 +21,6 @@
'use strict';
-const { internalBinding } = require('internal/bootstrap/loaders');
const cares = internalBinding('cares_wrap');
const { isIP, isIPv4, isLegalPort } = require('internal/net');
const { customPromisifyArgs } = require('internal/util');
diff --git a/lib/domain.js b/lib/domain.js
index beacdc8910..e8ae3ff100 100644
--- a/lib/domain.js
+++ b/lib/domain.js
@@ -34,7 +34,6 @@ const {
ERR_UNHANDLED_ERROR
} = require('internal/errors').codes;
const { createHook } = require('async_hooks');
-const { internalBinding } = require('internal/bootstrap/loaders');
// overwrite process.domain with a getter/setter that will allow for more
// effective optimizations
diff --git a/lib/internal/async_hooks.js b/lib/internal/async_hooks.js
index fd48e2b25b..a42f603293 100644
--- a/lib/internal/async_hooks.js
+++ b/lib/internal/async_hooks.js
@@ -4,7 +4,6 @@ const {
ERR_ASYNC_TYPE,
ERR_INVALID_ASYNC_ID
} = require('internal/errors').codes;
-const { internalBinding } = require('internal/bootstrap/loaders');
const async_wrap = internalBinding('async_wrap');
/* async_hook_fields is a Uint32Array wrapping the uint32_t array of
* Environment::AsyncHooks::fields_[]. Each index tracks the number of active
diff --git a/lib/internal/bash_completion.js b/lib/internal/bash_completion.js
index 7d2ffbe901..cb8eab9cee 100644
--- a/lib/internal/bash_completion.js
+++ b/lib/internal/bash_completion.js
@@ -1,5 +1,4 @@
'use strict';
-const { internalBinding } = require('internal/bootstrap/loaders');
const { getOptions } = internalBinding('options');
function print(stream) {
diff --git a/lib/internal/bootstrap/loaders.js b/lib/internal/bootstrap/loaders.js
index 5a28fdda10..8234275700 100644
--- a/lib/internal/bootstrap/loaders.js
+++ b/lib/internal/bootstrap/loaders.js
@@ -223,7 +223,7 @@
};
NativeModule.wrapper = [
- '(function (exports, require, module, process) {',
+ '(function (exports, require, module, process, internalBinding) {',
'\n});'
];
@@ -294,7 +294,7 @@
const requireFn = this.id.startsWith('internal/deps/') ?
NativeModule.requireForDeps :
NativeModule.require;
- fn(this.exports, requireFn, this, process);
+ fn(this.exports, requireFn, this, process, internalBinding);
if (config.experimentalModules && !NativeModule.isInternal(this.id)) {
this.exportKeys = ObjectKeys(this.exports);
diff --git a/lib/internal/child_process.js b/lib/internal/child_process.js
index 1c5aace915..e6cdde56c1 100644
--- a/lib/internal/child_process.js
+++ b/lib/internal/child_process.js
@@ -21,7 +21,6 @@ const dgram = require('dgram');
const util = require('util');
const assert = require('assert');
-const { internalBinding } = require('internal/bootstrap/loaders');
const { Process } = internalBinding('process_wrap');
const { WriteWrap } = internalBinding('stream_wrap');
const { Pipe, constants: PipeConstants } = internalBinding('pipe_wrap');
diff --git a/lib/internal/cluster/round_robin_handle.js b/lib/internal/cluster/round_robin_handle.js
index 9f09d9fbf7..6b2bc37254 100644
--- a/lib/internal/cluster/round_robin_handle.js
+++ b/lib/internal/cluster/round_robin_handle.js
@@ -2,7 +2,6 @@
const assert = require('assert');
const net = require('net');
const { sendHelper } = require('internal/cluster/utils');
-const { internalBinding } = require('internal/bootstrap/loaders');
const uv = internalBinding('uv');
module.exports = RoundRobinHandle;
diff --git a/lib/internal/crypto/certificate.js b/lib/internal/crypto/certificate.js
index d96965224d..29372ca497 100644
--- a/lib/internal/crypto/certificate.js
+++ b/lib/internal/crypto/certificate.js
@@ -1,6 +1,5 @@
'use strict';
-const { internalBinding } = require('internal/bootstrap/loaders');
const {
certExportChallenge,
certExportPublicKey,
diff --git a/lib/internal/crypto/cipher.js b/lib/internal/crypto/cipher.js
index 59507fea91..2d7ddede57 100644
--- a/lib/internal/crypto/cipher.js
+++ b/lib/internal/crypto/cipher.js
@@ -21,7 +21,6 @@ const {
const { isArrayBufferView } = require('internal/util/types');
-const { internalBinding } = require('internal/bootstrap/loaders');
const {
CipherBase,
privateDecrypt: _privateDecrypt,
diff --git a/lib/internal/crypto/keygen.js b/lib/internal/crypto/keygen.js
index b3025ee9d9..61898989b0 100644
--- a/lib/internal/crypto/keygen.js
+++ b/lib/internal/crypto/keygen.js
@@ -1,6 +1,5 @@
'use strict';
-const { internalBinding } = require('internal/bootstrap/loaders');
const { AsyncWrap, Providers } = internalBinding('async_wrap');
const {
generateKeyPairRSA,
diff --git a/lib/internal/crypto/pbkdf2.js b/lib/internal/crypto/pbkdf2.js
index 616892d98f..e1a7a4811a 100644
--- a/lib/internal/crypto/pbkdf2.js
+++ b/lib/internal/crypto/pbkdf2.js
@@ -1,6 +1,5 @@
'use strict';
-const { internalBinding } = require('internal/bootstrap/loaders');
const { AsyncWrap, Providers } = internalBinding('async_wrap');
const { Buffer } = require('buffer');
const { pbkdf2: _pbkdf2 } = internalBinding('crypto');
diff --git a/lib/internal/crypto/random.js b/lib/internal/crypto/random.js
index 3393da92d2..d6b6f47b20 100644
--- a/lib/internal/crypto/random.js
+++ b/lib/internal/crypto/random.js
@@ -1,6 +1,5 @@
'use strict';
-const { internalBinding } = require('internal/bootstrap/loaders');
const { AsyncWrap, Providers } = internalBinding('async_wrap');
const { Buffer, kMaxLength } = require('buffer');
const { randomBytes: _randomBytes } = internalBinding('crypto');
diff --git a/lib/internal/crypto/scrypt.js b/lib/internal/crypto/scrypt.js
index b8ab0a590f..d364c13859 100644
--- a/lib/internal/crypto/scrypt.js
+++ b/lib/internal/crypto/scrypt.js
@@ -1,6 +1,5 @@
'use strict';
-const { internalBinding } = require('internal/bootstrap/loaders');
const { AsyncWrap, Providers } = internalBinding('async_wrap');
const { Buffer } = require('buffer');
const { scrypt: _scrypt } = internalBinding('crypto');
diff --git a/lib/internal/crypto/sig.js b/lib/internal/crypto/sig.js
index 5a1787d00f..86b43341bd 100644
--- a/lib/internal/crypto/sig.js
+++ b/lib/internal/crypto/sig.js
@@ -5,7 +5,6 @@ const {
ERR_INVALID_OPT_VALUE
} = require('internal/errors').codes;
const { validateString } = require('internal/validators');
-const { internalBinding } = require('internal/bootstrap/loaders');
const { Sign: _Sign, Verify: _Verify } = internalBinding('crypto');
const {
RSA_PSS_SALTLEN_AUTO,
diff --git a/lib/internal/crypto/util.js b/lib/internal/crypto/util.js
index 6549f63430..496f195c73 100644
--- a/lib/internal/crypto/util.js
+++ b/lib/internal/crypto/util.js
@@ -1,6 +1,5 @@
'use strict';
-const { internalBinding } = require('internal/bootstrap/loaders');
const {
getCiphers: _getCiphers,
getCurves: _getCurves,
diff --git a/lib/internal/dgram.js b/lib/internal/dgram.js
index 829b11bf68..9dac221301 100644
--- a/lib/internal/dgram.js
+++ b/lib/internal/dgram.js
@@ -1,6 +1,5 @@
'use strict';
const { codes } = require('internal/errors');
-const { internalBinding } = require('internal/bootstrap/loaders');
const { UDP } = internalBinding('udp_wrap');
const { isInt32 } = require('internal/validators');
const TTYWrap = internalBinding('tty_wrap');
diff --git a/lib/internal/dns/promises.js b/lib/internal/dns/promises.js
index 408dec712d..6d2fa3b170 100644
--- a/lib/internal/dns/promises.js
+++ b/lib/internal/dns/promises.js
@@ -6,7 +6,6 @@ const {
} = require('internal/dns/utils');
const { codes, dnsException } = require('internal/errors');
const { isIP, isIPv4, isLegalPort } = require('internal/net');
-const { internalBinding } = require('internal/bootstrap/loaders');
const {
getaddrinfo,
getnameinfo,
diff --git a/lib/internal/dns/utils.js b/lib/internal/dns/utils.js
index 2362f28a82..143d36193a 100644
--- a/lib/internal/dns/utils.js
+++ b/lib/internal/dns/utils.js
@@ -1,7 +1,6 @@
'use strict';
const errors = require('internal/errors');
const { isIP } = require('internal/net');
-const { internalBinding } = require('internal/bootstrap/loaders');
const {
ChannelWrap,
strerror,
diff --git a/lib/internal/domexception.js b/lib/internal/domexception.js
index 586d954dc4..3f9d3f3601 100644
--- a/lib/internal/domexception.js
+++ b/lib/internal/domexception.js
@@ -1,6 +1,5 @@
'use strict';
-const { internalBinding } = require('internal/bootstrap/loaders');
const { registerDOMException } = internalBinding('messaging');
const { ERR_INVALID_THIS } = require('internal/errors').codes;
diff --git a/lib/internal/encoding.js b/lib/internal/encoding.js
index ae874c530c..161ae72a19 100644
--- a/lib/internal/encoding.js
+++ b/lib/internal/encoding.js
@@ -23,7 +23,6 @@ const {
const { isArrayBufferView } = require('internal/util/types');
-const { internalBinding } = require('internal/bootstrap/loaders');
const {
isArrayBuffer
} = internalBinding('types');
diff --git a/lib/internal/errors.js b/lib/internal/errors.js
index 1914f2ec8d..19638b83ee 100644
--- a/lib/internal/errors.js
+++ b/lib/internal/errors.js
@@ -15,7 +15,6 @@ const kInfo = Symbol('info');
const messages = new Map();
const codes = {};
-const { internalBinding } = require('internal/bootstrap/loaders');
const {
errmap,
UV_EAI_NODATA,
diff --git a/lib/internal/fs/watchers.js b/lib/internal/fs/watchers.js
index 758fb4e692..0863664110 100644
--- a/lib/internal/fs/watchers.js
+++ b/lib/internal/fs/watchers.js
@@ -1,7 +1,6 @@
'use strict';
const errors = require('internal/errors');
-const { internalBinding } = require('internal/bootstrap/loaders');
const {
kFsStatsFieldsLength,
StatWatcher: _StatWatcher
diff --git a/lib/internal/http2/compat.js b/lib/internal/http2/compat.js
index a20275b313..4622d97614 100644
--- a/lib/internal/http2/compat.js
+++ b/lib/internal/http2/compat.js
@@ -1,6 +1,5 @@
'use strict';
-const { internalBinding } = require('internal/bootstrap/loaders');
const Stream = require('stream');
const Readable = Stream.Readable;
const binding = internalBinding('http2');
diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js
index a772fb277d..b1ed1eee8f 100644
--- a/lib/internal/http2/core.js
+++ b/lib/internal/http2/core.js
@@ -10,7 +10,6 @@ const {
assertCrypto();
-const { internalBinding } = require('internal/bootstrap/loaders');
const assert = require('assert');
const EventEmitter = require('events');
const fs = require('fs');
diff --git a/lib/internal/http2/util.js b/lib/internal/http2/util.js
index 473806aa18..99466b36d3 100644
--- a/lib/internal/http2/util.js
+++ b/lib/internal/http2/util.js
@@ -1,6 +1,5 @@
'use strict';
-const { internalBinding } = require('internal/bootstrap/loaders');
const binding = internalBinding('http2');
const {
ERR_HTTP2_HEADER_SINGLE_VALUE,
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
index fba416d4db..f3f8b0c8e0 100644
--- a/lib/internal/modules/cjs/loader.js
+++ b/lib/internal/modules/cjs/loader.js
@@ -21,7 +21,7 @@
'use strict';
-const { internalBinding, NativeModule } = require('internal/bootstrap/loaders');
+const { NativeModule } = require('internal/bootstrap/loaders');
const util = require('util');
const { pathToFileURL } = require('internal/url');
const vm = require('vm');
diff --git a/lib/internal/modules/esm/create_dynamic_module.js b/lib/internal/modules/esm/create_dynamic_module.js
index c01844feb8..8e93a08502 100644
--- a/lib/internal/modules/esm/create_dynamic_module.js
+++ b/lib/internal/modules/esm/create_dynamic_module.js
@@ -1,6 +1,5 @@
'use strict';
-const { internalBinding } = require('internal/bootstrap/loaders');
const { ModuleWrap } = internalBinding('module_wrap');
const debug = require('util').debuglog('esm');
const ArrayJoin = Function.call.bind(Array.prototype.join);
diff --git a/lib/internal/modules/esm/default_resolve.js b/lib/internal/modules/esm/default_resolve.js
index 875c560cb1..8f8efcb536 100644
--- a/lib/internal/modules/esm/default_resolve.js
+++ b/lib/internal/modules/esm/default_resolve.js
@@ -3,7 +3,7 @@
const { URL } = require('url');
const CJSmodule = require('internal/modules/cjs/loader');
const internalFS = require('internal/fs/utils');
-const { NativeModule, internalBinding } = require('internal/bootstrap/loaders');
+const { NativeModule } = require('internal/bootstrap/loaders');
const { extname } = require('path');
const { realpathSync } = require('fs');
const preserveSymlinks = !!process.binding('config').preserveSymlinks;
diff --git a/lib/internal/modules/esm/module_job.js b/lib/internal/modules/esm/module_job.js
index 9735eae8b5..50aa00a09a 100644
--- a/lib/internal/modules/esm/module_job.js
+++ b/lib/internal/modules/esm/module_job.js
@@ -1,6 +1,5 @@
'use strict';
-const { internalBinding } = require('internal/bootstrap/loaders');
const { ModuleWrap } = internalBinding('module_wrap');
const { SafeSet, SafePromise } = require('internal/safe_globals');
const { decorateErrorStack } = require('internal/util');
diff --git a/lib/internal/modules/esm/translators.js b/lib/internal/modules/esm/translators.js
index aaf35ed461..df3c446cab 100644
--- a/lib/internal/modules/esm/translators.js
+++ b/lib/internal/modules/esm/translators.js
@@ -1,6 +1,6 @@
'use strict';
-const { NativeModule, internalBinding } = require('internal/bootstrap/loaders');
+const { NativeModule } = require('internal/bootstrap/loaders');
const { ModuleWrap } = internalBinding('module_wrap');
const {
stripShebang,
diff --git a/lib/internal/print_help.js b/lib/internal/print_help.js
index 065d6524b7..8acc9271b1 100644
--- a/lib/internal/print_help.js
+++ b/lib/internal/print_help.js
@@ -1,5 +1,4 @@
'use strict';
-const { internalBinding } = require('internal/bootstrap/loaders');
const { getOptions, types } = internalBinding('options');
const typeLookup = [];
diff --git a/lib/internal/process/esm_loader.js b/lib/internal/process/esm_loader.js
index 6f3ac729f8..23b98c620e 100644
--- a/lib/internal/process/esm_loader.js
+++ b/lib/internal/process/esm_loader.js
@@ -1,6 +1,5 @@
'use strict';
-const { internalBinding } = require('internal/bootstrap/loaders');
const {
setImportModuleDynamicallyCallback,
setInitializeImportMetaObjectCallback
diff --git a/lib/internal/process/promises.js b/lib/internal/process/promises.js
index 695baefefa..d70deb5160 100644
--- a/lib/internal/process/promises.js
+++ b/lib/internal/process/promises.js
@@ -1,6 +1,5 @@
'use strict';
-const { internalBinding } = require('internal/bootstrap/loaders');
const { safeToString } = internalBinding('util');
const maybeUnhandledPromises = new WeakMap();
diff --git a/lib/internal/process/stdio.js b/lib/internal/process/stdio.js
index 57969324a9..2665e4b939 100644
--- a/lib/internal/process/stdio.js
+++ b/lib/internal/process/stdio.js
@@ -47,7 +47,6 @@ function getMainThreadStdio() {
function getStdin() {
if (stdin) return stdin;
- const { internalBinding } = require('internal/bootstrap/loaders');
const tty_wrap = internalBinding('tty_wrap');
const fd = 0;
@@ -164,7 +163,6 @@ function setupProcessStdio({ getStdout, getStdin, getStderr }) {
function createWritableStdioStream(fd) {
var stream;
- const { internalBinding } = require('internal/bootstrap/loaders');
const tty_wrap = internalBinding('tty_wrap');
// Note stream._type is used for test-module-load-list.js
diff --git a/lib/internal/queue_microtask.js b/lib/internal/queue_microtask.js
index 3ff7ae9ae4..e9cc414389 100644
--- a/lib/internal/queue_microtask.js
+++ b/lib/internal/queue_microtask.js
@@ -3,7 +3,6 @@
const { ERR_INVALID_ARG_TYPE } = require('internal/errors').codes;
const { AsyncResource } = require('async_hooks');
const { getDefaultTriggerAsyncId } = require('internal/async_hooks');
-const { internalBinding } = require('internal/bootstrap/loaders');
const { enqueueMicrotask } = internalBinding('util');
// declared separately for name, arrow function to prevent construction
diff --git a/lib/internal/stream_base_commons.js b/lib/internal/stream_base_commons.js
index 5c49026e99..8da15983f1 100644
--- a/lib/internal/stream_base_commons.js
+++ b/lib/internal/stream_base_commons.js
@@ -1,7 +1,6 @@
'use strict';
const { Buffer } = require('buffer');
-const { internalBinding } = require('internal/bootstrap/loaders');
const { WriteWrap } = internalBinding('stream_wrap');
const { UV_EOF } = internalBinding('uv');
const { errnoException } = require('internal/errors');
diff --git a/lib/internal/test/binding.js b/lib/internal/test/binding.js
index 8c19be8ac0..17f1574efc 100644
--- a/lib/internal/test/binding.js
+++ b/lib/internal/test/binding.js
@@ -5,5 +5,4 @@ process.emitWarning(
'tracked by any versioning system or deprecation process.',
'internal/test/binding');
-const { internalBinding } = require('internal/bootstrap/loaders');
module.exports = { internalBinding };
diff --git a/lib/internal/test/heap.js b/lib/internal/test/heap.js
index a9260f651b..fae8326645 100644
--- a/lib/internal/test/heap.js
+++ b/lib/internal/test/heap.js
@@ -5,7 +5,6 @@ process.emitWarning(
'tracked by any versioning system or deprecation process.',
'internal/test/heap');
-const { internalBinding } = require('internal/bootstrap/loaders');
const { createHeapDump, buildEmbedderGraph } = internalBinding('heap_utils');
const assert = require('assert');
diff --git a/lib/internal/timers.js b/lib/internal/timers.js
index be86153d5d..5c96b38ee6 100644
--- a/lib/internal/timers.js
+++ b/lib/internal/timers.js
@@ -6,7 +6,6 @@ const {
initHooksExist,
emitInit
} = require('internal/async_hooks');
-const { internalBinding } = require('internal/bootstrap/loaders');
// Symbols for storing async id state.
const async_id_symbol = Symbol('asyncId');
const trigger_async_id_symbol = Symbol('triggerId');
diff --git a/lib/internal/trace_events_async_hooks.js b/lib/internal/trace_events_async_hooks.js
index 6eb52f5949..0cf5d517c2 100644
--- a/lib/internal/trace_events_async_hooks.js
+++ b/lib/internal/trace_events_async_hooks.js
@@ -1,6 +1,5 @@
'use strict';
-const { internalBinding } = require('internal/bootstrap/loaders');
const { trace } = internalBinding('trace_events');
const async_wrap = internalBinding('async_wrap');
const async_hooks = require('async_hooks');
diff --git a/lib/internal/url.js b/lib/internal/url.js
index 40b3104baf..f6cf353233 100644
--- a/lib/internal/url.js
+++ b/lib/internal/url.js
@@ -37,7 +37,6 @@ let querystring;
const { platform } = process;
const isWindows = platform === 'win32';
-const { internalBinding } = require('internal/bootstrap/loaders');
const {
domainToASCII: _domainToASCII,
domainToUnicode: _domainToUnicode,
diff --git a/lib/internal/util.js b/lib/internal/util.js
index 9a102907ee..745b69381d 100644
--- a/lib/internal/util.js
+++ b/lib/internal/util.js
@@ -6,7 +6,6 @@ const {
ERR_UNKNOWN_SIGNAL
} = require('internal/errors').codes;
const { signals } = process.binding('constants').os;
-const { internalBinding } = require('internal/bootstrap/loaders');
const {
getHiddenValue,
setHiddenValue,
diff --git a/lib/internal/util/comparisons.js b/lib/internal/util/comparisons.js
index 1cef5533bc..3641f0cdc2 100644
--- a/lib/internal/util/comparisons.js
+++ b/lib/internal/util/comparisons.js
@@ -2,7 +2,6 @@
const { compare } = process.binding('buffer');
const { isArrayBufferView } = require('internal/util/types');
-const { internalBinding } = require('internal/bootstrap/loaders');
const {
isAnyArrayBuffer,
isDate,
diff --git a/lib/internal/util/inspect.js b/lib/internal/util/inspect.js
index 4f018ed314..4cff372b33 100644
--- a/lib/internal/util/inspect.js
+++ b/lib/internal/util/inspect.js
@@ -1,7 +1,5 @@
'use strict';
-const { internalBinding } = require('internal/bootstrap/loaders');
-
const {
getOwnNonIndexProperties,
getPromiseDetails,
diff --git a/lib/internal/vm/source_text_module.js b/lib/internal/vm/source_text_module.js
index 6bba7d782f..c1c3611d8f 100644
--- a/lib/internal/vm/source_text_module.js
+++ b/lib/internal/vm/source_text_module.js
@@ -1,6 +1,5 @@
'use strict';
-const { internalBinding } = require('internal/bootstrap/loaders');
const { URL } = require('internal/url');
const { isContext } = internalBinding('contextify');
const {
diff --git a/lib/internal/worker.js b/lib/internal/worker.js
index 2cffb77e52..41432f55e9 100644
--- a/lib/internal/worker.js
+++ b/lib/internal/worker.js
@@ -12,7 +12,6 @@ const {
ERR_WORKER_UNSUPPORTED_EXTENSION,
} = require('internal/errors').codes;
-const { internalBinding } = require('internal/bootstrap/loaders');
const { MessagePort, MessageChannel } = internalBinding('messaging');
const {
handle_onclose: handleOnCloseSymbol,
diff --git a/lib/internal/wrap_js_stream.js b/lib/internal/wrap_js_stream.js
index 3c75bd9163..b51e008705 100644
--- a/lib/internal/wrap_js_stream.js
+++ b/lib/internal/wrap_js_stream.js
@@ -3,7 +3,6 @@
const assert = require('assert');
const util = require('util');
const { Socket } = require('net');
-const { internalBinding } = require('internal/bootstrap/loaders');
const { JSStream } = internalBinding('js_stream');
const uv = internalBinding('uv');
const debug = util.debuglog('stream_wrap');
diff --git a/lib/net.js b/lib/net.js
index fdf7e8a1d0..8fdd7bd86a 100644
--- a/lib/net.js
+++ b/lib/net.js
@@ -34,7 +34,6 @@ const {
makeSyncWrite
} = require('internal/net');
const assert = require('assert');
-const { internalBinding } = require('internal/bootstrap/loaders');
const {
UV_EADDRINUSE,
UV_EINVAL
diff --git a/lib/os.js b/lib/os.js
index 9a05201ea4..86a24b7c62 100644
--- a/lib/os.js
+++ b/lib/os.js
@@ -21,7 +21,6 @@
'use strict';
-const { internalBinding } = require('internal/bootstrap/loaders');
const { pushValToArrayMax, safeGetenv } = internalBinding('util');
const constants = process.binding('constants').os;
const { deprecate } = require('internal/util');
diff --git a/lib/perf_hooks.js b/lib/perf_hooks.js
index 37ede26aa7..1086c4b519 100644
--- a/lib/perf_hooks.js
+++ b/lib/perf_hooks.js
@@ -1,6 +1,5 @@
'use strict';
-const { internalBinding } = require('internal/bootstrap/loaders');
const {
PerformanceEntry,
mark: _mark,
diff --git a/lib/repl.js b/lib/repl.js
index a9bb9d6ab8..831d1519f5 100644
--- a/lib/repl.js
+++ b/lib/repl.js
@@ -53,7 +53,6 @@ const {
} = require('internal/deps/acorn/dist/acorn');
const internalUtil = require('internal/util');
const util = require('util');
-const { internalBinding } = require('internal/bootstrap/loaders');
const { inherits } = util;
const Stream = require('stream');
const vm = require('vm');
diff --git a/lib/stream.js b/lib/stream.js
index 860c875bec..52c0e50582 100644
--- a/lib/stream.js
+++ b/lib/stream.js
@@ -49,7 +49,6 @@ try {
} else {
// This throws for Node < 4.2.0 because there's no util binding and
// returns undefined for Node < 7.4.0.
- const { internalBinding } = require('internal/bootstrap/loaders');
Stream._isUint8Array = internalBinding('util').isUint8Array;
}
} catch (e) {
diff --git a/lib/string_decoder.js b/lib/string_decoder.js
index e5f396cab3..b460da1984 100644
--- a/lib/string_decoder.js
+++ b/lib/string_decoder.js
@@ -22,7 +22,6 @@
'use strict';
const { Buffer } = require('buffer');
-const { internalBinding } = require('internal/bootstrap/loaders');
const {
kIncompleteCharactersStart,
kIncompleteCharactersEnd,
diff --git a/lib/timers.js b/lib/timers.js
index 0c5d7b07b2..9070ade70e 100644
--- a/lib/timers.js
+++ b/lib/timers.js
@@ -21,7 +21,6 @@
'use strict';
-const { internalBinding } = require('internal/bootstrap/loaders');
const {
getLibuvNow,
setupTimers,
diff --git a/lib/tls.js b/lib/tls.js
index 9da17411db..898e602807 100644
--- a/lib/tls.js
+++ b/lib/tls.js
@@ -29,7 +29,6 @@ const { isUint8Array } = require('internal/util/types');
const net = require('net');
const url = require('url');
-const { internalBinding } = require('internal/bootstrap/loaders');
const binding = internalBinding('crypto');
const { Buffer } = require('buffer');
const EventEmitter = require('events');
diff --git a/lib/trace_events.js b/lib/trace_events.js
index 79347b370e..bf303c28b7 100644
--- a/lib/trace_events.js
+++ b/lib/trace_events.js
@@ -16,7 +16,6 @@ const {
if (!hasTracing)
throw new ERR_TRACE_EVENTS_UNAVAILABLE();
-const { internalBinding } = require('internal/bootstrap/loaders');
const { CategorySet, getEnabledCategories } = internalBinding('trace_events');
const { customInspectSymbol } = require('internal/util');
const { format } = require('util');
diff --git a/lib/tty.js b/lib/tty.js
index 3cc2320e96..83e00df110 100644
--- a/lib/tty.js
+++ b/lib/tty.js
@@ -23,7 +23,6 @@
const { inherits, _extend } = require('util');
const net = require('net');
-const { internalBinding } = require('internal/bootstrap/loaders');
const { TTY, isTTY } = internalBinding('tty_wrap');
const errors = require('internal/errors');
const {
diff --git a/lib/util.js b/lib/util.js
index f2eeefde25..27affda109 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -32,8 +32,6 @@ const { validateNumber } = require('internal/validators');
const { TextDecoder, TextEncoder } = require('internal/encoding');
const { isBuffer } = require('buffer').Buffer;
-const { internalBinding } = require('internal/bootstrap/loaders');
-
const types = internalBinding('types');
Object.assign(types, require('internal/util/types'));
const {
diff --git a/lib/v8.js b/lib/v8.js
index c6ac8b362f..1cba0464b1 100644
--- a/lib/v8.js
+++ b/lib/v8.js
@@ -16,7 +16,6 @@
const { Buffer } = require('buffer');
const { ERR_INVALID_ARG_TYPE } = require('internal/errors').codes;
-const { internalBinding } = require('internal/bootstrap/loaders');
const {
Serializer: _Serializer,
Deserializer: _Deserializer
diff --git a/lib/vm.js b/lib/vm.js
index 6ec40f9bca..373fb4029d 100644
--- a/lib/vm.js
+++ b/lib/vm.js
@@ -21,7 +21,6 @@
'use strict';
-const { internalBinding } = require('internal/bootstrap/loaders');
const {
ContextifyScript,
makeContext,