From 09d21ab903dcfebdfd446b8b29ad46c425b6510e Mon Sep 17 00:00:00 2001 From: nlf Date: Mon, 23 Nov 2020 12:39:39 -0800 Subject: [PATCH] @npmcli/run-script@1.8.1 --- .../@npmcli/run-script/lib/make-spawn-args.js | 2 +- node_modules/@npmcli/run-script/lib/set-path.js | 4 +++- node_modules/@npmcli/run-script/package.json | 2 +- package-lock.json | 14 +++++++------- package.json | 2 +- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/node_modules/@npmcli/run-script/lib/make-spawn-args.js b/node_modules/@npmcli/run-script/lib/make-spawn-args.js index aa241d5e61890..4c38b9401ddf0 100644 --- a/node_modules/@npmcli/run-script/lib/make-spawn-args.js +++ b/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/node_modules/@npmcli/run-script/lib/set-path.js b/node_modules/@npmcli/run-script/lib/set-path.js index dfa8001b7743d..d7bd2c2886b35 100644 --- a/node_modules/@npmcli/run-script/lib/set-path.js +++ b/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/node_modules/@npmcli/run-script/package.json b/node_modules/@npmcli/run-script/package.json index 925e85c06173e..7adb5c76d82cc 100644 --- a/node_modules/@npmcli/run-script/package.json +++ b/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/package-lock.json b/package-lock.json index 109f81a8b443b..43bd257934bee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -81,7 +81,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", @@ -525,9 +525,9 @@ } }, "node_modules/@npmcli/run-script": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.0.tgz", - "integrity": "sha512-ljPLRbQM5byhqacWl9kIjt/yPMee0heaTskaMBFaFvYzOXNJ64h27xV96Sr+LnjJpqR0qJejG36QzJkXILvghQ==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.1.tgz", + "integrity": "sha512-G8c86g9cQHyRINosIcpovzv0BkXQc3urhL1ORf3KTe4TS4UBsg2O4Z2feca/W3pfzdHEJzc83ETBW4aKbb3SaA==", "inBundle": true, "dependencies": { "@npmcli/node-gyp": "^1.0.0", @@ -9211,9 +9211,9 @@ } }, "@npmcli/run-script": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.0.tgz", - "integrity": "sha512-ljPLRbQM5byhqacWl9kIjt/yPMee0heaTskaMBFaFvYzOXNJ64h27xV96Sr+LnjJpqR0qJejG36QzJkXILvghQ==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.1.tgz", + "integrity": "sha512-G8c86g9cQHyRINosIcpovzv0BkXQc3urhL1ORf3KTe4TS4UBsg2O4Z2feca/W3pfzdHEJzc83ETBW4aKbb3SaA==", "requires": { "@npmcli/node-gyp": "^1.0.0", "@npmcli/promise-spawn": "^1.3.0", diff --git a/package.json b/package.json index 9b3c5c0beba9a..d57fd64514cc8 100644 --- a/package.json +++ b/package.json @@ -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",