[v8.x] deps: re land npm 5.6.0

[MylesBorins]

When the original backport was landed there were some missing commits
on v8.x. This commit completely re lands npm 5.6.0 to make sure the
version on 8.x has the correct file tree

Refs: #16509 (comment)

Alternative to #18616

[MylesBorins]

There is a quite a bit of churn in here due to whitespace that was not included in the original backport. I think we should simply land this, as it is the exact version of npm that will be installed via npm itself

[targos]

Diff without whitespace: https://github.com/nodejs/node/pull/18625/files?w=1

[targos]

LGTM. This includes the changes to minizlib and unsupported.js

[MylesBorins]

CI: https://ci.nodejs.org/job/node-test-pull-request/13019/

[gibfahn]

Landed without squashing whitespace in 96f85e4

Failures (on my machine):

Subset of failures:

notok9-configproperitieslist: projectData: # ofelements---found: 2
wanted: 1compare: ===at:
line: 67
column: 5
file: test/tap/config-basic.js
type: globalfunction: isDeeplyDetailsstack: |isDeeplyDetails(test/tap/config-basic.js:67:5)test/tap/config-basic.js:78:7Array.forEach(<anonymous>)
test/tap/config-basic.js:77:17
lib/config/core.js:81:7
Array.forEach (<anonymous>)
lib/config/core.js:80:13
f (node_modules/once/once.js:25:25)
finalize (lib/config/core.js:198:5)
afterExtras (lib/config/core.js:189:5)
node_modules/mkdirp/index.js:48:26
source: |
t.is(Object.keys(aa).length, Object.keys(bb).length, msg + ': # of elements')
...
not ok 52 - config by source ->project->data: # ofelements---found: 2wanted: 1compare: ===at:
line: 67column: 5file: test/tap/config-basic.jstype: globalfunction: isDeeplyDetailsstack: |isDeeplyDetails(test/tap/config-basic.js:67:5)test/tap/config-basic.js:69:5Array.forEach(<anonymous>)
isDeeplyDetails (test/tap/config-basic.js:68:19)
test/tap/config-basic.js:69:5
Array.forEach (<anonymous>)
isDeeplyDetails (test/tap/config-basic.js:68:19)
test/tap/config-basic.js:80:5
lib/config/core.js:81:7
Array.forEach (<anonymous>)
lib/config/core.js:80:13
f (node_modules/once/once.js:25:25)
finalize (lib/config/core.js:198:5)
afterExtras (lib/config/core.js:189:5)
node_modules/mkdirp/index.js:48:26
source: |
t.is(Object.keys(aa).length, Object.keys(bb).length, msg + ': # of elements')
...
# Subtest: test/tap/config-builtin.js
# Subtest: with builtin
not ok 1 - should be equivalent
---
found:
- foo: bar
heading: foo
git-tag-version: false
- userconfig: >-/Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/pkg/test/fixtures/config/userconfig-with-gcother-env-thing: '1000'
_underbar-env-thing: underfuluppercase-env-thing: '42'
-save-prefix: '~'
legacy-bundling: true-globalconfig: >-/Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/pkg/test/fixtures/config/globalconfigemail: i@izs.meenv-thing: asdfinit.author.name: IsaacZ.Schlueterinit.author.email: i@izs.meinit.author.url: 'http://blog.izs.me/'
init.version: 1.2.3
'npm:publishtest': true
'_npmjs.org:couch': 'https://admin:password@localhost:5984/registry'
'npm-www:nocache': '1'
nodedir: /Users/isaacs/dev/js/node-v0.8sign-git-tag: truemessage: v%sstrict-ssl: falsetmp: >-/Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/.tmp_auth: dXNlcm5hbWU6cGFzc3dvcmQ=_token:
AuthSession: yabba-dabba-doodleversion: '1'
expires: '1345001053415'
path: /httponly: true- 'package-config:foo': boo-builtin-config: truewanted:
-foo: barheading: foogit-tag-version: false-userconfig: >-/Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/pkg/test/fixtures/config/userconfig-with-gc_underbar-env-thing: underfuluppercase-env-thing: 42other-env-thing: 1000-legacy-bundling: true-globalconfig: >-/Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/pkg/test/fixtures/config/globalconfigemail: i@izs.meenv-thing: asdfinit.author.name: IsaacZ.Schlueterinit.author.email: i@izs.meinit.author.url: 'http://blog.izs.me/'
init.version: 1.2.3
'npm:publishtest': true
'_npmjs.org:couch': 'https://admin:password@localhost:5984/registry'
'npm-www:nocache': '1'
nodedir: /Users/isaacs/dev/js/node-v0.8sign-git-tag: truemessage: v%sstrict-ssl: falsetmp: >-/Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/.tmp_auth: dXNlcm5hbWU6cGFzc3dvcmQ=_token:
AuthSession: yabba-dabba-doodleversion: '1'
expires: '1345001053415'
path: /httponly: true- 'package-config:foo': boo-builtin-config: trueat:
line: 58column: 7file: test/tap/config-builtin.jstype: globalstack: |test/tap/config-builtin.js:58:7lib/config/core.js:81:7Array.forEach(<anonymous>)
lib/config/core.js:80:13
f (node_modules/once/once.js:25:25)
finalize (lib/config/core.js:198:5)
afterExtras (lib/config/core.js:189:5)
node_modules/mkdirp/index.js:48:26
source: |
t.same(conf.list, expectList)
...
not ok 2 - should be equivalent
---
found:
cli:
data:
foo: bar
heading: foo
git-tag-version: false
env:
data:
userconfig: >-/Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/pkg/test/fixtures/config/userconfig-with-gcother-env-thing: '1000'
_underbar-env-thing: underfuluppercase-env-thing: '42'
source:
userconfig: >-/Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/pkg/test/fixtures/config/userconfig-with-gcother-env-thing: '1000'
_underbar-env-thing: underfuluppercase-env-thing: '42'
prefix: ''
project:
path: >-/Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/pkg/.npmrctype: inidata:
save-prefix: '~'
legacy-bundling: trueuser:
path: >-/Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/pkg/test/fixtures/config/userconfig-with-gctype: inidata:
globalconfig: >-/Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/pkg/test/fixtures/config/globalconfigemail: i@izs.meenv-thing: asdfinit.author.name: IsaacZ.Schlueterinit.author.email: i@izs.meinit.author.url: 'http://blog.izs.me/'
init.version: 1.2.3
'npm:publishtest': true
'_npmjs.org:couch': 'https://admin:password@localhost:5984/registry'
'npm-www:nocache': '1'nodedir: /Users/isaacs/dev/js/node-v0.8sign-git-tag: truemessage: v%sstrict-ssl: falsetmp: >-/Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/.tmp_auth: dXNlcm5hbWU6cGFzc3dvcmQ=_token:
AuthSession: yabba-dabba-doodleversion: '1'expires: '1345001053415'path: /httponly: trueglobal:
path: >-/Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/pkg/test/fixtures/config/globalconfigtype: inidata:
'package-config:foo': boobuiltin:
data:
builtin-config: truewanted:
cli:
data:
foo: barheading: foogit-tag-version: falseenv:
data:
userconfig: >-/Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/pkg/test/fixtures/config/userconfig-with-gc_underbar-env-thing: underfuluppercase-env-thing: 42other-env-thing: 1000source:
userconfig: >-/Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/pkg/test/fixtures/config/userconfig-with-gc_underbar-env-thing: underfuluppercase-env-thing: '42'other-env-thing: '1000'prefix: ''project:
path: >-/Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/pkg/.npmrctype: inidata:
legacy-bundling: trueuser:
path: >-/Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/pkg/test/fixtures/config/userconfig-with-gctype: inidata:
globalconfig: >-/Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/pkg/test/fixtures/config/globalconfigemail: i@izs.meenv-thing: asdfinit.author.name: IsaacZ.Schlueterinit.author.email: i@izs.meinit.author.url: 'http://blog.izs.me/'init.version: 1.2.3'npm:publishtest': true'_npmjs.org:couch': 'https://admin:password@localhost:5984/registry''npm-www:nocache': '1'nodedir: /Users/isaacs/dev/js/node-v0.8sign-git-tag: truemessage: v%sstrict-ssl: falsetmp: >-/Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/.tmp_auth: dXNlcm5hbWU6cGFzc3dvcmQ=_token:
AuthSession: yabba-dabba-doodleversion: '1'expires: '1345001053415'path: /httponly: trueglobal:
path: >-/Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/pkg/test/fixtures/config/globalconfigtype: inidata:
'package-config:foo': boobuiltin:
data:
builtin-config: trueat:
line: 59column: 7file: test/tap/config-builtin.jstype: globalstack: |test/tap/config-builtin.js:59:7lib/config/core.js:81:7Array.forEach(<anonymous>)
lib/config/core.js:80:13
f (node_modules/once/once.js:25:25)
finalize (lib/config/core.js:198:5)
afterExtras (lib/config/core.js:189:5)
node_modules/mkdirp/index.js:48:26
source: |
t.same(conf.sources, expectSources)
...
# Subtest: test/broken-under-nyc-and-travis/lifecycle-path.js
# Subtest: make sure the path is correct, without directory of current node
not ok 2 - should be equivalent
---
found:
- '{{ROOT}}/node_modules/npm-lifecycle/node-gyp-bin'
- '{{PKG}}/node_modules/.bin'
- /Users/gib/wrk/com/DANGER/node/out/Release
- /bin
- /usr/bin
wanted:
- '{{ROOT}}/bin/node-gyp-bin'
- '{{PKG}}/node_modules/.bin'
- /Users/gib/wrk/com/DANGER/node/out/Release
- /bin
- /usr/bin
at:
line: 200
column: 7
file: test/broken-under-nyc-and-travis/lifecycle-path.js
type: global
stack: |
test/broken-under-nyc-and-travis/lifecycle-path.js:200:7
f (node_modules/once/once.js:25:25)
ChildProcess.<anonymous> (test/common-tap.js:87:5)
...
1..2
# failed 1 of 2 tests
not ok 2 - make sure the path is correct, without directory of current node # time=317.03ms
not ok 3 - should be equivalent
---
found:
- '{{ROOT}}/node_modules/npm-lifecycle/node-gyp-bin'
- '{{PKG}}/node_modules/.bin'
- /Users/gib/wrk/com/DANGER/node/out/Release
- /bin
- /usr/bin
wanted:
- '{{ROOT}}/bin/node-gyp-bin'
- '{{PKG}}/node_modules/.bin'
- /Users/gib/wrk/com/DANGER/node/out/Release
- /bin
- /usr/bin

test-npm.tap.txt

Confirmed that cherry-picking 9f33a24 and b8888f5 resulted in no changes, and that npm ls -g works.