From 7b1e75906351bd73cde2f745ccaf63b9ad7de435 Mon Sep 17 00:00:00 2001 From: isaacs Date: Fri, 2 Oct 2020 11:34:42 -0700 Subject: [PATCH] @npmcli/run-script@1.7.1 Properly check for the gypfile:false flag in package.json --- .../@npmcli/run-script/lib/run-script-pkg.js | 3 ++- node_modules/@npmcli/run-script/package.json | 2 +- package-lock.json | 12 ++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/node_modules/@npmcli/run-script/lib/run-script-pkg.js b/node_modules/@npmcli/run-script/lib/run-script-pkg.js index bf273e590d003..434b7362a659c 100644 --- a/node_modules/@npmcli/run-script/lib/run-script-pkg.js +++ b/node_modules/@npmcli/run-script/lib/run-script-pkg.js @@ -29,13 +29,14 @@ const runScriptPkg = async options => { event === 'install' && ! pkg.scripts.install && ! pkg.scripts.preinstall && + pkg.gypfile !== false && await isNodeGypPackage(path) ) { cmd = defaultGypInstallScript } if (!cmd) - return Promise.resolve({ code: 0, signal: null }) + return { code: 0, signal: null } if (stdio === 'inherit' && banner !== false) { // we're dumping to the parent's stdout, so print the banner diff --git a/node_modules/@npmcli/run-script/package.json b/node_modules/@npmcli/run-script/package.json index 1fe8e82c50356..3f17fed218ceb 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.7.0", + "version": "1.7.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 7208156b90770..6351953cccbe2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -526,9 +526,9 @@ } }, "node_modules/@npmcli/run-script": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.7.0.tgz", - "integrity": "sha512-GaWLYT88H6NzOVGyXeCigijJ+eo2sdBfI67VqgkBDcR/5vElpXQH3crdfLYySPuOMZQSQXh0EsW+gC5LciFsMQ==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.7.1.tgz", + "integrity": "sha512-16GKM0Zyw1cSfQPbBN7cwrLMneM0QhAYYiamae5w8802VKK7HT7Gd5AkJHVljsL/BYLxhTV3I5FxAjwJa7S+RA==", "inBundle": true, "dependencies": { "@npmcli/node-gyp": "^1.0.0", @@ -8632,9 +8632,9 @@ } }, "@npmcli/run-script": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.7.0.tgz", - "integrity": "sha512-GaWLYT88H6NzOVGyXeCigijJ+eo2sdBfI67VqgkBDcR/5vElpXQH3crdfLYySPuOMZQSQXh0EsW+gC5LciFsMQ==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.7.1.tgz", + "integrity": "sha512-16GKM0Zyw1cSfQPbBN7cwrLMneM0QhAYYiamae5w8802VKK7HT7Gd5AkJHVljsL/BYLxhTV3I5FxAjwJa7S+RA==", "requires": { "@npmcli/node-gyp": "^1.0.0", "@npmcli/promise-spawn": "^1.2.0",