From 54ec24d7f6b9c5498e289e2930162d38d8b8ca6f Mon Sep 17 00:00:00 2001 From: d1g1t4ld1n4 Date: Sun, 17 Mar 2019 09:30:30 -0400 Subject: [PATCH 01/16] lib: remove require('util') from lib/zlib.js --- lib/zlib.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/zlib.js b/lib/zlib.js index ec08db9f7c56b0..b7bb7d9d50f0b9 100644 --- a/lib/zlib.js +++ b/lib/zlib.js @@ -35,7 +35,7 @@ const { isAnyArrayBuffer, isArrayBufferView } -} = require('util'); +} = require('internals/util'); const binding = internalBinding('zlib'); const assert = require('internal/assert'); const { From d45b855e372585573515a853c2aec078aec184d6 Mon Sep 17 00:00:00 2001 From: d1g1t4ld1n4 Date: Sun, 17 Mar 2019 09:33:50 -0400 Subject: [PATCH 02/16] lib: remove require('util') from lib/vm.js --- lib/vm.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/vm.js b/lib/vm.js index b2875d1e1134d8..ffe35f643fa379 100644 --- a/lib/vm.js +++ b/lib/vm.js @@ -32,7 +32,7 @@ const { ERR_INVALID_ARG_TYPE, ERR_VM_MODULE_NOT_MODULE, } = require('internal/errors').codes; -const { isModuleNamespaceObject, isArrayBufferView } = require('util').types; +const { isModuleNamespaceObject, isArrayBufferView } = require('internal/util/types'); const { validateInt32, validateUint32, From f423c0f8d861c28adf87e5417ed1fb220dd617c5 Mon Sep 17 00:00:00 2001 From: d1g1t4ld1n4 Date: Sun, 17 Mar 2019 19:52:59 -0400 Subject: [PATCH 03/16] Update vm.js --- lib/vm.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/vm.js b/lib/vm.js index ffe35f643fa379..8d2015d4b61ecf 100644 --- a/lib/vm.js +++ b/lib/vm.js @@ -32,7 +32,10 @@ const { ERR_INVALID_ARG_TYPE, ERR_VM_MODULE_NOT_MODULE, } = require('internal/errors').codes; -const { isModuleNamespaceObject, isArrayBufferView } = require('internal/util/types'); +const { + isModuleNamespaceObject, + isArrayBufferView +} = require('internal/util/types'); const { validateInt32, validateUint32, From 3d93e809648a42704b0dfc8bbc9b0396923d4f5a Mon Sep 17 00:00:00 2001 From: d1g1t4ld1n4 Date: Sun, 17 Mar 2019 19:53:10 -0400 Subject: [PATCH 04/16] Update zlib.js --- lib/zlib.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/zlib.js b/lib/zlib.js index b7bb7d9d50f0b9..c7401902f97242 100644 --- a/lib/zlib.js +++ b/lib/zlib.js @@ -35,7 +35,7 @@ const { isAnyArrayBuffer, isArrayBufferView } -} = require('internals/util'); +} = require('internal/util'); const binding = internalBinding('zlib'); const assert = require('internal/assert'); const { From a9f2237da35a8a4fa81a5f82f5ea2406374e402c Mon Sep 17 00:00:00 2001 From: d1g1t4ld1n4 Date: Mon, 18 Mar 2019 12:00:23 -0400 Subject: [PATCH 05/16] Update zlib.js --- lib/zlib.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/zlib.js b/lib/zlib.js index c7401902f97242..db6faca41741d5 100644 --- a/lib/zlib.js +++ b/lib/zlib.js @@ -35,7 +35,8 @@ const { isAnyArrayBuffer, isArrayBufferView } -} = require('internal/util'); +} += require('internal/util'); const binding = internalBinding('zlib'); const assert = require('internal/assert'); const { From 9272f749c339bed13d6b3122e86e2e33234485f8 Mon Sep 17 00:00:00 2001 From: d1g1t4ld1n4 Date: Wed, 20 Mar 2019 13:05:59 -0400 Subject: [PATCH 06/16] Update vm.js --- lib/vm.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/vm.js b/lib/vm.js index 8d2015d4b61ecf..49be6cf3f5e10d 100644 --- a/lib/vm.js +++ b/lib/vm.js @@ -32,9 +32,9 @@ const { ERR_INVALID_ARG_TYPE, ERR_VM_MODULE_NOT_MODULE, } = require('internal/errors').codes; -const { - isModuleNamespaceObject, - isArrayBufferView +const { + isModuleNamespaceObject, + isArrayBufferView } = require('internal/util/types'); const { validateInt32, From 137008c0f6d16668a914a08df1af42195f78ad32 Mon Sep 17 00:00:00 2001 From: d1g1t4ld1n4 Date: Wed, 20 Mar 2019 13:08:49 -0400 Subject: [PATCH 07/16] Update zlib.js --- lib/zlib.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/zlib.js b/lib/zlib.js index db6faca41741d5..a8ee58b642dcad 100644 --- a/lib/zlib.js +++ b/lib/zlib.js @@ -30,13 +30,14 @@ const { } = require('internal/errors').codes; const Transform = require('_stream_transform'); const { - deprecate, types: { isAnyArrayBuffer, isArrayBufferView } -} -= require('internal/util'); +}= require('internal/util/types'); +const { + deprecate, +}= require('internal/util').deprecate; const binding = internalBinding('zlib'); const assert = require('internal/assert'); const { From e3fe24afa4940df42d8b188de0bb1d55950a21ef Mon Sep 17 00:00:00 2001 From: d1g1t4ld1n4 Date: Wed, 20 Mar 2019 13:31:29 -0400 Subject: [PATCH 08/16] Update zlib.js --- lib/zlib.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/zlib.js b/lib/zlib.js index a8ee58b642dcad..450d3e979ff99a 100644 --- a/lib/zlib.js +++ b/lib/zlib.js @@ -36,7 +36,7 @@ const { } }= require('internal/util/types'); const { - deprecate, + deprecate }= require('internal/util').deprecate; const binding = internalBinding('zlib'); const assert = require('internal/assert'); From f9bb062252c09e368cb0dbe1e8e711399fd30aec Mon Sep 17 00:00:00 2001 From: d1g1t4ld1n4 Date: Wed, 20 Mar 2019 13:55:57 -0400 Subject: [PATCH 09/16] Update zlib.js --- lib/zlib.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/zlib.js b/lib/zlib.js index 450d3e979ff99a..5360406d9b36f4 100644 --- a/lib/zlib.js +++ b/lib/zlib.js @@ -34,10 +34,10 @@ const { isAnyArrayBuffer, isArrayBufferView } -}= require('internal/util/types'); +} = require('internal/util/types'); const { deprecate -}= require('internal/util').deprecate; +} = require('internal/util').deprecate; const binding = internalBinding('zlib'); const assert = require('internal/assert'); const { From 923ae7628099d590a152db0c2468eae099fb9417 Mon Sep 17 00:00:00 2001 From: d1g1t4ld1n4 Date: Fri, 22 Mar 2019 19:31:02 -0400 Subject: [PATCH 10/16] Update zlib.js --- lib/zlib.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/zlib.js b/lib/zlib.js index 5360406d9b36f4..48d2f8fcabd3ff 100644 --- a/lib/zlib.js +++ b/lib/zlib.js @@ -29,15 +29,15 @@ const { ERR_ZLIB_INITIALIZATION_FAILED, } = require('internal/errors').codes; const Transform = require('_stream_transform'); +const { + deprecate +} = require('internal/util').deprecate; const { types: { isAnyArrayBuffer, isArrayBufferView } } = require('internal/util/types'); -const { - deprecate -} = require('internal/util').deprecate; const binding = internalBinding('zlib'); const assert = require('internal/assert'); const { From 49eae244a0da2df029f7ce5c8b1c5d7580f4ce13 Mon Sep 17 00:00:00 2001 From: James M Snell Date: Tue, 26 Mar 2019 17:54:50 -0400 Subject: [PATCH 11/16] Update lib/zlib.js Co-Authored-By: dinaelhanan --- lib/zlib.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/zlib.js b/lib/zlib.js index 48d2f8fcabd3ff..967f2cc45f90cb 100644 --- a/lib/zlib.js +++ b/lib/zlib.js @@ -31,7 +31,7 @@ const { const Transform = require('_stream_transform'); const { deprecate -} = require('internal/util').deprecate; +} = require('internal/util'); const { types: { isAnyArrayBuffer, From 01fffc919ce6833c28d85dd3136e2dd31a4d61a4 Mon Sep 17 00:00:00 2001 From: d1g1t4ld1n4 Date: Wed, 27 Mar 2019 18:31:46 -0400 Subject: [PATCH 12/16] Update zlib.js --- lib/zlib.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/zlib.js b/lib/zlib.js index 967f2cc45f90cb..c1a3617fc6cbbd 100644 --- a/lib/zlib.js +++ b/lib/zlib.js @@ -37,7 +37,7 @@ const { isAnyArrayBuffer, isArrayBufferView } -} = require('internal/util/types'); +} = require('internal/util'); const binding = internalBinding('zlib'); const assert = require('internal/assert'); const { From 2afd10974774549f5f932a435a6d119d3d709216 Mon Sep 17 00:00:00 2001 From: d1g1t4ld1n4 Date: Sun, 31 Mar 2019 16:11:52 -0400 Subject: [PATCH 13/16] Update zlib.js --- lib/zlib.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/zlib.js b/lib/zlib.js index c1a3617fc6cbbd..967f2cc45f90cb 100644 --- a/lib/zlib.js +++ b/lib/zlib.js @@ -37,7 +37,7 @@ const { isAnyArrayBuffer, isArrayBufferView } -} = require('internal/util'); +} = require('internal/util/types'); const binding = internalBinding('zlib'); const assert = require('internal/assert'); const { From f26f092d4438bd49bf596754836a6df5bd01e60f Mon Sep 17 00:00:00 2001 From: d1g1t4ld1n4 Date: Mon, 1 Apr 2019 11:01:16 -0400 Subject: [PATCH 14/16] Update zlib.js --- lib/zlib.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/zlib.js b/lib/zlib.js index 967f2cc45f90cb..0ee719d706db5a 100644 --- a/lib/zlib.js +++ b/lib/zlib.js @@ -33,10 +33,8 @@ const { deprecate } = require('internal/util'); const { - types: { isAnyArrayBuffer, isArrayBufferView - } } = require('internal/util/types'); const binding = internalBinding('zlib'); const assert = require('internal/assert'); From 65ca6a39571a4fc5909851127d84eb9c7d8ef704 Mon Sep 17 00:00:00 2001 From: d1g1t4ld1n4 Date: Mon, 1 Apr 2019 12:51:44 -0400 Subject: [PATCH 15/16] Update zlib.js --- lib/zlib.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/zlib.js b/lib/zlib.js index 0ee719d706db5a..5ca6f59717ee6e 100644 --- a/lib/zlib.js +++ b/lib/zlib.js @@ -33,8 +33,8 @@ const { deprecate } = require('internal/util'); const { - isAnyArrayBuffer, - isArrayBufferView + isAnyArrayBuffer, + isArrayBufferView } = require('internal/util/types'); const binding = internalBinding('zlib'); const assert = require('internal/assert'); From 535b087c7395c20cc6e604cca66568632b3b247b Mon Sep 17 00:00:00 2001 From: d1g1t4ld1n4 Date: Fri, 5 Apr 2019 12:56:06 -0400 Subject: [PATCH 16/16] Update test-bootstrap-modules.js --- test/parallel/test-bootstrap-modules.js | 1 - 1 file changed, 1 deletion(-) diff --git a/test/parallel/test-bootstrap-modules.js b/test/parallel/test-bootstrap-modules.js index e65098b92295bc..d00cf4a3513906 100644 --- a/test/parallel/test-bootstrap-modules.js +++ b/test/parallel/test-bootstrap-modules.js @@ -26,7 +26,6 @@ const expectedModules = new Set([ 'Internal Binding trace_events', 'Internal Binding types', 'Internal Binding url', - 'Internal Binding util', 'NativeModule buffer', 'NativeModule events', 'NativeModule fs',