iframe-proxy

MylesBorins · 2018-02-07T17:24:40Z

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

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: nodejs#16509 (comment)

MylesBorins · 2018-02-07T17:26:29Z

targos · 2018-02-07T19:05:37Z

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 · 2018-02-07T19:16:25Z

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

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) PR-URL: #18625 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>

gibfahn · 2018-02-08T09:09:29Z

Landed without squashing whitespace in 96f85e4

Failures (on my machine):

Subset of failures:

        not ok 9 - config properities list: projectData: # of elements
          ---
          found: 2
          wanted: 1
          compare: ===
          at:
            line: 67
            column: 5
            file: test/tap/config-basic.js
            type: global
            function: isDeeplyDetails
          stack: |
            isDeeplyDetails (test/tap/config-basic.js:67:5)
            test/tap/config-basic.js:78:7
            Array.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: # of elements
          ---
          found: 2
          wanted: 1
          compare: ===
          at:
            line: 67
            column: 5
            file: test/tap/config-basic.js
            type: global
            function: isDeeplyDetails
          stack: |
            isDeeplyDetails (test/tap/config-basic.js:67:5)
            test/tap/config-basic.js:69:5
            Array.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-gc
              other-env-thing: '1000'
              _underbar-env-thing: underful
              uppercase-env-thing: '42'
            - save-prefix: '~'
              legacy-bundling: true
            - globalconfig: >-
                /Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/pkg/test/fixtures/config/globalconfig
              email: i@izs.me
              env-thing: asdf
              init.author.name: Isaac Z. Schlueter
              init.author.email: i@izs.me
              init.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.8
              sign-git-tag: true
              message: v%s
              strict-ssl: false
              tmp: >-
                /Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/.tmp
              _auth: dXNlcm5hbWU6cGFzc3dvcmQ=
              _token:
                AuthSession: yabba-dabba-doodle
                version: '1'
                expires: '1345001053415'
                path: /
                httponly: true
            - 'package-config:foo': boo
            - builtin-config: true
          wanted:
            - 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-gc
              _underbar-env-thing: underful
              uppercase-env-thing: 42
              other-env-thing: 1000
            - legacy-bundling: true
            - globalconfig: >-
                /Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/pkg/test/fixtures/config/globalconfig
              email: i@izs.me
              env-thing: asdf
              init.author.name: Isaac Z. Schlueter
              init.author.email: i@izs.me
              init.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.8
              sign-git-tag: true
              message: v%s
              strict-ssl: false
              tmp: >-
                /Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/.tmp
              _auth: dXNlcm5hbWU6cGFzc3dvcmQ=
              _token:
                AuthSession: yabba-dabba-doodle
                version: '1'
                expires: '1345001053415'
                path: /
                httponly: true
            - 'package-config:foo': boo
            - builtin-config: true
          at:
            line: 58
            column: 7
            file: test/tap/config-builtin.js
            type: global
          stack: |
            test/tap/config-builtin.js:58:7
            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.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-gc
                other-env-thing: '1000'
                _underbar-env-thing: underful
                uppercase-env-thing: '42'
              source:
                userconfig: >-
                  /Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/pkg/test/fixtures/config/userconfig-with-gc
                other-env-thing: '1000'
                _underbar-env-thing: underful
                uppercase-env-thing: '42'
              prefix: ''
            project:
              path: >-
                /Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/pkg/.npmrc
              type: ini
              data:
                save-prefix: '~'
                legacy-bundling: true
            user:
              path: >-
                /Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/pkg/test/fixtures/config/userconfig-with-gc
              type: ini
              data:
                globalconfig: >-
                  /Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/pkg/test/fixtures/config/globalconfig
                email: i@izs.me
                env-thing: asdf
                init.author.name: Isaac Z. Schlueter
                init.author.email: i@izs.me
                init.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.8
                sign-git-tag: true
                message: v%s
                strict-ssl: false
                tmp: >-
                  /Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/.tmp
                _auth: dXNlcm5hbWU6cGFzc3dvcmQ=
                _token:
                  AuthSession: yabba-dabba-doodle
                  version: '1'
                  expires: '1345001053415'
                  path: /
                  httponly: true
            global:
              path: >-
                /Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/pkg/test/fixtures/config/globalconfig
              type: ini
              data:
                'package-config:foo': boo
            builtin:
              data:
                builtin-config: true
          wanted:
            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-gc
                _underbar-env-thing: underful
                uppercase-env-thing: 42
                other-env-thing: 1000
              source:
                userconfig: >-
                  /Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/pkg/test/fixtures/config/userconfig-with-gc
                _underbar-env-thing: underful
                uppercase-env-thing: '42'
                other-env-thing: '1000'
              prefix: ''
            project:
              path: >-
                /Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/pkg/.npmrc
              type: ini
              data:
                legacy-bundling: true
            user:
              path: >-
                /Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/pkg/test/fixtures/config/userconfig-with-gc
              type: ini
              data:
                globalconfig: >-
                  /Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/pkg/test/fixtures/config/globalconfig
                email: i@izs.me
                env-thing: asdf
                init.author.name: Isaac Z. Schlueter
                init.author.email: i@izs.me
                init.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.8
                sign-git-tag: true
                message: v%s
                strict-ssl: false
                tmp: >-
                  /Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/.tmp
                _auth: dXNlcm5hbWU6cGFzc3dvcmQ=
                _token:
                  AuthSession: yabba-dabba-doodle
                  version: '1'
                  expires: '1345001053415'
                  path: /
                  httponly: true
            global:
              path: >-
                /Users/gib/wrk/com/DANGER/node/test/.tmp.npm.90db1054b2631b65addaf2325e8313fd/pkg/test/fixtures/config/globalconfig
              type: ini
              data:
                'package-config:foo': boo
            builtin:
              data:
                builtin-config: true
          at:
            line: 59
            column: 7
            file: test/tap/config-builtin.js
            type: global
          stack: |
            test/tap/config-builtin.js:59:7
            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.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.

Notable changes: * deps: * update V8 to 6.2.414.46 (Michaël Zasso) [#16413](#16413) * revert ABI breaking changes in V8 6.2 (Anna Henningsen) [#16413](#16413) * upgrade libuv to 1.19.1 (cjihrig) [#18260](#18260) * re land npm 5.6.0 (Myles Borins) [#18625](#18625) * ICU 60 bump (Steven R. Loomis) [#16876](#16876) * crypto: * Support both OpenSSL 1.1.0 and 1.0.2 (David Benjamin) [#16130](#16130) * warn on invalid authentication tag length (Tobias Nießen) [#17566](#17566) * async_hooks: * update defaultTriggerAsyncIdScope for perf (Anatoli Papirovski) [#18004](#18004) * use typed array stack as fast path (Anna Henningsen) [#17780](#17780) * use scope for defaultTriggerAsyncId (Andreas Madsen) [#17273](#17273) * separate missing from default context (Andreas Madsen) [#17273](#17273) * rename initTriggerId (Andreas Madsen) [#17273](#17273) * deprecate undocumented API (Andreas Madsen) [#16972](#16972) * add destroy event for gced AsyncResources (Sebastian Mayr) [#16998](#16998) * add trace events to async_hooks (Andreas Madsen) [#15538](#15538) * set HTTPParser trigger to socket (Andreas Madsen) [#18003](#18003) * add provider types for net server (Andreas Madsen) [#17157](#17157) * n-api: * add helper for addons to get the event loop (Anna Henningsen) [#17109](#17109) * cli: * add --stack-trace-limit to NODE_OPTIONS (Anna Henningsen) [#16495](#16495) * console: * add support for console.debug (Benjamin Zaslavsky) [#17033](#17033) * module: * add builtinModules (Jon Moss) [#16386](#16386) * replace default paths in require.resolve() (cjihrig) [#17113](#17113) * src: * add helper for addons to get the event loop (Anna Henningsen) [#17109](#17109) * add process.ppid (cjihrig) [#16839](#16839) * http: * support generic `Duplex` streams (Anna Henningsen) [#16267](#16267) * add rawPacket in err of `clientError` event (XadillaX) [#17672](#17672) * better support for IPv6 addresses (Mattias Holmlund) [#14772](#14772) * net: * remove ADDRCONFIG DNS hint on Windows (Bartosz Sosnowski) [#17662](#17662) * process: * fix reading zero-length env vars on win32 (Anna Henningsen) [#18463](#18463) * tls: * unconsume stream on destroy (Anna Henningsen) [#17478](#17478) * process: * improve unhandled rejection message (Madara Uchiha) [#17158](#17158) * stream: * remove usage of *State.highWaterMark (Calvin Metcalf) [#12860](#12860) * trace_events: * add executionAsyncId to init events (Andreas Madsen) [#17196](#17196) PR-URL: #18336

Notable changes: * deps: * update V8 to 6.2.414.46 (Michaël Zasso) [nodejs#16413](nodejs#16413) * revert ABI breaking changes in V8 6.2 (Anna Henningsen) [nodejs#16413](nodejs#16413) * upgrade libuv to 1.19.1 (cjihrig) [nodejs#18260](nodejs#18260) * re land npm 5.6.0 (Myles Borins) [nodejs#18625](nodejs#18625) * ICU 60 bump (Steven R. Loomis) [nodejs#16876](nodejs#16876) * crypto: * Support both OpenSSL 1.1.0 and 1.0.2 (David Benjamin) [nodejs#16130](nodejs#16130) * warn on invalid authentication tag length (Tobias Nießen) [nodejs#17566](nodejs#17566) * async_hooks: * update defaultTriggerAsyncIdScope for perf (Anatoli Papirovski) [nodejs#18004](nodejs#18004) * use typed array stack as fast path (Anna Henningsen) [nodejs#17780](nodejs#17780) * use scope for defaultTriggerAsyncId (Andreas Madsen) [nodejs#17273](nodejs#17273) * separate missing from default context (Andreas Madsen) [nodejs#17273](nodejs#17273) * rename initTriggerId (Andreas Madsen) [nodejs#17273](nodejs#17273) * deprecate undocumented API (Andreas Madsen) [nodejs#16972](nodejs#16972) * add destroy event for gced AsyncResources (Sebastian Mayr) [nodejs#16998](nodejs#16998) * add trace events to async_hooks (Andreas Madsen) [nodejs#15538](nodejs#15538) * set HTTPParser trigger to socket (Andreas Madsen) [nodejs#18003](nodejs#18003) * add provider types for net server (Andreas Madsen) [nodejs#17157](nodejs#17157) * n-api: * add helper for addons to get the event loop (Anna Henningsen) [nodejs#17109](nodejs#17109) * cli: * add --stack-trace-limit to NODE_OPTIONS (Anna Henningsen) [nodejs#16495](nodejs#16495) * console: * add support for console.debug (Benjamin Zaslavsky) [nodejs#17033](nodejs#17033) * module: * add builtinModules (Jon Moss) [nodejs#16386](nodejs#16386) * replace default paths in require.resolve() (cjihrig) [nodejs#17113](nodejs#17113) * src: * add helper for addons to get the event loop (Anna Henningsen) [nodejs#17109](nodejs#17109) * add process.ppid (cjihrig) [nodejs#16839](nodejs#16839) * http: * support generic `Duplex` streams (Anna Henningsen) [nodejs#16267](nodejs#16267) * add rawPacket in err of `clientError` event (XadillaX) [nodejs#17672](nodejs#17672) * better support for IPv6 addresses (Mattias Holmlund) [nodejs#14772](nodejs#14772) * net: * remove ADDRCONFIG DNS hint on Windows (Bartosz Sosnowski) [nodejs#17662](nodejs#17662) * process: * fix reading zero-length env vars on win32 (Anna Henningsen) [nodejs#18463](nodejs#18463) * tls: * unconsume stream on destroy (Anna Henningsen) [nodejs#17478](nodejs#17478) * process: * improve unhandled rejection message (Madara Uchiha) [nodejs#17158](nodejs#17158) * stream: * remove usage of *State.highWaterMark (Calvin Metcalf) [nodejs#12860](nodejs#12860) * trace_events: * add executionAsyncId to init events (Andreas Madsen) [nodejs#17196](nodejs#17196) PR-URL: nodejs#18336

deps: re land npm 5.6.0

9e81a50

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: nodejs#16509 (comment)

nodejs-github-bot added npm Issues and PRs related to the npm client dependency or the npm registry. v8.x labels Feb 7, 2018

MylesBorins mentioned this pull request Feb 7, 2018

[backport-v8.x] backport npm/npm@4ca6958 #18616

Closed

4 tasks

targos approved these changes Feb 7, 2018

View reviewed changes

addaleax changed the title ~~deps: re land npm 5.6.0~~ [v8.x] deps: re land npm 5.6.0 Feb 8, 2018

gibfahn approved these changes Feb 8, 2018

View reviewed changes

gibfahn self-assigned this Feb 8, 2018

gibfahn closed this Feb 8, 2018

richardlau mentioned this pull request Feb 9, 2018

Delaying v8.x semver-minor release nodejs/Release#308

Closed

Sunbelt Computer Software

PL/B Language Development and Support

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

[v8.x] deps: re land npm 5.6.0#18625

[v8.x] deps: re land npm 5.6.0#18625
MylesBorins wants to merge 1 commit into
nodejs:v8.x-stagingfrom
MylesBorins:npm-5.6.0-redux

MylesBorins commented Feb 7, 2018

Uh oh!

MylesBorins commented Feb 7, 2018

Uh oh!

targos commented Feb 7, 2018

Uh oh!

targos left a comment

Uh oh!

MylesBorins commented Feb 7, 2018

Uh oh!

gibfahn commented Feb 8, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Sunbelt Computer Software

PL/B Language Development and Support

Uh oh!

Uh oh!

Conversation

MylesBorins commented Feb 7, 2018

Uh oh!

MylesBorins commented Feb 7, 2018

Uh oh!

targos commented Feb 7, 2018

Uh oh!

targos left a comment

Choose a reason for hiding this comment

Uh oh!

MylesBorins commented Feb 7, 2018

Uh oh!

gibfahn commented Feb 8, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants