From 4a88c73fa53597dc9c30415b23326107642f3fbf Mon Sep 17 00:00:00 2001 From: nlf Date: Mon, 23 Nov 2020 13:24:36 -0800 Subject: [PATCH] deps: upgrade npm to 7.0.14 PR-URL: https://github.com/nodejs/node/pull/36238 Reviewed-By: Ruy Adorno Reviewed-By: Colin Ihrig Reviewed-By: Antoine du Hamel Reviewed-By: Shelley Vohr Reviewed-By: Rich Trott Reviewed-By: Luigi Pinca Reviewed-By: Myles Borins --- deps/npm/CHANGELOG.md | 7 +++++++ deps/npm/docs/output/commands/npm-ls.html | 2 +- deps/npm/docs/output/commands/npm.html | 2 +- deps/npm/man/man1/npm-ls.1 | 2 +- deps/npm/man/man1/npm.1 | 2 +- .../node_modules/@npmcli/run-script/lib/make-spawn-args.js | 2 +- deps/npm/node_modules/@npmcli/run-script/lib/set-path.js | 4 +++- deps/npm/node_modules/@npmcli/run-script/package.json | 2 +- deps/npm/package.json | 4 ++-- 9 files changed, 18 insertions(+), 9 deletions(-) diff --git a/deps/npm/CHANGELOG.md b/deps/npm/CHANGELOG.md index 99f0d02370483e..6ac63cfba3336d 100644 --- a/deps/npm/CHANGELOG.md +++ b/deps/npm/CHANGELOG.md @@ -1,3 +1,10 @@ +## 7.0.14 (2020-11-23) + +### DEPENDENCIES +* [`09d21ab90`](https://github.com/npm/cli/commit/09d21ab903dcfebdfd446b8b29ad46c425b6510e) + `@npmcli/run-script@1.8.1` + - fix a regression in how scripts are escaped + ## 7.0.13 (2020-11-20) ### BUG FIXES diff --git a/deps/npm/docs/output/commands/npm-ls.html b/deps/npm/docs/output/commands/npm-ls.html index e6e0a8ab71dbb7..0891ac81e5a760 100644 --- a/deps/npm/docs/output/commands/npm-ls.html +++ b/deps/npm/docs/output/commands/npm-ls.html @@ -156,7 +156,7 @@

Description

limit the results to only the paths to the packages named. Note that nested packages will also show the paths to the specified packages. For example, running npm ls promzard in npm’s source tree will show:

-
    npm@7.0.13 /path/to/npm
+
    npm@7.0.14 /path/to/npm
     └─┬ init-package-json@0.0.4
       └── promzard@0.1.5
 

diff --git a/deps/npm/docs/output/commands/npm.html b/deps/npm/docs/output/commands/npm.html
index 53c09067ef2010..bae6ef6e803442 100644
--- a/deps/npm/docs/output/commands/npm.html
+++ b/deps/npm/docs/output/commands/npm.html
@@ -148,7 +148,7 @@ 
Table of contents

 
npm <command> [args]
 

 
Version

-
7.0.13

+
7.0.14

 
Description

 
npm is the package manager for the Node JavaScript platform.  It puts
 modules in place so that node can find them, and manages dependency
diff --git a/deps/npm/man/man1/npm-ls.1 b/deps/npm/man/man1/npm-ls.1
index 7ee8f40a8ce149..a99c1d145329c3 100644
--- a/deps/npm/man/man1/npm-ls.1
+++ b/deps/npm/man/man1/npm-ls.1
@@ -22,7 +22,7 @@ For example, running \fBnpm ls promzard\fP in npm's source tree will show:
 .P
 .RS 2
 .nf
-    npm@7\.0\.13 /path/to/npm
+    npm@7\.0\.14 /path/to/npm
     └─┬ init\-package\-json@0\.0\.4
       └── promzard@0\.1\.5
 .fi
diff --git a/deps/npm/man/man1/npm.1 b/deps/npm/man/man1/npm.1
index 22f4cbef0fa5e8..e55d61f2df28a9 100644
--- a/deps/npm/man/man1/npm.1
+++ b/deps/npm/man/man1/npm.1
@@ -10,7 +10,7 @@ npm  [args]
 .RE
 .SS Version
 .P
-7\.0\.13
+7\.0\.14
 .SS Description
 .P
 npm is the package manager for the Node JavaScript platform\.  It puts
diff --git a/deps/npm/node_modules/@npmcli/run-script/lib/make-spawn-args.js b/deps/npm/node_modules/@npmcli/run-script/lib/make-spawn-args.js
index aa241d5e61890b..4c38b9401ddf06 100644
--- a/deps/npm/node_modules/@npmcli/run-script/lib/make-spawn-args.js
+++ b/deps/npm/node_modules/@npmcli/run-script/lib/make-spawn-args.js
@@ -34,7 +34,7 @@ const makeSpawnArgs = options => {
   } = options
 
   const isCmd = /(?:^|\\)cmd(?:\.exe)?$/i.test(scriptShell)
-  const args = isCmd ? ['/d', '/s', '/c', escapeCmd(cmd)] : ['-c', escapeCmd(cmd)]
+  const args = isCmd ? ['/d', '/s', '/c', escapeCmd(cmd)] : ['-c', cmd]
 
   const spawnOpts = {
     env: setPATH(path, {
diff --git a/deps/npm/node_modules/@npmcli/run-script/lib/set-path.js b/deps/npm/node_modules/@npmcli/run-script/lib/set-path.js
index dfa8001b7743dd..d7bd2c2886b355 100644
--- a/deps/npm/node_modules/@npmcli/run-script/lib/set-path.js
+++ b/deps/npm/node_modules/@npmcli/run-script/lib/set-path.js
@@ -1,6 +1,8 @@
 const {resolve, dirname} = require('path')
 const isWindows = require('./is-windows.js')
-const nodeGypPath = resolve(__dirname, 'node-gyp-bin')
+// the path here is relative, even though it does not need to be
+// in order to make the posix tests pass in windows
+const nodeGypPath = resolve(__dirname, '../lib/node-gyp-bin')
 
 // Windows typically calls its PATH environ 'Path', but this is not
 // guaranteed, nor is it guaranteed to be the only one.  Merge them
diff --git a/deps/npm/node_modules/@npmcli/run-script/package.json b/deps/npm/node_modules/@npmcli/run-script/package.json
index 925e85c06173e1..7adb5c76d82cc1 100644
--- a/deps/npm/node_modules/@npmcli/run-script/package.json
+++ b/deps/npm/node_modules/@npmcli/run-script/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/run-script",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "Run a lifecycle script for a package (descendant of npm-lifecycle)",
   "author": "Isaac Z. Schlueter  (https://izs.me)",
   "license": "ISC",
diff --git a/deps/npm/package.json b/deps/npm/package.json
index 9b3c5c0beba9a1..c67b3205a75a8f 100644
--- a/deps/npm/package.json
+++ b/deps/npm/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "7.0.13",
+  "version": "7.0.14",
   "name": "npm",
   "description": "a package manager for JavaScript",
   "keywords": [
@@ -45,7 +45,7 @@
     "@npmcli/arborist": "^1.0.12",
     "@npmcli/ci-detect": "^1.2.0",
     "@npmcli/config": "^1.2.1",
-    "@npmcli/run-script": "^1.8.0",
+    "@npmcli/run-script": "^1.8.1",
     "abbrev": "~1.1.1",
     "ansicolors": "~0.3.2",
     "ansistyles": "~0.1.3",