Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

deps: upgrade npm to 4.0.1 #9284

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion deps/npm/.github/issue_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
- `npm -v` prints:
- `node -v` prints:
- `npm config get registry` prints:
- Windows, OS X, or Linux?:
- Windows, OS X/macOS, or Linux?:
- Network issues:
- Geographic location where npm was run:
- [ ] I use a proxy to connect to the npm registry.
Expand Down
2 changes: 2 additions & 0 deletions deps/npm/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,5 @@ html/*.png
/test/tap/builtin-config

.nyc_output

npm-shrinkwrap.json
25 changes: 24 additions & 1 deletion deps/npm/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ matrix:
# DEPLOY_VERSION is used to set the couchapp setup mode for test/tap/registry.js
# only gather coverage info for LTS
env: DEPLOY_VERSION=testing COVERALLS_REPO_TOKEN="$COVERALLS_OPTIONAL_TOKEN"
script:
- "node . run tap-cover -- \"test/tap/*.js\""
- "unset COVERALLS_REPO_TOKEN ; node . run tap -- \"test/slow/*.js\" \"test/broken-under-*/*.js\""
# next LTS and master is next most important
- node_js: "6"
env: DEPLOY_VERSION=testing
Expand All @@ -24,8 +27,28 @@ matrix:
- node_js: "0.12"
env: DEPLOY_VERSION=testing
before_install:
- "node . install -g ."
# required by test/tap/registry.js
- "mkdir -p /var/run/couchdb"
notifications:
slack: npm-inc:kRqQjto7YbINqHPb1X6nS3g8
cache:
directories:
- $HOME/.npm
- node_modules/.bin
- node_modules/deep-equal
- node_modules/marked
- node_modules/marked-man
- node_modules/npm-registry-couchapp
- node_modules/npm-registry-mock
- node_modules/require-inject
- node_modules/sprintf-js
- node_modules/standard
- node_modules/tacks
- node_modules/tap
install:
- "node . prune"
- "node . rebuild --depth=0"
- "node . install --ignore-scripts"
- "make -j4 doc"
script:
- "node . run tap -- \"test/tap/*.js\" \"test/slow/*.js\" \"test/broken-under-nyc/*.js\""
8 changes: 8 additions & 0 deletions deps/npm/AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -430,3 +430,11 @@ Michael Jasper <[email protected]>
Max <[email protected]>
Szymon Nowak <[email protected]>
Jason Karns <[email protected]>
Lucas Holmquist <[email protected]>
Ionică Bizău <[email protected]>
Alex Chesters <[email protected]>
Robert Gay <[email protected]>
Steven <[email protected]>
Tim Caswell <[email protected]>
Anna Henningsen <[email protected]>
Kim Røen <[email protected]>
5,302 changes: 294 additions & 5,008 deletions deps/npm/CHANGELOG.md

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions deps/npm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ terms of use for the default public registry are available at

## Super Easy Install

npm is bundled with [node](http://nodejs.org/download/).
npm is bundled with [node](https://nodejs.org/en/download/).

### Windows Computers

[Get the MSI](http://nodejs.org/download/). npm is in it.
[Get the MSI](https://nodejs.org/en/download/). npm is in it.

### Apple Macintosh Computers

[Get the pkg](http://nodejs.org/download/). npm is in it.
[Get the pkg](https://nodejs.org/en/download/). npm is in it.

### Other Sorts of Unices

Expand Down
2 changes: 1 addition & 1 deletion deps/npm/appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ install:
test_script:
- node --version
- npm --version
- npm test
- npm run test -- --reporter=classic
notifications:
- provider: Slack
incoming_webhook:
Expand Down
6 changes: 5 additions & 1 deletion deps/npm/bin/npm-cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,15 @@

process.title = 'npm'

var unsupported = require('../lib/utils/unsupported.js')
unsupported.checkForBrokenNode()

var log = require('npmlog')
log.pause() // will be unpaused when config is loaded.

log.info('it worked if it ends with', 'ok')

unsupported.checkForUnsupportedNode()

var path = require('path')
var npm = require('../lib/npm.js')
var npmconf = require('../lib/config/core.js')
Expand Down
Loading