Skip to content

Commit

Permalink
deps: upgrade npm beta to 5.0.0-beta.56
Browse files Browse the repository at this point in the history
PR-URL: #12936
Reviewed-By: Anna Henningsen <anna@addaleax.net>
  • Loading branch information
zkat authored and jasnell committed May 23, 2017
1 parent 719d561 commit 2c520a0
Show file tree
Hide file tree
Showing 1,396 changed files with 73,700 additions and 27,239 deletions.
2 changes: 1 addition & 1 deletion deps/npm/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ cache:
- node_modules/tacks
- node_modules/tap
install:
- "node . prune"
- "node . rebuild --depth=0"
- "node . install --ignore-scripts"
- "node . prune"
- "make -j4 doc"
script:
- "node . run tap -- \"test/tap/*.js\" \"test/broken-under-nyc/*.js\""
5 changes: 5 additions & 0 deletions deps/npm/AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -459,3 +459,8 @@ Evgeny Kulikov <beyondcompute@users.noreply.github.com>
Carol (Nichols || Goulding) <carol.nichols@gmail.com>
Jarid Margolin <jaridmargolin@gmail.com>
David Cook <divergentdave@gmail.com>
Brian Dukes <bdukes@engagesoftware.com>
J F <git@twopointzero.us>
Pavlo Liulia <pavloblack@hotmail.com>
JΓ‘n Dzurek <famousgarkin@outlook.com>
Lucas Theisen <ltheisen@mitre.org>
37 changes: 37 additions & 0 deletions deps/npm/BROKEN.org
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
* Broken test files
* add-remote-git-get-resolved.js (needs porting to pacote)
* bugs.js (I think because opts.fullMetadata)
* builtin-config.js (freezes)
* check-cpu-reqs.js (uhhh? it's not checking?)
* check-engine-reqs.js (same?)
* check-os-reqs.js (same?)
* doctor.js (needs rewrite)
* full-warning-messages.js
* get.js
* git-npmignore.js
* git-races.js
* github-shortcut.js
* ignore-shrinkwrap.js
* install-shrinkwrapped-git.js
* install-with-dev-dep-duplicate.js
* legacy-npm-self-install.js (one check failed)
* ls-depth-cli.js
* outdated-local.js
* outdated-notarget.js
* outdated-private.js
* peer-deps-invalid.js
* peer-deps-toplevel.js
* peer-deps-without-package-json.js
* repo.js
* retry-on-stale-cache.js
* scope-header.js
* shrinkwrap-default-arg-ver.js
* shrinkwrap-local-dependency.js
* shrinkwrap-optional-dependency.js
* shrinkwrap-optional-property.js
* shrinkwrap-prod-dependency.js
* shrinkwrap-shared-dev-dependency.js
* splat-with-only-prerelease-to-latest.js
* url-dependencies.js
* verify-no-lifecycle-on-repo.js
* network/legacy-shrinkwrap.js
74 changes: 74 additions & 0 deletions deps/npm/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,77 @@
## v4.6.1 (2017-04-21)

A little release to tide you over while we hammer out the last bits for npm@5.

### FEATURES

* [`d13c9b2f2`](https://github.com/npm/npm/commit/d13c9b2f24b6380427f359b6e430b149ac8aaa79)
`init-package-json@1.10.0`:
The `name:` prompt is now `package name:` to make this less ambiguous for new users.

The default package name is now a valid package name. For example: If your package directory
has mixed case, the default package name will be all lower case.
* [`f08c66323`](https://github.com/npm/npm/commit/f08c663231099f7036eb82b92770806a3a79cdf1)
[#16213](https://github.com/npm/npm/pull/16213)
Add `--allow-same-version` option to `npm version` so that you can use `npm version` to run
your version lifecycles and tag your git repo without actually changing the version number in
your `package.json`.
([@lucastheisen](https://github.com/lucastheisen))
* [`f5e8becd0`](https://github.com/npm/npm/commit/f5e8becd05e0426379eb0c999abdbc8e87a7f6f2)
Timing has been added throughout the install implementation. You can see it by running
a command with `--loglevel=timing`. You can also run commands with `--timing` which will write
an `npm-debug.log` even on success and add an entry to `_timing.json` in your cache with
the timing information from that run.
([@iarna](https://github.com/iarna))

### BUG FIXES

* [`9c860f2ed`](https://github.com/npm/npm/commit/9c860f2ed3bdea1417ed059b019371cd253db2ad)
[#16021](https://github.com/npm/npm/pull/16021)
Fix a crash in `npm doctor` when used with a registry that does not support
the `ping` API endpoint.
([@watilde](https://github.com/watilde))
* [`65b9943e9`](https://github.com/npm/npm/commit/65b9943e9424c67547b0029f02b0258e35ba7d26)
[#16364](https://github.com/npm/npm/pull/16364)
Shorten the ELIFECYCLE error message. The shorter error message should make it much
easier to discern the actual cause of the error.
([@j-f1](https://github.com/j-f1))
* [`a87a4a835`](https://github.com/npm/npm/commit/a87a4a8359693518ee41dfeb13c5a8929136772a)
`npmlog@4.0.2`:
Fix flashing of the progress bar when your terminal is very narrow.
([@iarna](https://github.com/iarna))
* [`41c10974f`](https://github.com/npm/npm/commit/41c10974fe95a2e520e33e37725570c75f6126ea)
`write-file-atomic@1.3.2`:
Wait for `fsync` to complete before considering our file written to disk.
This will improve certain sorts of Windows diagnostic problems.
* [`2afa9240c`](https://github.com/npm/npm/commit/2afa9240ce5b391671ed5416464f2882d18a94bc)
[#16336](https://github.com/npm/npm/pull/16336)
Don't ham-it-up when expecting JSON.
([@bdukes](https://github.com/bdukes))

### DOCUMENTATION FIXES

* [`566f3eebe`](https://github.com/npm/npm/commit/566f3eebe741f935b7c1e004bebf19b8625a1413)
[#16296](https://github.com/npm/npm/pull/16296)
Use a single convention when referring to the `<command>` you're running.
([@desfero](https://github.com/desfero))
* [`ccbb94934`](https://github.com/npm/npm/commit/ccbb94934d4f677f680c3e2284df3d0ae0e65758)
[#16267](https://github.com/npm/npm/pull/16267)
Fix a missing space in the example package.json.
([@famousgarkin](https://github.com/famousgarkin))

### DEPENDENCY UPDATES

* [`ebde4ea33`](https://github.com/npm/npm/commit/ebde4ea3363dfc154c53bd537189503863c9b3a4)
`hosted-git-info@2.4.2`
* [`c46ad71bb`](https://github.com/npm/npm/commit/c46ad71bbe27aaa9ee10e107d8bcd665d98544d7)
`init-package-json@1.9.6`
* [`d856d570d`](https://github.com/npm/npm/commit/d856d570d2df602767c039cf03439d647bba2e3d)
`npm-registry-client@8.1.1`
* [`4a2e14436`](https://github.com/npm/npm/commit/4a2e1443613a199665e7adbda034d5b9d10391a2)
`readable-stream@2.2.9`
* [`f0399138e`](https://github.com/npm/npm/commit/f0399138e6d6f1cd7f807d523787a3b129996301)
`normalize-package-data@2.3.8`

### v4.5.0 (2017-03-24)

Welcome a wrinkle on npm's registry API!
Expand Down
24 changes: 12 additions & 12 deletions deps/npm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -53,23 +53,23 @@ latest:
@echo "Installing latest published npm"
@echo "Use 'make install' or 'make link' to install the code"
@echo "in this folder that you're looking at right now."
node cli.js install -g -f npm ${NPMOPTS}
node bin/npm-cli.js install -g -f npm ${NPMOPTS}

install: all
node cli.js install -g -f ${NPMOPTS}
node bin/npm-cli.js install -g -f ${NPMOPTS}

# backwards compat
dev: install

link: uninstall
node cli.js link -f
node bin/npm-cli.js link -f

clean: markedclean marked-manclean doc-clean uninstall
rm -rf npmrc
node cli.js cache clean
node bin/npm-cli.js cache clean

uninstall:
node cli.js rm npm -g -f
node bin/npm-cli.js rm npm -g -f

doc: $(mandocs) $(htmldocs)

Expand Down Expand Up @@ -143,22 +143,22 @@ html/doc/misc/%.html: doc/misc/%.md $(html_docdeps)
marked: node_modules/.bin/marked

node_modules/.bin/marked:
node cli.js install marked --no-global
node bin/npm-cli.js install marked --no-global --no-timing --no-save

marked-man: node_modules/.bin/marked-man

node_modules/.bin/marked-man:
node cli.js install marked-man --no-global
node bin/npm-cli.js install marked-man --no-global --no-timing --no-save

doc: man

man: $(cli_docs)

test: doc
node cli.js test
node bin/npm-cli.js test

tag:
npm tag npm@$(PUBLISHTAG) latest
node bin/npm-cli.js tag npm@$(PUBLISHTAG) latest

ls-ok:
node . ls >/dev/null
Expand All @@ -167,13 +167,13 @@ gitclean:
git clean -fd

publish: gitclean ls-ok link doc-clean doc
@git push origin :v$(shell npm -v) 2>&1 || true
@git push origin :v$(shell node bin/npm-cli.js --no-timing -v) 2>&1 || true
git push origin $(BRANCH) &&\
git push origin --tags &&\
npm publish --tag=$(PUBLISHTAG)
node bin/npm-cli.js publish --tag=$(PUBLISHTAG)

release: gitclean ls-ok markedclean marked-manclean doc-clean doc
node cli.js prune --production
node bin/npm-cli.js prune --production --no-save
@bash scripts/release.sh

sandwich:
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ If you plan on hacking on npm, `make link` is your friend.

If you've got the npm source code, you can also semi-permanently set
arbitrary config keys using the `./configure --key=val ...`, and then
run npm commands by doing `node cli.js <cmd> <args>`. (This is helpful
run npm commands by doing `node bin/npm-cli.js <command> <args>`. (This is helpful
for testing, or running stuff without actually installing npm itself.)

## Windows Install or Upgrade
Expand Down
72 changes: 72 additions & 0 deletions deps/npm/TODO.org
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
* Finished
* [COMPLETED] npm: add `created-with`, `shrinkwrap-version`, and `package-integrity`
* [COMPLETED] npm: warn on incompatible package-lock version
* [COMPLETED] npm: warn if both shrinkwrap and package-lock are there
* [COMPLETED] npm: fix git-prepare
* [COMPLETED] npm: fix auth failure for locked scoped deps
* [COMPLETED] npm: send the user-agent through to pacote
* [COMPLETED] npm: get https://github.com/npm/write-file-atomic/pull/23 merged
* [COMPLETED] npm: get https://github.com/npm/fstream-npm/pull/27 merged
* [COMPLETED] npm: if local deps exist w/o needed metadata, fetch it
* [COMPLETED] Run `prepare` during git tarball packing phase
* [COMPLETED] npm: put npm cache clear behind --force
* [COMPLETED] npm: package-lock.json
* lib/install/read-shrinkwrap.js
* lib/shrinkwrap.js
* lib/install/save.js (?)
* lib/utils/tar.js (add autoignore)
* fstream-npm (add autoignore)
* lib/version.js
* [COMPLETED] npm: --save by default
* [COMPLETED] npm: make sure `npm i <pkg>` defaults to package.json
* it only happens for command line arguments
* getAllMetadata
* Apparently, I did this way back when and totally forgot. lol.
* [COMPLETED] make-fetch-happen: make sure other options npm used are implemented
* look at the comment at the bottom of pacote.js
* [COMPLETED] make-fetch-happen: support strictSSL option
* [COMPLETED] Write npm@5 speeds presentation for Friday
* [COMPLETED] pacote: support `opts.fullMetadata` for `pkg.manifest`
* [COMPLETED] npm: fix invalid package: null error
* [COMPLETED] make-fetch-happen: case-insensitive http_proxy/proxy/https_proxy
* [COMPLETED] cacache: integrate cacache@8 into npm/pacote/mfh
* [COMPLETED] make-fetch-happen: literally vendor in node-fetch. sigh.
* basically, the whole tarball situation prevents shrinkwrap. sux :<
* note: solved this by forking node-fetch into node-fetch-npm
* [COMPLETED] pacote: http auth and alwaysAuth
* https://github.com/zkat/pacote/issues/77
* [COMPLETED] make-fetch-happen: NO_PROXY support
* https://github.com/zkat/make-fetch-happen/issues/17
* [COMPLETED] npm: calculate sri with ssri and add it to dist.integrity
* [COMPLETED] pacote: refactor handler API
* maybe use Protoduck?
* [COMPLETED] npm: nag Ryan about when sha512 is happening
* He says it's delayed 😭
* I can still start sending integrity in the publish
* [COMPLETED] npm: fix bundle replacement issues (see: npm i nyc warning spam)
* need fromBundle attribute on shrinkwrap and pass it through. the sw.version && sw.integrity-based fake node needs to have this there.
* Backlog
* [TODO] pacote: opts.extraHeaders
* https://github.com/zkat/pacote/issues/79
* [TODO] pacote: ECONNRESET recovery
* https://github.com/zkat/pacote/issues/8
* [TODO] pacote: skip node_modules extraction for non-bundleDeps
* https://github.com/zkat/pacote/issues/49
* [TODO] pacote: write tests for file/directory handlers
* [TODO] npm: `npm publish --dry-run` -> https://npm.im/pkgfiles ?
* Rebecca says yea
* [TODO] make-fetch-happen: write tests for agent pooling/proxy
* https://github.com/zkat/make-fetch-happen/issues/16
* [TODO] make-fetch-happen: retry notification
* https://github.com/zkat/make-fetch-happen/issues/21
* [TODO] npm: move addBundled call from inflate-shrinkwrap to extract
* fix the fucking bundling thing while at it
* Needed for npm@5
* [TODO] pacote: write tests for git handlers
* https://github.com/zkat/pacote/issues/70
* [TODO] pacote: offline feature support for git deps
* [TODO] npm: get logging working during the recalculateMetadata spam
* [TODO] write-file-atomic: review https://github.com/npm/write-file-atomic/pull/22
* Active
* [TODO] npm: make `npm update` save files as the right type
* [TODO] node: track down lifecycle signal failure
1 change: 1 addition & 0 deletions deps/npm/appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ install:
- ps: Install-Product node $env:nodejs_version $env:platform
- npm config set spin false
- npm rebuild
- npm i -g "npm/npm#release-beta-5"
- node . install -g .
- set "PATH=%APPDATA%\npm;C:\Program Files\Git\mingw64\libexec;%PATH%"
- npm install --loglevel=http
Expand Down
4 changes: 2 additions & 2 deletions deps/npm/bin/npm-cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

if (conf.version) {
console.log(npm.version)
return
return errorHandler.exit(0)
}

if (conf.versions) {
Expand All @@ -83,7 +83,7 @@
if (er) return errorHandler(er)
npm.commands[npm.command](npm.argv, function (err) {
// https://www.youtube.com/watch?v=7nfPu8qTiQU
if (!err && npm.config.get('ham-it-up')) {
if (!err && npm.config.get('ham-it-up') && !npm.config.get('json') && !npm.config.get('parseable')) {
output('\n 🎡 I Have the Honour to Be Your Obedient Servant,🎡 ~ npm πŸ“œπŸ–‹\n')
}
errorHandler.apply(this, arguments)
Expand Down
Loading

0 comments on commit 2c520a0

Please sign in to comment.