From 0e87cac8b6f09692f6bd1bf086aadbe323d127b5 Mon Sep 17 00:00:00 2001 From: Gar Date: Tue, 5 Apr 2022 13:12:39 -0700 Subject: [PATCH] deps: @npmcli/node-gyp@2.0.0 --- node_modules/@npmcli/node-gyp/lib/index.js | 6 +-- node_modules/@npmcli/node-gyp/package.json | 32 ++++++++----- .../@npmcli/node-gyp/lib/index.js | 14 ------ .../@npmcli/node-gyp/package.json | 45 ------------------- package-lock.json | 33 ++++++-------- workspaces/arborist/package.json | 2 +- 6 files changed, 38 insertions(+), 94 deletions(-) delete mode 100644 node_modules/@npmcli/run-script/node_modules/@npmcli/node-gyp/lib/index.js delete mode 100644 node_modules/@npmcli/run-script/node_modules/@npmcli/node-gyp/package.json diff --git a/node_modules/@npmcli/node-gyp/lib/index.js b/node_modules/@npmcli/node-gyp/lib/index.js index d4ebf14ed9af8..cdf18560e0ca2 100644 --- a/node_modules/@npmcli/node-gyp/lib/index.js +++ b/node_modules/@npmcli/node-gyp/lib/index.js @@ -1,8 +1,8 @@ const util = require('util') const fs = require('fs') -const {stat} = fs.promises || { stat: util.promisify(fs.stat) }; +const { stat } = fs.promises || { stat: util.promisify(fs.stat) } -async function isNodeGypPackage(path) { +async function isNodeGypPackage (path) { return await stat(`${path}/binding.gyp`) .then(st => st.isFile()) .catch(() => false) @@ -10,5 +10,5 @@ async function isNodeGypPackage(path) { module.exports = { isNodeGypPackage, - defaultGypInstallScript: 'node-gyp rebuild' + defaultGypInstallScript: 'node-gyp rebuild', } diff --git a/node_modules/@npmcli/node-gyp/package.json b/node_modules/@npmcli/node-gyp/package.json index 299a453b66cd3..04eeec8ff808c 100644 --- a/node_modules/@npmcli/node-gyp/package.json +++ b/node_modules/@npmcli/node-gyp/package.json @@ -1,12 +1,18 @@ { "name": "@npmcli/node-gyp", - "version": "1.0.3", + "version": "2.0.0", "description": "Tools for dealing with node-gyp packages", "scripts": { "test": "tap", "preversion": "npm test", "postversion": "npm publish", - "prepublishOnly": "git push origin --follow-tags" + "prepublishOnly": "git push origin --follow-tags", + "lint": "eslint \"**/*.js\"", + "postlint": "template-oss-check", + "template-oss-apply": "template-oss-apply --force", + "lintfix": "npm run lint -- --fix", + "snap": "tap", + "posttest": "npm run lint" }, "repository": { "type": "git", @@ -18,18 +24,22 @@ "node-gyp" ], "files": [ - "lib/**/*.js" + "bin/", + "lib/" ], "main": "lib/index.js", - "author": "Brian Jenkins ", + "author": "GitHub Inc.", "license": "ISC", - "tap": { - "check-coverage": true, - "coverage-map": "map.js" - }, "devDependencies": { - "require-inject": "^1.4.4", - "tap": "^14.10.6", - "tmp": "^0.2.1" + "@npmcli/eslint-config": "^3.0.1", + "@npmcli/template-oss": "3.2.2", + "tap": "^16.0.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + }, + "templateOSS": { + "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", + "version": "3.2.2" } } diff --git a/node_modules/@npmcli/run-script/node_modules/@npmcli/node-gyp/lib/index.js b/node_modules/@npmcli/run-script/node_modules/@npmcli/node-gyp/lib/index.js deleted file mode 100644 index cdf18560e0ca2..0000000000000 --- a/node_modules/@npmcli/run-script/node_modules/@npmcli/node-gyp/lib/index.js +++ /dev/null @@ -1,14 +0,0 @@ -const util = require('util') -const fs = require('fs') -const { stat } = fs.promises || { stat: util.promisify(fs.stat) } - -async function isNodeGypPackage (path) { - return await stat(`${path}/binding.gyp`) - .then(st => st.isFile()) - .catch(() => false) -} - -module.exports = { - isNodeGypPackage, - defaultGypInstallScript: 'node-gyp rebuild', -} diff --git a/node_modules/@npmcli/run-script/node_modules/@npmcli/node-gyp/package.json b/node_modules/@npmcli/run-script/node_modules/@npmcli/node-gyp/package.json deleted file mode 100644 index 04eeec8ff808c..0000000000000 --- a/node_modules/@npmcli/run-script/node_modules/@npmcli/node-gyp/package.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "name": "@npmcli/node-gyp", - "version": "2.0.0", - "description": "Tools for dealing with node-gyp packages", - "scripts": { - "test": "tap", - "preversion": "npm test", - "postversion": "npm publish", - "prepublishOnly": "git push origin --follow-tags", - "lint": "eslint \"**/*.js\"", - "postlint": "template-oss-check", - "template-oss-apply": "template-oss-apply --force", - "lintfix": "npm run lint -- --fix", - "snap": "tap", - "posttest": "npm run lint" - }, - "repository": { - "type": "git", - "url": "https://github.com/npm/node-gyp.git" - }, - "keywords": [ - "npm", - "cli", - "node-gyp" - ], - "files": [ - "bin/", - "lib/" - ], - "main": "lib/index.js", - "author": "GitHub Inc.", - "license": "ISC", - "devDependencies": { - "@npmcli/eslint-config": "^3.0.1", - "@npmcli/template-oss": "3.2.2", - "tap": "^16.0.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - }, - "templateOSS": { - "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "3.2.2" - } -} diff --git a/package-lock.json b/package-lock.json index 28311523f6414..fe6a03297adc0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -993,8 +993,13 @@ "license": "ISC" }, "node_modules/@npmcli/node-gyp": { - "version": "1.0.3", - "license": "ISC" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-2.0.0.tgz", + "integrity": "sha512-doNI35wIe3bBaEgrlPfdJPaCpUR89pJWep4Hq3aRdh6gKazIVWfs0jHttvSSoq47ZXgC7h73kDsUl8AoIQUB+A==", + "inBundle": true, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } }, "node_modules/@npmcli/package-json": { "version": "2.0.0", @@ -1032,15 +1037,6 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/@npmcli/run-script/node_modules/@npmcli/node-gyp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-2.0.0.tgz", - "integrity": "sha512-doNI35wIe3bBaEgrlPfdJPaCpUR89pJWep4Hq3aRdh6gKazIVWfs0jHttvSSoq47ZXgC7h73kDsUl8AoIQUB+A==", - "inBundle": true, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, "node_modules/@npmcli/run-script/node_modules/@npmcli/promise-spawn": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-3.0.0.tgz", @@ -9616,7 +9612,7 @@ "@npmcli/metavuln-calculator": "^3.0.1", "@npmcli/move-file": "^2.0.0", "@npmcli/name-from-folder": "^1.0.1", - "@npmcli/node-gyp": "^1.0.3", + "@npmcli/node-gyp": "^2.0.0", "@npmcli/package-json": "^2.0.0", "@npmcli/run-script": "^3.0.0", "bin-links": "^3.0.0", @@ -10286,9 +10282,9 @@ "@npmcli/installed-package-contents": "^1.0.7", "@npmcli/map-workspaces": "^2.0.0", "@npmcli/metavuln-calculator": "^3.0.1", - "@npmcli/move-file": "2.0.0", + "@npmcli/move-file": "^2.0.0", "@npmcli/name-from-folder": "^1.0.1", - "@npmcli/node-gyp": "^1.0.3", + "@npmcli/node-gyp": "2.0.0", "@npmcli/package-json": "^2.0.0", "@npmcli/run-script": "^3.0.0", "@npmcli/template-oss": "3.2.2", @@ -10456,7 +10452,9 @@ "version": "1.0.1" }, "@npmcli/node-gyp": { - "version": "1.0.3" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-2.0.0.tgz", + "integrity": "sha512-doNI35wIe3bBaEgrlPfdJPaCpUR89pJWep4Hq3aRdh6gKazIVWfs0jHttvSSoq47ZXgC7h73kDsUl8AoIQUB+A==" }, "@npmcli/package-json": { "version": "2.0.0", @@ -10485,11 +10483,6 @@ "read-package-json-fast": "^2.0.3" }, "dependencies": { - "@npmcli/node-gyp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-2.0.0.tgz", - "integrity": "sha512-doNI35wIe3bBaEgrlPfdJPaCpUR89pJWep4Hq3aRdh6gKazIVWfs0jHttvSSoq47ZXgC7h73kDsUl8AoIQUB+A==" - }, "@npmcli/promise-spawn": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-3.0.0.tgz", diff --git a/workspaces/arborist/package.json b/workspaces/arborist/package.json index 775fa048802f3..8d22a41224dd6 100644 --- a/workspaces/arborist/package.json +++ b/workspaces/arborist/package.json @@ -9,7 +9,7 @@ "@npmcli/metavuln-calculator": "^3.0.1", "@npmcli/move-file": "^2.0.0", "@npmcli/name-from-folder": "^1.0.1", - "@npmcli/node-gyp": "^1.0.3", + "@npmcli/node-gyp": "^2.0.0", "@npmcli/package-json": "^2.0.0", "@npmcli/run-script": "^3.0.0", "bin-links": "^3.0.0",