Skip to content

deps: upgrade npm to 6.13.2#30779

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.

Sign up for GitHub

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

Closed
mikemimik wants to merge 1 commit into from
Closed

deps: upgrade npm to 6.13.2 #30779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
ifnotdefined npm_config_node_gyp (
node "%~dp0\..\..\node_modules\node-gyp\bin\node-gyp.js"%*
) else (
ifnotdefined 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
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
38 changes: 19 additions & 19 deletions deps/npm/bin/npm.cmd
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
40 changes: 20 additions & 20 deletions deps/npm/bin/npx.cmd
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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`.
Expand Down
4 changes: 2 additions & 2 deletions deps/npm/lib/fund.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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'
Expand Down
13 changes: 9 additions & 4 deletions deps/npm/lib/install/deps.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand Down
3 changes: 1 addition & 2 deletions deps/npm/lib/install/read-shrinkwrap.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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.')
}
Expand Down
18 changes: 10 additions & 8 deletions deps/npm/lib/utils/funding.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand DownExpand Up@@ -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()
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/lib/version.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-README.1
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-access.1
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-adduser.1
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-audit.1
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-bin.1
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-bugs.1
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-build.1
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-bundle.1
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-cache.1
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-ci.1
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-completion.1
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-config.1
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-dedupe.1
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-deprecate.1
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-dist-tag.1
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-docs.1
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-doctor.1
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-edit.1
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-explore.1
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-fund.1
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-help-search.1
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-help.1
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-hook.1
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-init.1
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-install-ci-test.1
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
.TH "NPM" "" "November 2019" "" ""
.TH "NPM" "" "December 2019" "" ""
.SH "NAME"
\fBnpm\fR
.SS Synopsis
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-install-test.1
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
.TH "NPM" "" "November 2019" "" ""
.TH "NPM" "" "December 2019" "" ""
.SH "NAME"
\fBnpm\fR
.SS Synopsis
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-install.1
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-link.1
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-logout.1
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-ls.1
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-org.1
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
deps: upgrade npm to 6.13.2 by mikemimik · Pull Request #30779 · nodejs/node · GitHub
Skip to content
deps: upgrade npm to 6.13.2#30779

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.

 Sign up for GitHub

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

 Closed

mikemimik
wants to merge
1
commit into

from

 Closed


deps: upgrade npm to 6.13.2
#30779
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
ifnotdefined npm_config_node_gyp (
 node "%~dp0\..\..\node_modules\node-gyp\bin\node-gyp.js"%*
) else (
ifnotdefined 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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

38 changes: 19 additions & 19 deletions
deps/npm/bin/npm.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

40 changes: 20 additions & 20 deletions
deps/npm/bin/npx.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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`.
Expand Down

4 changes: 2 additions & 2 deletions
deps/npm/lib/fund.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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'
Expand Down

13 changes: 9 additions & 4 deletions
deps/npm/lib/install/deps.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand Down

3 changes: 1 addition & 2 deletions
deps/npm/lib/install/read-shrinkwrap.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.')
 }
Expand Down

18 changes: 10 additions & 8 deletions
deps/npm/lib/utils/funding.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand DownExpand Up@@ -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()
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/lib/version.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
 }
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-README.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-access.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-adduser.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-audit.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-bin.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-bugs.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-build.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-bundle.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-cache.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-ci.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-completion.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-config.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-dedupe.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-deprecate.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-dist-tag.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-docs.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-doctor.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-edit.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-explore.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-fund.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-help-search.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-help.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-hook.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-init.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-install-ci-test.1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
.TH "NPM" "" "November 2019" "" ""
.TH "NPM" "" "December 2019" "" ""
.SH "NAME"
\fBnpm\fR
.SS Synopsis
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-install-test.1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
.TH "NPM" "" "November 2019" "" ""
.TH "NPM" "" "December 2019" "" ""
.SH "NAME"
\fBnpm\fR
.SS Synopsis
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-install.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-link.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-logout.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-ls.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-org.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
deps: upgrade npm to 6.13.2 by mikemimik · Pull Request #30779 · nodejs/node · GitHub
Skip to content
deps: upgrade npm to 6.13.2#30779

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.

 Sign up for GitHub

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

 Closed

mikemimik
wants to merge
1
commit into

from

 Closed


deps: upgrade npm to 6.13.2
#30779
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
ifnotdefined npm_config_node_gyp (
 node "%~dp0\..\..\node_modules\node-gyp\bin\node-gyp.js"%*
) else (
ifnotdefined 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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

38 changes: 19 additions & 19 deletions
deps/npm/bin/npm.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

40 changes: 20 additions & 20 deletions
deps/npm/bin/npx.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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`.
Expand Down

4 changes: 2 additions & 2 deletions
deps/npm/lib/fund.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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'
Expand Down

13 changes: 9 additions & 4 deletions
deps/npm/lib/install/deps.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand Down

3 changes: 1 addition & 2 deletions
deps/npm/lib/install/read-shrinkwrap.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.')
 }
Expand Down

18 changes: 10 additions & 8 deletions
deps/npm/lib/utils/funding.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand DownExpand Up@@ -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()
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/lib/version.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
 }
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-README.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-access.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-adduser.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-audit.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-bin.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-bugs.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-build.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-bundle.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-cache.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-ci.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-completion.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-config.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-dedupe.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-deprecate.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-dist-tag.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-docs.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-doctor.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-edit.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-explore.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-fund.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-help-search.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-help.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-hook.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-init.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-install-ci-test.1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
.TH "NPM" "" "November 2019" "" ""
.TH "NPM" "" "December 2019" "" ""
.SH "NAME"
\fBnpm\fR
.SS Synopsis
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-install-test.1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
.TH "NPM" "" "November 2019" "" ""
.TH "NPM" "" "December 2019" "" ""
.SH "NAME"
\fBnpm\fR
.SS Synopsis
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-install.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-link.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-logout.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-ls.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-org.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
deps: upgrade npm to 6.13.2 by mikemimik · Pull Request #30779 · nodejs/node · GitHub
Skip to content
deps: upgrade npm to 6.13.2#30779

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.

 Sign up for GitHub

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

 Closed

mikemimik
wants to merge
1
commit into

from

 Closed


deps: upgrade npm to 6.13.2
#30779
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
ifnotdefined npm_config_node_gyp (
 node "%~dp0\..\..\node_modules\node-gyp\bin\node-gyp.js"%*
) else (
ifnotdefined 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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

38 changes: 19 additions & 19 deletions
deps/npm/bin/npm.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

40 changes: 20 additions & 20 deletions
deps/npm/bin/npx.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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`.
Expand Down

4 changes: 2 additions & 2 deletions
deps/npm/lib/fund.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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'
Expand Down

13 changes: 9 additions & 4 deletions
deps/npm/lib/install/deps.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand Down

3 changes: 1 addition & 2 deletions
deps/npm/lib/install/read-shrinkwrap.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.')
 }
Expand Down

18 changes: 10 additions & 8 deletions
deps/npm/lib/utils/funding.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand DownExpand Up@@ -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()
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/lib/version.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
 }
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-README.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-access.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-adduser.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-audit.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-bin.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-bugs.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-build.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-bundle.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-cache.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-ci.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-completion.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-config.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-dedupe.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-deprecate.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-dist-tag.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-docs.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-doctor.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-edit.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-explore.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-fund.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-help-search.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-help.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-hook.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-init.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-install-ci-test.1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
.TH "NPM" "" "November 2019" "" ""
.TH "NPM" "" "December 2019" "" ""
.SH "NAME"
\fBnpm\fR
.SS Synopsis
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-install-test.1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
.TH "NPM" "" "November 2019" "" ""
.TH "NPM" "" "December 2019" "" ""
.SH "NAME"
\fBnpm\fR
.SS Synopsis
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-install.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-link.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-logout.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-ls.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-org.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
deps: upgrade npm to 6.13.2 by mikemimik · Pull Request #30779 · nodejs/node · GitHub
Skip to content
deps: upgrade npm to 6.13.2#30779

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.

 Sign up for GitHub

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

 Closed

mikemimik
wants to merge
1
commit into

from

 Closed


deps: upgrade npm to 6.13.2
#30779
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
ifnotdefined npm_config_node_gyp (
 node "%~dp0\..\..\node_modules\node-gyp\bin\node-gyp.js"%*
) else (
ifnotdefined 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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

38 changes: 19 additions & 19 deletions
deps/npm/bin/npm.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

40 changes: 20 additions & 20 deletions
deps/npm/bin/npx.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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`.
Expand Down

4 changes: 2 additions & 2 deletions
deps/npm/lib/fund.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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'
Expand Down

13 changes: 9 additions & 4 deletions
deps/npm/lib/install/deps.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand Down

3 changes: 1 addition & 2 deletions
deps/npm/lib/install/read-shrinkwrap.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.')
 }
Expand Down

18 changes: 10 additions & 8 deletions
deps/npm/lib/utils/funding.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand DownExpand Up@@ -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()
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/lib/version.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
 }
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-README.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-access.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-adduser.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-audit.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-bin.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-bugs.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-build.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-bundle.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-cache.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-ci.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-completion.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-config.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-dedupe.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-deprecate.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-dist-tag.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-docs.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-doctor.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-edit.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-explore.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-fund.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-help-search.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-help.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-hook.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-init.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-install-ci-test.1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
.TH "NPM" "" "November 2019" "" ""
.TH "NPM" "" "December 2019" "" ""
.SH "NAME"
\fBnpm\fR
.SS Synopsis
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-install-test.1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
.TH "NPM" "" "November 2019" "" ""
.TH "NPM" "" "December 2019" "" ""
.SH "NAME"
\fBnpm\fR
.SS Synopsis
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-install.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-link.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-logout.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-ls.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-org.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
deps: upgrade npm to 6.13.2 by mikemimik · Pull Request #30779 · nodejs/node · GitHub
Skip to content
deps: upgrade npm to 6.13.2#30779

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.

 Sign up for GitHub

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

 Closed

mikemimik
wants to merge
1
commit into

from

 Closed


deps: upgrade npm to 6.13.2
#30779
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
ifnotdefined npm_config_node_gyp (
 node "%~dp0\..\..\node_modules\node-gyp\bin\node-gyp.js"%*
) else (
ifnotdefined 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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

38 changes: 19 additions & 19 deletions
deps/npm/bin/npm.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

40 changes: 20 additions & 20 deletions
deps/npm/bin/npx.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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`.
Expand Down

4 changes: 2 additions & 2 deletions
deps/npm/lib/fund.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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'
Expand Down

13 changes: 9 additions & 4 deletions
deps/npm/lib/install/deps.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand Down

3 changes: 1 addition & 2 deletions
deps/npm/lib/install/read-shrinkwrap.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.')
 }
Expand Down

18 changes: 10 additions & 8 deletions
deps/npm/lib/utils/funding.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand DownExpand Up@@ -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()
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/lib/version.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
 }
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-README.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-access.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-adduser.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-audit.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-bin.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-bugs.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-build.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-bundle.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-cache.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-ci.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-completion.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-config.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-dedupe.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-deprecate.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-dist-tag.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-docs.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-doctor.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-edit.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-explore.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-fund.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-help-search.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-help.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-hook.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-init.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-install-ci-test.1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
.TH "NPM" "" "November 2019" "" ""
.TH "NPM" "" "December 2019" "" ""
.SH "NAME"
\fBnpm\fR
.SS Synopsis
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-install-test.1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
.TH "NPM" "" "November 2019" "" ""
.TH "NPM" "" "December 2019" "" ""
.SH "NAME"
\fBnpm\fR
.SS Synopsis
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-install.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-link.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-logout.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-ls.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-org.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
deps: upgrade npm to 6.13.2 by mikemimik · Pull Request #30779 · nodejs/node · GitHub
Skip to content
deps: upgrade npm to 6.13.2#30779

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.

 Sign up for GitHub

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

 Closed

mikemimik
wants to merge
1
commit into

from

 Closed


deps: upgrade npm to 6.13.2
#30779
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
ifnotdefined npm_config_node_gyp (
 node "%~dp0\..\..\node_modules\node-gyp\bin\node-gyp.js"%*
) else (
ifnotdefined 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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

38 changes: 19 additions & 19 deletions
deps/npm/bin/npm.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

40 changes: 20 additions & 20 deletions
deps/npm/bin/npx.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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`.
Expand Down

4 changes: 2 additions & 2 deletions
deps/npm/lib/fund.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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'
Expand Down

13 changes: 9 additions & 4 deletions
deps/npm/lib/install/deps.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand Down

3 changes: 1 addition & 2 deletions
deps/npm/lib/install/read-shrinkwrap.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.')
 }
Expand Down

18 changes: 10 additions & 8 deletions
deps/npm/lib/utils/funding.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand DownExpand Up@@ -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()
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/lib/version.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
 }
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-README.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-access.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-adduser.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-audit.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-bin.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-bugs.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-build.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-bundle.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-cache.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-ci.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-completion.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-config.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-dedupe.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-deprecate.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-dist-tag.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-docs.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-doctor.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-edit.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-explore.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-fund.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-help-search.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-help.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-hook.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-init.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-install-ci-test.1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
.TH "NPM" "" "November 2019" "" ""
.TH "NPM" "" "December 2019" "" ""
.SH "NAME"
\fBnpm\fR
.SS Synopsis
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-install-test.1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
.TH "NPM" "" "November 2019" "" ""
.TH "NPM" "" "December 2019" "" ""
.SH "NAME"
\fBnpm\fR
.SS Synopsis
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-install.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-link.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-logout.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-ls.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-org.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
deps: upgrade npm to 6.13.2 by mikemimik · Pull Request #30779 · nodejs/node · GitHub
Skip to content
deps: upgrade npm to 6.13.2#30779

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.

 Sign up for GitHub

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

 Closed

mikemimik
wants to merge
1
commit into

from

 Closed


deps: upgrade npm to 6.13.2
#30779
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
ifnotdefined npm_config_node_gyp (
 node "%~dp0\..\..\node_modules\node-gyp\bin\node-gyp.js"%*
) else (
ifnotdefined 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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

38 changes: 19 additions & 19 deletions
deps/npm/bin/npm.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

40 changes: 20 additions & 20 deletions
deps/npm/bin/npx.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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`.
Expand Down

4 changes: 2 additions & 2 deletions
deps/npm/lib/fund.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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'
Expand Down

13 changes: 9 additions & 4 deletions
deps/npm/lib/install/deps.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand Down

3 changes: 1 addition & 2 deletions
deps/npm/lib/install/read-shrinkwrap.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.')
 }
Expand Down

18 changes: 10 additions & 8 deletions
deps/npm/lib/utils/funding.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand DownExpand Up@@ -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()
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/lib/version.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
 }
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-README.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-access.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-adduser.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-audit.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-bin.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-bugs.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-build.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-bundle.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-cache.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-ci.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-completion.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-config.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-dedupe.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-deprecate.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-dist-tag.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-docs.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-doctor.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-edit.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-explore.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-fund.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-help-search.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-help.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-hook.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-init.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-install-ci-test.1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
.TH "NPM" "" "November 2019" "" ""
.TH "NPM" "" "December 2019" "" ""
.SH "NAME"
\fBnpm\fR
.SS Synopsis
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-install-test.1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
.TH "NPM" "" "November 2019" "" ""
.TH "NPM" "" "December 2019" "" ""
.SH "NAME"
\fBnpm\fR
.SS Synopsis
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-install.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-link.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-logout.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-ls.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down

2 changes: 1 addition & 1 deletion
deps/npm/man/man1/npm-org.1

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Expand Down
Loading