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 6.13.2 #30779

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions deps/npm/bin/node-gyp-bin/node-gyp.cmd
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
if not defined npm_config_node_gyp (
node "%~dp0\..\..\node_modules\node-gyp\bin\node-gyp.js" %*
) else (
if not defined npm_config_node_gyp (
node "%~dp0\..\..\node_modules\node-gyp\bin\node-gyp.js" %*
) else (
node "%npm_config_node_gyp%" %*
)
)
4 changes: 0 additions & 4 deletions deps/npm/bin/npm
Original file line number Diff line number Diff line change
@@ -8,10 +8,6 @@ case `uname` in
esac

NODE_EXE="$basedir/node.exe"
if [ -x "$NODE_EXE" ] && [ -f "/bin/wslpath" ]; then # run the corresponding command prompt when Node for Windows is executed within WSL
cmd.exe /c `wslpath -w "$basedir/npm.cmd"` "$@"
exit $?
fi
if ! [ -x "$NODE_EXE" ]; then
NODE_EXE="$basedir/node"
fi
38 changes: 19 additions & 19 deletions deps/npm/bin/npm.cmd
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
:: Created by npm, please don't edit manually.
@ECHO OFF

SETLOCAL

SET "NODE_EXE=%~dp0\node.exe"
IF NOT EXIST "%NODE_EXE%" (
SET "NODE_EXE=node"
)

SET "NPM_CLI_JS=%~dp0\node_modules\npm\bin\npm-cli.js"
FOR /F "delims=" %%F IN ('CALL "%NODE_EXE%" "%NPM_CLI_JS%" prefix -g') DO (
SET "NPM_PREFIX_NPM_CLI_JS=%%F\node_modules\npm\bin\npm-cli.js"
)
IF EXIST "%NPM_PREFIX_NPM_CLI_JS%" (
SET "NPM_CLI_JS=%NPM_PREFIX_NPM_CLI_JS%"
)

"%NODE_EXE%" "%NPM_CLI_JS%" %*
:: Created by npm, please don't edit manually.
@ECHO OFF
SETLOCAL
SET "NODE_EXE=%~dp0\node.exe"
IF NOT EXIST "%NODE_EXE%" (
SET "NODE_EXE=node"
)
SET "NPM_CLI_JS=%~dp0\node_modules\npm\bin\npm-cli.js"
FOR /F "delims=" %%F IN ('CALL "%NODE_EXE%" "%NPM_CLI_JS%" prefix -g') DO (
SET "NPM_PREFIX_NPM_CLI_JS=%%F\node_modules\npm\bin\npm-cli.js"
)
IF EXIST "%NPM_PREFIX_NPM_CLI_JS%" (
SET "NPM_CLI_JS=%NPM_PREFIX_NPM_CLI_JS%"
)
"%NODE_EXE%" "%NPM_CLI_JS%" %*
4 changes: 0 additions & 4 deletions deps/npm/bin/npx
Original file line number Diff line number Diff line change
@@ -8,10 +8,6 @@ case `uname` in
esac

NODE_EXE="$basedir/node.exe"
if [ -x "$NODE_EXE" ] && [ -f "/bin/wslpath" ]; then # run the corresponding command prompt when Node for Windows is executed within WSL
cmd.exe /c `wslpath -w "$basedir/npx.cmd"` "$@"
exit $?
fi
if ! [ -x "$NODE_EXE" ]; then
NODE_EXE=node
fi
40 changes: 20 additions & 20 deletions deps/npm/bin/npx.cmd
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
:: Created by npm, please don't edit manually.
@ECHO OFF

SETLOCAL

SET "NODE_EXE=%~dp0\node.exe"
IF NOT EXIST "%NODE_EXE%" (
SET "NODE_EXE=node"
)

SET "NPM_CLI_JS=%~dp0\node_modules\npm\bin\npm-cli.js"
SET "NPX_CLI_JS=%~dp0\node_modules\npm\bin\npx-cli.js"
FOR /F "delims=" %%F IN ('CALL "%NODE_EXE%" "%NPM_CLI_JS%" prefix -g') DO (
SET "NPM_PREFIX_NPX_CLI_JS=%%F\node_modules\npm\bin\npx-cli.js"
)
IF EXIST "%NPM_PREFIX_NPX_CLI_JS%" (
SET "NPX_CLI_JS=%NPM_PREFIX_NPX_CLI_JS%"
)

"%NODE_EXE%" "%NPX_CLI_JS%" %*
:: Created by npm, please don't edit manually.
@ECHO OFF
SETLOCAL
SET "NODE_EXE=%~dp0\node.exe"
IF NOT EXIST "%NODE_EXE%" (
SET "NODE_EXE=node"
)
SET "NPM_CLI_JS=%~dp0\node_modules\npm\bin\npm-cli.js"
SET "NPX_CLI_JS=%~dp0\node_modules\npm\bin\npx-cli.js"
FOR /F "delims=" %%F IN ('CALL "%NODE_EXE%" "%NPM_CLI_JS%" prefix -g') DO (
SET "NPM_PREFIX_NPX_CLI_JS=%%F\node_modules\npm\bin\npx-cli.js"
)
IF EXIST "%NPM_PREFIX_NPX_CLI_JS%" (
SET "NPX_CLI_JS=%NPM_PREFIX_NPX_CLI_JS%"
)
"%NODE_EXE%" "%NPX_CLI_JS%" %*
2 changes: 1 addition & 1 deletion deps/npm/changelogs/CHANGELOG-5.md
Original file line number Diff line number Diff line change
@@ -1935,7 +1935,7 @@ helpful when community members go over our code and help clean it up, too!
* [`9e5b76140`](https://github.com/npm/npm/commit/9e5b76140ffdb7dcd12aa402793644213fb8c5d7)
[#17411](https://github.com/npm/npm/pull/17411)
Convert all callback-style `move` usage to use Promises.
([@vramana](https://github.com/vramana))
([@vramana](https://github.com/vramana))
* [`0711c08f7`](https://github.com/npm/npm/commit/0711c08f779ac641ec42ecc96f604c8861008b28)
[#17394](https://github.com/npm/npm/pull/17394)
Remove unused argument in `deepSortObject`.
4 changes: 2 additions & 2 deletions deps/npm/lib/fund.js
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ const readShrinkwrap = require('./install/read-shrinkwrap.js')
const mutateIntoLogicalTree = require('./install/mutate-into-logical-tree.js')
const output = require('./utils/output.js')
const openUrl = require('./utils/open-url.js')
const { getFundingInfo, validFundingUrl } = require('./utils/funding.js')
const { getFundingInfo, retrieveFunding, validFundingUrl } = require('./utils/funding.js')

const FundConfig = figgyPudding({
browser: {}, // used by ./utils/open-url
@@ -132,7 +132,7 @@ function printHuman (fundingInfo, opts) {
function openFundingUrl (packageName, cb) {
function getUrlAndOpen (packageMetadata) {
const { funding } = packageMetadata
const { type, url } = funding || {}
const { type, url } = retrieveFunding(funding) || {}
const noFundingError =
new Error(`No funding method available for: ${packageName}`)
noFundingError.code = 'ENOFUND'
13 changes: 9 additions & 4 deletions deps/npm/lib/install/deps.js
Original file line number Diff line number Diff line change
@@ -203,10 +203,15 @@ function removeObsoleteDep (child, log) {
function packageRelativePath (tree) {
if (!tree) return ''
var requested = tree.package._requested || {}
var isLocal = requested.type === 'directory' || requested.type === 'file'
return isLocal ? requested.fetchSpec
: (tree.isLink || tree.isInLink) && !preserveSymlinks() ? tree.realpath
: tree.path
if (requested.type === 'directory') {
return requested.fetchSpec
} else if (requested.type === 'file') {
return path.dirname(requested.fetchSpec)
} else if ((tree.isLink || tree.isInLink) && !preserveSymlinks()) {
return tree.realpath
} else {
return tree.path
}
}

function matchingDep (tree, name) {
3 changes: 1 addition & 2 deletions deps/npm/lib/install/read-shrinkwrap.js
Original file line number Diff line number Diff line change
@@ -19,8 +19,7 @@ function readShrinkwrap (child, next) {
maybeReadFile('npm-shrinkwrap.json', child),
// Don't read non-root lockfiles
child.isTop && maybeReadFile('package-lock.json', child),
child.isTop && maybeReadFile('package.json', child),
(shrinkwrap, lockfile, pkgJson) => {
(shrinkwrap, lockfile) => {
if (shrinkwrap && lockfile) {
log.warn('read-shrinkwrap', 'Ignoring package-lock.json because there is already an npm-shrinkwrap.json. Please use only one of the two.')
}
18 changes: 10 additions & 8 deletions deps/npm/lib/utils/funding.js
Original file line number Diff line number Diff line change
@@ -3,8 +3,18 @@
const URL = require('url').URL

exports.getFundingInfo = getFundingInfo
exports.retrieveFunding = retrieveFunding
exports.validFundingUrl = validFundingUrl

// supports both object funding and string shorthand
function retrieveFunding (funding) {
return typeof funding === 'string'
? {
url: funding
}
: funding
}

// Is the value of a `funding` property of a `package.json`
// a valid type+url for `npm fund` to display?
function validFundingUrl (funding) {
@@ -60,14 +70,6 @@ function getFundingInfo (idealTree, opts) {
)
}

function retrieveFunding (funding) {
return typeof funding === 'string'
? {
url: funding
}
: funding
}

function getFundingDependencies (tree) {
const deps = tree && tree.dependencies
if (!deps) return empty()
2 changes: 1 addition & 1 deletion deps/npm/lib/version.js
Original file line number Diff line number Diff line change
@@ -256,7 +256,7 @@ function checkGit (localData, cb) {
statGitFolder(function (er) {
var doGit = !er && npm.config.get('git-tag-version')
if (!doGit) {
if (er) log.verbose('version', 'error checking for .git', er)
if (er && npm.config.get('git-tag-version')) log.verbose('version', 'error checking for .git', er)
log.verbose('version', 'not tagging in git')
return cb(null, false)
}
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-README.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "NPM" "1" "November 2019" "" ""
.TH "NPM" "1" "December 2019" "" ""
.SH "NAME"
\fBnpm\fR \- a JavaScript package manager
.P
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-access.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "NPM\-ACCESS" "1" "November 2019" "" ""
.TH "NPM\-ACCESS" "1" "December 2019" "" ""
.SH "NAME"
\fBnpm-access\fR \- Set access level on published packages
.SS Synopsis
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-adduser.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "NPM\-ADDUSER" "1" "November 2019" "" ""
.TH "NPM\-ADDUSER" "1" "December 2019" "" ""
.SH "NAME"
\fBnpm-adduser\fR \- Add a registry user account
.SS Synopsis
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-audit.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "NPM\-AUDIT" "1" "November 2019" "" ""
.TH "NPM\-AUDIT" "1" "December 2019" "" ""
.SH "NAME"
\fBnpm-audit\fR \- Run a security audit
.SS Synopsis
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-bin.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "NPM\-BIN" "1" "November 2019" "" ""
.TH "NPM\-BIN" "1" "December 2019" "" ""
.SH "NAME"
\fBnpm-bin\fR \- Display npm bin folder
.SS Synopsis
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-bugs.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "NPM\-BUGS" "1" "November 2019" "" ""
.TH "NPM\-BUGS" "1" "December 2019" "" ""
.SH "NAME"
\fBnpm-bugs\fR \- Bugs for a package in a web browser maybe
.SS Synopsis
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-build.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "NPM\-BUILD" "1" "November 2019" "" ""
.TH "NPM\-BUILD" "1" "December 2019" "" ""
.SH "NAME"
\fBnpm-build\fR \- Build a package
.SS Synopsis
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-bundle.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "NPM\-BUNDLE" "1" "November 2019" "" ""
.TH "NPM\-BUNDLE" "1" "December 2019" "" ""
.SH "NAME"
\fBnpm-bundle\fR \- REMOVED
.SS Description
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-cache.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "NPM\-CACHE" "1" "November 2019" "" ""
.TH "NPM\-CACHE" "1" "December 2019" "" ""
.SH "NAME"
\fBnpm-cache\fR \- Manipulates packages cache
.SS Synopsis
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-ci.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "NPM\-CI" "1" "November 2019" "" ""
.TH "NPM\-CI" "1" "December 2019" "" ""
.SH "NAME"
\fBnpm-ci\fR \- Install a project with a clean slate
.SS Synopsis
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-completion.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "NPM\-COMPLETION" "1" "November 2019" "" ""
.TH "NPM\-COMPLETION" "1" "December 2019" "" ""
.SH "NAME"
\fBnpm-completion\fR \- Tab Completion for npm
.SS Synopsis
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-config.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "NPM\-CONFIG" "1" "November 2019" "" ""
.TH "NPM\-CONFIG" "1" "December 2019" "" ""
.SH "NAME"
\fBnpm-config\fR \- Manage the npm configuration files
.SS Synopsis
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-dedupe.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "NPM\-DEDUPE" "1" "November 2019" "" ""
.TH "NPM\-DEDUPE" "1" "December 2019" "" ""
.SH "NAME"
\fBnpm-dedupe\fR \- Reduce duplication
.SS Synopsis
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-deprecate.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "NPM\-DEPRECATE" "1" "November 2019" "" ""
.TH "NPM\-DEPRECATE" "1" "December 2019" "" ""
.SH "NAME"
\fBnpm-deprecate\fR \- Deprecate a version of a package
.SS Synopsis
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-dist-tag.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "NPM\-DIST\-TAG" "1" "November 2019" "" ""
.TH "NPM\-DIST\-TAG" "1" "December 2019" "" ""
.SH "NAME"
\fBnpm-dist-tag\fR \- Modify package distribution tags
.SS Synopsis
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-docs.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "NPM\-DOCS" "1" "November 2019" "" ""
.TH "NPM\-DOCS" "1" "December 2019" "" ""
.SH "NAME"
\fBnpm-docs\fR \- Docs for a package in a web browser maybe
.SS Synopsis
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-doctor.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "NPM\-DOCTOR" "1" "November 2019" "" ""
.TH "NPM\-DOCTOR" "1" "December 2019" "" ""
.SH "NAME"
\fBnpm-doctor\fR \- Check your environments
.SS Synopsis
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-edit.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "NPM\-EDIT" "1" "November 2019" "" ""
.TH "NPM\-EDIT" "1" "December 2019" "" ""
.SH "NAME"
\fBnpm-edit\fR \- Edit an installed package
.SS Synopsis
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-explore.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "NPM\-EXPLORE" "1" "November 2019" "" ""
.TH "NPM\-EXPLORE" "1" "December 2019" "" ""
.SH "NAME"
\fBnpm-explore\fR \- Browse an installed package
.SS Synopsis
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-fund.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "NPM\-FUND" "1" "November 2019" "" ""
.TH "NPM\-FUND" "1" "December 2019" "" ""
.SH "NAME"
\fBnpm-fund\fR \- Retrieve funding information
.SS Synopsis
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-help-search.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "NPM\-HELP\-SEARCH" "1" "November 2019" "" ""
.TH "NPM\-HELP\-SEARCH" "1" "December 2019" "" ""
.SH "NAME"
\fBnpm-help-search\fR \- Search npm help documentation
.SS Synopsis
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-help.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "NPM\-HELP" "1" "November 2019" "" ""
.TH "NPM\-HELP" "1" "December 2019" "" ""
.SH "NAME"
\fBnpm-help\fR \- Get help on npm
.SS Synopsis
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-hook.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "NPM\-HOOK" "1" "November 2019" "" ""
.TH "NPM\-HOOK" "1" "December 2019" "" ""
.SH "NAME"
\fBnpm-hook\fR \- Manage registry hooks
.SS Synopsis
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-init.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "NPM\-INIT" "1" "November 2019" "" ""
.TH "NPM\-INIT" "1" "December 2019" "" ""
.SH "NAME"
\fBnpm-init\fR \- create a package\.json file
.SS Synopsis
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-install-ci-test.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "NPM" "" "November 2019" "" ""
.TH "NPM" "" "December 2019" "" ""
.SH "NAME"
\fBnpm\fR
.SS Synopsis
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-install-test.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "NPM" "" "November 2019" "" ""
.TH "NPM" "" "December 2019" "" ""
.SH "NAME"
\fBnpm\fR
.SS Synopsis
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-install.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "NPM\-INSTALL" "1" "November 2019" "" ""
.TH "NPM\-INSTALL" "1" "December 2019" "" ""
.SH "NAME"
\fBnpm-install\fR \- Install a package
.SS Synopsis
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-link.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "NPM\-LINK" "1" "November 2019" "" ""
.TH "NPM\-LINK" "1" "December 2019" "" ""
.SH "NAME"
\fBnpm-link\fR \- Symlink a package folder
.SS Synopsis
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-logout.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "NPM\-LOGOUT" "1" "November 2019" "" ""
.TH "NPM\-LOGOUT" "1" "December 2019" "" ""
.SH "NAME"
\fBnpm-logout\fR \- Log out of the registry
.SS Synopsis
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-ls.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "NPM\-LS" "1" "November 2019" "" ""
.TH "NPM\-LS" "1" "December 2019" "" ""
.SH "NAME"
\fBnpm-ls\fR \- List installed packages
.SS Synopsis
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-org.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "NPM\-ORG" "1" "November 2019" "" ""
.TH "NPM\-ORG" "1" "December 2019" "" ""
.SH "NAME"
\fBnpm-org\fR \- Manage orgs
.SS Synopsis
Loading