diff --git a/node_modules/.gitignore b/node_modules/.gitignore index d0b541feb8ecd..671fd0624d7fb 100644 --- a/node_modules/.gitignore +++ b/node_modules/.gitignore @@ -32,11 +32,6 @@ !/@npmcli/query !/@npmcli/redact !/@npmcli/run-script -!/@npmcli/run-script/node_modules/ -/@npmcli/run-script/node_modules/* -!/@npmcli/run-script/node_modules/@npmcli/ -/@npmcli/run-script/node_modules/@npmcli/* -!/@npmcli/run-script/node_modules/@npmcli/node-gyp !/@pkgjs/ /@pkgjs/* !/@pkgjs/parseargs diff --git a/node_modules/@npmcli/run-script/node_modules/@npmcli/node-gyp/LICENSE b/node_modules/@npmcli/node-gyp/LICENSE similarity index 100% rename from node_modules/@npmcli/run-script/node_modules/@npmcli/node-gyp/LICENSE rename to node_modules/@npmcli/node-gyp/LICENSE diff --git a/node_modules/@npmcli/node-gyp/package.json b/node_modules/@npmcli/node-gyp/package.json index 999572bc5883a..3be9663a39de0 100644 --- a/node_modules/@npmcli/node-gyp/package.json +++ b/node_modules/@npmcli/node-gyp/package.json @@ -1,19 +1,20 @@ { "name": "@npmcli/node-gyp", - "version": "3.0.0", + "version": "4.0.0", "description": "Tools for dealing with node-gyp packages", "scripts": { "test": "tap", - "lint": "eslint \"**/*.js\"", + "lint": "npm run eslint", "postlint": "template-oss-check", "template-oss-apply": "template-oss-apply --force", - "lintfix": "npm run lint -- --fix", + "lintfix": "npm run eslint -- --fix", "snap": "tap", - "posttest": "npm run lint" + "posttest": "npm run lint", + "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"" }, "repository": { "type": "git", - "url": "https://github.com/npm/node-gyp.git" + "url": "git+https://github.com/npm/node-gyp.git" }, "keywords": [ "npm", @@ -28,16 +29,17 @@ "author": "GitHub Inc.", "license": "ISC", "devDependencies": { - "@npmcli/eslint-config": "^3.0.1", - "@npmcli/template-oss": "4.5.1", + "@npmcli/eslint-config": "^5.0.0", + "@npmcli/template-oss": "4.23.3", "tap": "^16.0.1" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.5.1" + "version": "4.23.3", + "publish": true }, "tap": { "nyc-arg": [ 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 3be9663a39de0..0000000000000 --- a/node_modules/@npmcli/run-script/node_modules/@npmcli/node-gyp/package.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "name": "@npmcli/node-gyp", - "version": "4.0.0", - "description": "Tools for dealing with node-gyp packages", - "scripts": { - "test": "tap", - "lint": "npm run eslint", - "postlint": "template-oss-check", - "template-oss-apply": "template-oss-apply --force", - "lintfix": "npm run eslint -- --fix", - "snap": "tap", - "posttest": "npm run lint", - "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"" - }, - "repository": { - "type": "git", - "url": "git+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": "^5.0.0", - "@npmcli/template-oss": "4.23.3", - "tap": "^16.0.1" - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" - }, - "templateOSS": { - "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.23.3", - "publish": true - }, - "tap": { - "nyc-arg": [ - "--exclude", - "tap-snapshots/**" - ] - } -} diff --git a/package-lock.json b/package-lock.json index f5c2f9f52fbe6..af57e886a0bdd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1683,12 +1683,13 @@ } }, "node_modules/@npmcli/node-gyp": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz", - "integrity": "sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-4.0.0.tgz", + "integrity": "sha512-+t5DZ6mO/QFh78PByMq1fGSAub/agLJZDRfJRMeOSNCt8s9YVlTjmGpIPwPhvXTGUIJk+WszlT0rQa1W33yzNA==", + "inBundle": true, "license": "ISC", "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@npmcli/package-json": { @@ -1763,16 +1764,6 @@ "node": "^18.17.0 || >=20.5.0" } }, - "node_modules/@npmcli/run-script/node_modules/@npmcli/node-gyp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-4.0.0.tgz", - "integrity": "sha512-+t5DZ6mO/QFh78PByMq1fGSAub/agLJZDRfJRMeOSNCt8s9YVlTjmGpIPwPhvXTGUIJk+WszlT0rQa1W33yzNA==", - "inBundle": true, - "license": "ISC", - "engines": { - "node": "^18.17.0 || >=20.5.0" - } - }, "node_modules/@npmcli/smoke-tests": { "resolved": "smoke-tests", "link": true @@ -16680,7 +16671,7 @@ "@npmcli/map-workspaces": "^4.0.1", "@npmcli/metavuln-calculator": "^8.0.0", "@npmcli/name-from-folder": "^3.0.0", - "@npmcli/node-gyp": "^3.0.0", + "@npmcli/node-gyp": "^4.0.0", "@npmcli/package-json": "^6.0.1", "@npmcli/query": "^3.1.0", "@npmcli/redact": "^3.0.0", diff --git a/workspaces/arborist/package.json b/workspaces/arborist/package.json index 6aa4e4f67b4d1..ff10b4c11b107 100644 --- a/workspaces/arborist/package.json +++ b/workspaces/arborist/package.json @@ -9,7 +9,7 @@ "@npmcli/map-workspaces": "^4.0.1", "@npmcli/metavuln-calculator": "^8.0.0", "@npmcli/name-from-folder": "^3.0.0", - "@npmcli/node-gyp": "^3.0.0", + "@npmcli/node-gyp": "^4.0.0", "@npmcli/package-json": "^6.0.1", "@npmcli/query": "^3.1.0", "@npmcli/redact": "^3.0.0",