Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

deps: upgrade to npm 2.14.12 #4033

Closed
wants to merge 1 commit into from
Closed

deps: upgrade to npm 2.14.12 #4033

wants to merge 1 commit into from

Conversation

zkat
Copy link
Contributor

@zkat zkat commented Nov 26, 2015

Hiii!

This PR includes two releases:

The main thing to note is a hopefully welcome update to our licensing to clarify scope of both the open source side and the registry TOS. There's a further clarification coming later this week, so we're not done with that bit yet -- so keep an eye out for v2.14.13.

This PR supersedes #4003, but have a look-see over there for some discussion. That PR should be closeable, though.

r: @jasnell
r: @Fishrock123
r: @chrisdickinson

@Fishrock123 Fishrock123 added the npm Issues and PRs related to the npm client dependency or the npm registry. label Nov 26, 2015
@Fishrock123
Copy link
Contributor

Should this be rolled into #4003?

@zkat
Copy link
Contributor Author

zkat commented Nov 26, 2015

This one can actually supersede #4003, except without all the discussion. Want me to copy the description snippets related to 2.14.11 into the description for this one?

@Fishrock123
Copy link
Contributor

@zkat sure, when you get time.

@zkat
Copy link
Contributor Author

zkat commented Dec 1, 2015

@Fishrock123 oh right, you don't get notified for edits... this PR's description has been updated. :)

@Fishrock123
Copy link
Contributor

@zkat I probably won't merge this until I figure out the potential legal stuff that has been brought up because I really don't understand what is all up. :(

@Fishrock123
Copy link
Contributor

Ok, the license here looks better... I think? Maybe this wasn't subject of the concerns in #3959 because it isn't npm 3. Running the tests again now.

@Fishrock123
Copy link
Contributor

@zkat I can't seem to apply this onto v4.x-staging.. @thealphanerd any idea why?

@MylesBorins
Copy link
Contributor

appears to be conflicts in a bunch of files... biggest offender appears to be

  • deps/npm/html/doc//

but here is a complete list of all the bits that are in conflict

@MylesBorins
Copy link
Contributor

fwiw

git cherry-pick --strategy=recursive -X theirs beab1d7

seems to have kinda worked, I did have to manually add some deleted files at the end

I'm currently running make test-npm and will edit this comment with the results.

@zkat is this commit made by just replacing the folder on 4.x and committing it?

@MylesBorins
Copy link
Contributor

seeing two failures in the test suite

test/tap/circular-dep.js .............................. 8/9
  installing a package that depends on the current package
  not ok no error output
    at:
      file: test/tap/circular-dep.js
      line: 48
      column: 9
    stack: |
      test/tap/circular-dep.js:48:9
      f (node_modules/once/once.js:17:25)
      ChildProcess.<anonymous> (test/common-tap.js:56:5)
      maybeClose (internal/child_process.js:818:16)
      Socket.<anonymous> (internal/child_process.js:319:11)
      Pipe._onclose (net.js:469:12)
test/tap/prune.js ................................... 16/17
  npm install
  not ok Should not get data on stderr: WARN engine underscore@1.3.1: wanted: {"node":"*"} (current: {"node":"4.2.3-pre","npm":"2.14.12"})
    at:
      file: test/tap/prune.js
      line: 57
      column: 7
    stack: |
      test/tap/prune.js:57:7
      f (node_modules/once/once.js:17:25)
      ChildProcess.<anonymous> (test/common-tap.js:56:5)
      maybeClose (internal/child_process.js:818:16)
      Socket.<anonymous> (internal/child_process.js:319:11)
      Pipe._onclose (net.js:469:12)

@MylesBorins
Copy link
Contributor

Hey @zkat as per the discussion on IRC would you be able to reopen this against v4.x-staging as opposed to v4.x

Sorry for the confusion

This was referenced Mar 22, 2022
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
npm Issues and PRs related to the npm client dependency or the npm registry.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants