From 820e983b1d5a82d6c9c10895487c2e43b423d6ef Mon Sep 17 00:00:00 2001 From: reggi Date: Wed, 2 Oct 2024 13:26:27 -0400 Subject: [PATCH] deps: update @npmcli/installed-package-contents@3.0.0 --- node_modules/.gitignore | 13 +- .../npm-normalize-package-bin}/LICENSE | 0 .../npm-normalize-package-bin/lib/index.js | 0 .../npm-normalize-package-bin/package.json | 0 .../installed-package-contents/package.json | 23 ++-- .../installed-package-contents}/LICENSE | 0 .../installed-package-contents/bin/index.js | 0 .../installed-package-contents/lib/index.js | 0 .../installed-package-contents/package.json | 23 ++-- .../node_modules/npm-bundled/LICENSE | 0 .../node_modules/npm-bundled/lib/index.js | 0 .../node_modules/npm-bundled/package.json | 48 ++++++++ .../npm-normalize-package-bin/LICENSE | 15 +++ .../npm-normalize-package-bin/lib/index.js | 64 ++++++++++ .../npm-normalize-package-bin}/package.json | 24 ++-- node_modules/npm-bundled/package.json | 19 +-- package-lock.json | 116 ++++++++++-------- workspaces/arborist/package.json | 2 +- workspaces/libnpmdiff/package.json | 2 +- 19 files changed, 243 insertions(+), 106 deletions(-) rename node_modules/{pacote/node_modules/@npmcli/installed-package-contents => @npmcli/installed-package-contents/node_modules/npm-normalize-package-bin}/LICENSE (100%) rename node_modules/{pacote => @npmcli/installed-package-contents}/node_modules/npm-normalize-package-bin/lib/index.js (100%) rename node_modules/{pacote => @npmcli/installed-package-contents}/node_modules/npm-normalize-package-bin/package.json (100%) rename node_modules/{pacote/node_modules/npm-normalize-package-bin => @npmcli/metavuln-calculator/node_modules/@npmcli/installed-package-contents}/LICENSE (100%) rename node_modules/{pacote => @npmcli/metavuln-calculator}/node_modules/@npmcli/installed-package-contents/bin/index.js (100%) rename node_modules/{pacote => @npmcli/metavuln-calculator}/node_modules/@npmcli/installed-package-contents/lib/index.js (100%) rename node_modules/{pacote => @npmcli/metavuln-calculator}/node_modules/@npmcli/installed-package-contents/package.json (65%) rename node_modules/{pacote => @npmcli/metavuln-calculator}/node_modules/npm-bundled/LICENSE (100%) rename node_modules/{pacote => @npmcli/metavuln-calculator}/node_modules/npm-bundled/lib/index.js (100%) create mode 100644 node_modules/@npmcli/metavuln-calculator/node_modules/npm-bundled/package.json create mode 100644 node_modules/npm-bundled/node_modules/npm-normalize-package-bin/LICENSE create mode 100644 node_modules/npm-bundled/node_modules/npm-normalize-package-bin/lib/index.js rename node_modules/{pacote/node_modules/npm-bundled => npm-bundled/node_modules/npm-normalize-package-bin}/package.json (74%) diff --git a/node_modules/.gitignore b/node_modules/.gitignore index 40113bcf2a820..b17cf5a8b16a8 100644 --- a/node_modules/.gitignore +++ b/node_modules/.gitignore @@ -20,6 +20,9 @@ !/@npmcli/fs !/@npmcli/git !/@npmcli/installed-package-contents +!/@npmcli/installed-package-contents/node_modules/ +/@npmcli/installed-package-contents/node_modules/* +!/@npmcli/installed-package-contents/node_modules/npm-normalize-package-bin !/@npmcli/map-workspaces !/@npmcli/map-workspaces/node_modules/ /@npmcli/map-workspaces/node_modules/* @@ -34,6 +37,7 @@ !/@npmcli/metavuln-calculator/node_modules/@npmcli/agent !/@npmcli/metavuln-calculator/node_modules/@npmcli/fs !/@npmcli/metavuln-calculator/node_modules/@npmcli/git +!/@npmcli/metavuln-calculator/node_modules/@npmcli/installed-package-contents !/@npmcli/metavuln-calculator/node_modules/@npmcli/package-json !/@npmcli/metavuln-calculator/node_modules/@npmcli/promise-spawn !/@npmcli/metavuln-calculator/node_modules/@npmcli/redact @@ -45,6 +49,7 @@ !/@npmcli/metavuln-calculator/node_modules/json-parse-even-better-errors !/@npmcli/metavuln-calculator/node_modules/make-fetch-happen !/@npmcli/metavuln-calculator/node_modules/normalize-package-data +!/@npmcli/metavuln-calculator/node_modules/npm-bundled !/@npmcli/metavuln-calculator/node_modules/npm-install-checks !/@npmcli/metavuln-calculator/node_modules/npm-package-arg !/@npmcli/metavuln-calculator/node_modules/npm-pick-manifest @@ -226,6 +231,9 @@ !/normalize-package-data !/npm-audit-report !/npm-bundled +!/npm-bundled/node_modules/ +/npm-bundled/node_modules/* +!/npm-bundled/node_modules/npm-normalize-package-bin !/npm-install-checks !/npm-normalize-package-bin !/npm-package-arg @@ -246,12 +254,7 @@ !/pacote !/pacote/node_modules/ /pacote/node_modules/* -!/pacote/node_modules/@npmcli/ -/pacote/node_modules/@npmcli/* -!/pacote/node_modules/@npmcli/installed-package-contents !/pacote/node_modules/ignore-walk -!/pacote/node_modules/npm-bundled -!/pacote/node_modules/npm-normalize-package-bin !/pacote/node_modules/npm-packlist !/parse-conflict-json !/path-key diff --git a/node_modules/pacote/node_modules/@npmcli/installed-package-contents/LICENSE b/node_modules/@npmcli/installed-package-contents/node_modules/npm-normalize-package-bin/LICENSE similarity index 100% rename from node_modules/pacote/node_modules/@npmcli/installed-package-contents/LICENSE rename to node_modules/@npmcli/installed-package-contents/node_modules/npm-normalize-package-bin/LICENSE diff --git a/node_modules/pacote/node_modules/npm-normalize-package-bin/lib/index.js b/node_modules/@npmcli/installed-package-contents/node_modules/npm-normalize-package-bin/lib/index.js similarity index 100% rename from node_modules/pacote/node_modules/npm-normalize-package-bin/lib/index.js rename to node_modules/@npmcli/installed-package-contents/node_modules/npm-normalize-package-bin/lib/index.js diff --git a/node_modules/pacote/node_modules/npm-normalize-package-bin/package.json b/node_modules/@npmcli/installed-package-contents/node_modules/npm-normalize-package-bin/package.json similarity index 100% rename from node_modules/pacote/node_modules/npm-normalize-package-bin/package.json rename to node_modules/@npmcli/installed-package-contents/node_modules/npm-normalize-package-bin/package.json diff --git a/node_modules/@npmcli/installed-package-contents/package.json b/node_modules/@npmcli/installed-package-contents/package.json index 132256430a6c1..d5b68a737daf4 100644 --- a/node_modules/@npmcli/installed-package-contents/package.json +++ b/node_modules/@npmcli/installed-package-contents/package.json @@ -1,6 +1,6 @@ { "name": "@npmcli/installed-package-contents", - "version": "2.1.0", + "version": "3.0.0", "description": "Get the list of files installed in a package in node_modules, including bundled dependencies", "author": "GitHub Inc.", "main": "lib/index.js", @@ -11,35 +11,36 @@ "scripts": { "test": "tap", "snap": "tap", - "lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"", + "lint": "npm run eslint", "postlint": "template-oss-check", "template-oss-apply": "template-oss-apply --force", - "lintfix": "npm run lint -- --fix", - "posttest": "npm run lint" + "lintfix": "npm run eslint -- --fix", + "posttest": "npm run lint", + "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"" }, "devDependencies": { - "@npmcli/eslint-config": "^4.0.0", - "@npmcli/template-oss": "4.21.4", + "@npmcli/eslint-config": "^5.0.0", + "@npmcli/template-oss": "4.23.3", "tap": "^16.3.0" }, "dependencies": { - "npm-bundled": "^3.0.0", - "npm-normalize-package-bin": "^3.0.0" + "npm-bundled": "^4.0.0", + "npm-normalize-package-bin": "^4.0.0" }, "repository": { "type": "git", - "url": "https://github.com/npm/installed-package-contents.git" + "url": "git+https://github.com/npm/installed-package-contents.git" }, "files": [ "bin/", "lib/" ], "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.21.4", + "version": "4.23.3", "publish": true }, "tap": { diff --git a/node_modules/pacote/node_modules/npm-normalize-package-bin/LICENSE b/node_modules/@npmcli/metavuln-calculator/node_modules/@npmcli/installed-package-contents/LICENSE similarity index 100% rename from node_modules/pacote/node_modules/npm-normalize-package-bin/LICENSE rename to node_modules/@npmcli/metavuln-calculator/node_modules/@npmcli/installed-package-contents/LICENSE diff --git a/node_modules/pacote/node_modules/@npmcli/installed-package-contents/bin/index.js b/node_modules/@npmcli/metavuln-calculator/node_modules/@npmcli/installed-package-contents/bin/index.js similarity index 100% rename from node_modules/pacote/node_modules/@npmcli/installed-package-contents/bin/index.js rename to node_modules/@npmcli/metavuln-calculator/node_modules/@npmcli/installed-package-contents/bin/index.js diff --git a/node_modules/pacote/node_modules/@npmcli/installed-package-contents/lib/index.js b/node_modules/@npmcli/metavuln-calculator/node_modules/@npmcli/installed-package-contents/lib/index.js similarity index 100% rename from node_modules/pacote/node_modules/@npmcli/installed-package-contents/lib/index.js rename to node_modules/@npmcli/metavuln-calculator/node_modules/@npmcli/installed-package-contents/lib/index.js diff --git a/node_modules/pacote/node_modules/@npmcli/installed-package-contents/package.json b/node_modules/@npmcli/metavuln-calculator/node_modules/@npmcli/installed-package-contents/package.json similarity index 65% rename from node_modules/pacote/node_modules/@npmcli/installed-package-contents/package.json rename to node_modules/@npmcli/metavuln-calculator/node_modules/@npmcli/installed-package-contents/package.json index d5b68a737daf4..132256430a6c1 100644 --- a/node_modules/pacote/node_modules/@npmcli/installed-package-contents/package.json +++ b/node_modules/@npmcli/metavuln-calculator/node_modules/@npmcli/installed-package-contents/package.json @@ -1,6 +1,6 @@ { "name": "@npmcli/installed-package-contents", - "version": "3.0.0", + "version": "2.1.0", "description": "Get the list of files installed in a package in node_modules, including bundled dependencies", "author": "GitHub Inc.", "main": "lib/index.js", @@ -11,36 +11,35 @@ "scripts": { "test": "tap", "snap": "tap", - "lint": "npm run eslint", + "lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"", "postlint": "template-oss-check", "template-oss-apply": "template-oss-apply --force", - "lintfix": "npm run eslint -- --fix", - "posttest": "npm run lint", - "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"" + "lintfix": "npm run lint -- --fix", + "posttest": "npm run lint" }, "devDependencies": { - "@npmcli/eslint-config": "^5.0.0", - "@npmcli/template-oss": "4.23.3", + "@npmcli/eslint-config": "^4.0.0", + "@npmcli/template-oss": "4.21.4", "tap": "^16.3.0" }, "dependencies": { - "npm-bundled": "^4.0.0", - "npm-normalize-package-bin": "^4.0.0" + "npm-bundled": "^3.0.0", + "npm-normalize-package-bin": "^3.0.0" }, "repository": { "type": "git", - "url": "git+https://github.com/npm/installed-package-contents.git" + "url": "https://github.com/npm/installed-package-contents.git" }, "files": [ "bin/", "lib/" ], "engines": { - "node": "^18.17.0 || >=20.5.0" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.23.3", + "version": "4.21.4", "publish": true }, "tap": { diff --git a/node_modules/pacote/node_modules/npm-bundled/LICENSE b/node_modules/@npmcli/metavuln-calculator/node_modules/npm-bundled/LICENSE similarity index 100% rename from node_modules/pacote/node_modules/npm-bundled/LICENSE rename to node_modules/@npmcli/metavuln-calculator/node_modules/npm-bundled/LICENSE diff --git a/node_modules/pacote/node_modules/npm-bundled/lib/index.js b/node_modules/@npmcli/metavuln-calculator/node_modules/npm-bundled/lib/index.js similarity index 100% rename from node_modules/pacote/node_modules/npm-bundled/lib/index.js rename to node_modules/@npmcli/metavuln-calculator/node_modules/npm-bundled/lib/index.js diff --git a/node_modules/@npmcli/metavuln-calculator/node_modules/npm-bundled/package.json b/node_modules/@npmcli/metavuln-calculator/node_modules/npm-bundled/package.json new file mode 100644 index 0000000000000..2744ca6af67fc --- /dev/null +++ b/node_modules/@npmcli/metavuln-calculator/node_modules/npm-bundled/package.json @@ -0,0 +1,48 @@ +{ + "name": "npm-bundled", + "version": "3.0.1", + "description": "list things in node_modules that are bundledDependencies, or transitive dependencies thereof", + "main": "lib/index.js", + "repository": { + "type": "git", + "url": "git+https://github.com/npm/npm-bundled.git" + }, + "author": "GitHub Inc.", + "license": "ISC", + "devDependencies": { + "@npmcli/eslint-config": "^4.0.0", + "@npmcli/template-oss": "4.22.0", + "mutate-fs": "^2.1.1", + "tap": "^16.3.0" + }, + "scripts": { + "test": "tap", + "lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"", + "postlint": "template-oss-check", + "template-oss-apply": "template-oss-apply --force", + "lintfix": "npm run lint -- --fix", + "snap": "tap", + "posttest": "npm run lint" + }, + "files": [ + "bin/", + "lib/" + ], + "dependencies": { + "npm-normalize-package-bin": "^3.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + }, + "templateOSS": { + "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", + "version": "4.22.0", + "publish": true + }, + "tap": { + "nyc-arg": [ + "--exclude", + "tap-snapshots/**" + ] + } +} diff --git a/node_modules/npm-bundled/node_modules/npm-normalize-package-bin/LICENSE b/node_modules/npm-bundled/node_modules/npm-normalize-package-bin/LICENSE new file mode 100644 index 0000000000000..19cec97b18468 --- /dev/null +++ b/node_modules/npm-bundled/node_modules/npm-normalize-package-bin/LICENSE @@ -0,0 +1,15 @@ +The ISC License + +Copyright (c) npm, Inc. + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR +IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/node_modules/npm-bundled/node_modules/npm-normalize-package-bin/lib/index.js b/node_modules/npm-bundled/node_modules/npm-normalize-package-bin/lib/index.js new file mode 100644 index 0000000000000..3cb8478cf6e2f --- /dev/null +++ b/node_modules/npm-bundled/node_modules/npm-normalize-package-bin/lib/index.js @@ -0,0 +1,64 @@ +// pass in a manifest with a 'bin' field here, and it'll turn it +// into a properly santized bin object +const { join, basename } = require('path') + +const normalize = pkg => + !pkg.bin ? removeBin(pkg) + : typeof pkg.bin === 'string' ? normalizeString(pkg) + : Array.isArray(pkg.bin) ? normalizeArray(pkg) + : typeof pkg.bin === 'object' ? normalizeObject(pkg) + : removeBin(pkg) + +const normalizeString = pkg => { + if (!pkg.name) { + return removeBin(pkg) + } + pkg.bin = { [pkg.name]: pkg.bin } + return normalizeObject(pkg) +} + +const normalizeArray = pkg => { + pkg.bin = pkg.bin.reduce((acc, k) => { + acc[basename(k)] = k + return acc + }, {}) + return normalizeObject(pkg) +} + +const removeBin = pkg => { + delete pkg.bin + return pkg +} + +const normalizeObject = pkg => { + const orig = pkg.bin + const clean = {} + let hasBins = false + Object.keys(orig).forEach(binKey => { + const base = join('/', basename(binKey.replace(/\\|:/g, '/'))).slice(1) + + if (typeof orig[binKey] !== 'string' || !base) { + return + } + + const binTarget = join('/', orig[binKey].replace(/\\/g, '/')) + .replace(/\\/g, '/').slice(1) + + if (!binTarget) { + return + } + + clean[base] = binTarget + hasBins = true + }) + + if (hasBins) { + pkg.bin = clean + } else { + delete pkg.bin + } + + return pkg +} + +module.exports = normalize diff --git a/node_modules/pacote/node_modules/npm-bundled/package.json b/node_modules/npm-bundled/node_modules/npm-normalize-package-bin/package.json similarity index 74% rename from node_modules/pacote/node_modules/npm-bundled/package.json rename to node_modules/npm-bundled/node_modules/npm-normalize-package-bin/package.json index c5daf35dbaa84..a1aeef0e1e751 100644 --- a/node_modules/pacote/node_modules/npm-bundled/package.json +++ b/node_modules/npm-bundled/node_modules/npm-normalize-package-bin/package.json @@ -1,44 +1,40 @@ { - "name": "npm-bundled", + "name": "npm-normalize-package-bin", "version": "4.0.0", - "description": "list things in node_modules that are bundledDependencies, or transitive dependencies thereof", + "description": "Turn any flavor of allowable package.json bin into a normalized object", "main": "lib/index.js", "repository": { "type": "git", - "url": "git+https://github.com/npm/npm-bundled.git" + "url": "git+https://github.com/npm/npm-normalize-package-bin.git" }, "author": "GitHub Inc.", "license": "ISC", - "devDependencies": { - "@npmcli/eslint-config": "^5.0.0", - "@npmcli/template-oss": "4.23.3", - "mutate-fs": "^2.1.1", - "tap": "^16.3.0" - }, "scripts": { "test": "tap", + "snap": "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}\"" }, + "devDependencies": { + "@npmcli/eslint-config": "^5.0.0", + "@npmcli/template-oss": "4.23.3", + "tap": "^16.3.0" + }, "files": [ "bin/", "lib/" ], - "dependencies": { - "npm-normalize-package-bin": "^4.0.0" - }, "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 + "publish": "true" }, "tap": { "nyc-arg": [ diff --git a/node_modules/npm-bundled/package.json b/node_modules/npm-bundled/package.json index 2744ca6af67fc..c5daf35dbaa84 100644 --- a/node_modules/npm-bundled/package.json +++ b/node_modules/npm-bundled/package.json @@ -1,6 +1,6 @@ { "name": "npm-bundled", - "version": "3.0.1", + "version": "4.0.0", "description": "list things in node_modules that are bundledDependencies, or transitive dependencies thereof", "main": "lib/index.js", "repository": { @@ -10,33 +10,34 @@ "author": "GitHub Inc.", "license": "ISC", "devDependencies": { - "@npmcli/eslint-config": "^4.0.0", - "@npmcli/template-oss": "4.22.0", + "@npmcli/eslint-config": "^5.0.0", + "@npmcli/template-oss": "4.23.3", "mutate-fs": "^2.1.1", "tap": "^16.3.0" }, "scripts": { "test": "tap", - "lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"", + "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}\"" }, "files": [ "bin/", "lib/" ], "dependencies": { - "npm-normalize-package-bin": "^3.0.0" + "npm-normalize-package-bin": "^4.0.0" }, "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.22.0", + "version": "4.23.3", "publish": true }, "tap": { diff --git a/package-lock.json b/package-lock.json index f787751d6fc2c..2e919cb38516f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1606,19 +1606,30 @@ } }, "node_modules/@npmcli/installed-package-contents": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.1.0.tgz", - "integrity": "sha512-c8UuGLeZpm69BryRykLuKRyKFZYJsZSCT4aVY5ds4omyZqJ172ApzgfKJ5eV/r3HgLdUYgFVe54KSFVjKoe27w==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-3.0.0.tgz", + "integrity": "sha512-fkxoPuFGvxyrH+OQzyTkX2LUEamrF4jZSmxjAtPPHHGO0dqsQ8tTKjnIS8SAnPHdk2I03BDtSMR5K/4loKg79Q==", + "inBundle": true, "license": "ISC", "dependencies": { - "npm-bundled": "^3.0.0", - "npm-normalize-package-bin": "^3.0.0" + "npm-bundled": "^4.0.0", + "npm-normalize-package-bin": "^4.0.0" }, "bin": { "installed-package-contents": "bin/index.js" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" + } + }, + "node_modules/@npmcli/installed-package-contents/node_modules/npm-normalize-package-bin": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-4.0.0.tgz", + "integrity": "sha512-TZKxPvItzai9kN9H/TkmCtx/ZN/hvr3vUycjlfmH0ootY9yFBzNOpiXAdIn1Iteqsvk4lQn6B5PTrt+n6h8k/w==", + "inBundle": true, + "license": "ISC", + "engines": { + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@npmcli/map-workspaces": { @@ -1711,6 +1722,22 @@ "node": "^16.14.0 || >=18.0.0" } }, + "node_modules/@npmcli/metavuln-calculator/node_modules/@npmcli/installed-package-contents": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.1.0.tgz", + "integrity": "sha512-c8UuGLeZpm69BryRykLuKRyKFZYJsZSCT4aVY5ds4omyZqJ172ApzgfKJ5eV/r3HgLdUYgFVe54KSFVjKoe27w==", + "license": "ISC", + "dependencies": { + "npm-bundled": "^3.0.0", + "npm-normalize-package-bin": "^3.0.0" + }, + "bin": { + "installed-package-contents": "bin/index.js" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, "node_modules/@npmcli/metavuln-calculator/node_modules/@npmcli/package-json": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-5.2.1.tgz", @@ -1866,6 +1893,18 @@ "node": "^16.14.0 || >=18.0.0" } }, + "node_modules/@npmcli/metavuln-calculator/node_modules/npm-bundled": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.1.tgz", + "integrity": "sha512-+AvaheE/ww1JEwRHOrn4WHNzOxGtVp+adrg2AeZS/7KuxGUYFuBta98wYpfHBbJp6Tg6j1NKSEVHNcfZzJHQwQ==", + "license": "ISC", + "dependencies": { + "npm-normalize-package-bin": "^3.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, "node_modules/@npmcli/metavuln-calculator/node_modules/npm-install-checks": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.3.0.tgz", @@ -10473,15 +10512,26 @@ } }, "node_modules/npm-bundled": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.1.tgz", - "integrity": "sha512-+AvaheE/ww1JEwRHOrn4WHNzOxGtVp+adrg2AeZS/7KuxGUYFuBta98wYpfHBbJp6Tg6j1NKSEVHNcfZzJHQwQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-4.0.0.tgz", + "integrity": "sha512-IxaQZDMsqfQ2Lz37VvyyEtKLe8FsRZuysmedy/N06TU1RyVppYKXrO4xIhR0F+7ubIBox6Q7nir6fQI3ej39iA==", + "inBundle": true, "license": "ISC", "dependencies": { - "npm-normalize-package-bin": "^3.0.0" + "npm-normalize-package-bin": "^4.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" + } + }, + "node_modules/npm-bundled/node_modules/npm-normalize-package-bin": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-4.0.0.tgz", + "integrity": "sha512-TZKxPvItzai9kN9H/TkmCtx/ZN/hvr3vUycjlfmH0ootY9yFBzNOpiXAdIn1Iteqsvk4lQn6B5PTrt+n6h8k/w==", + "inBundle": true, + "license": "ISC", + "engines": { + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/npm-install-checks": { @@ -11262,23 +11312,6 @@ "node": "^18.17.0 || >=20.5.0" } }, - "node_modules/pacote/node_modules/@npmcli/installed-package-contents": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-3.0.0.tgz", - "integrity": "sha512-fkxoPuFGvxyrH+OQzyTkX2LUEamrF4jZSmxjAtPPHHGO0dqsQ8tTKjnIS8SAnPHdk2I03BDtSMR5K/4loKg79Q==", - "inBundle": true, - "license": "ISC", - "dependencies": { - "npm-bundled": "^4.0.0", - "npm-normalize-package-bin": "^4.0.0" - }, - "bin": { - "installed-package-contents": "bin/index.js" - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" - } - }, "node_modules/pacote/node_modules/ignore-walk": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-7.0.0.tgz", @@ -11292,29 +11325,6 @@ "node": "^18.17.0 || >=20.5.0" } }, - "node_modules/pacote/node_modules/npm-bundled": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-4.0.0.tgz", - "integrity": "sha512-IxaQZDMsqfQ2Lz37VvyyEtKLe8FsRZuysmedy/N06TU1RyVppYKXrO4xIhR0F+7ubIBox6Q7nir6fQI3ej39iA==", - "inBundle": true, - "license": "ISC", - "dependencies": { - "npm-normalize-package-bin": "^4.0.0" - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" - } - }, - "node_modules/pacote/node_modules/npm-normalize-package-bin": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-4.0.0.tgz", - "integrity": "sha512-TZKxPvItzai9kN9H/TkmCtx/ZN/hvr3vUycjlfmH0ootY9yFBzNOpiXAdIn1Iteqsvk4lQn6B5PTrt+n6h8k/w==", - "inBundle": true, - "license": "ISC", - "engines": { - "node": "^18.17.0 || >=20.5.0" - } - }, "node_modules/pacote/node_modules/npm-packlist": { "version": "9.0.0", "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-9.0.0.tgz", @@ -17055,7 +17065,7 @@ "dependencies": { "@isaacs/string-locale-compare": "^1.1.0", "@npmcli/fs": "^4.0.0", - "@npmcli/installed-package-contents": "^2.1.0", + "@npmcli/installed-package-contents": "^3.0.0", "@npmcli/map-workspaces": "^4.0.1", "@npmcli/metavuln-calculator": "^7.1.1", "@npmcli/name-from-folder": "^2.0.0", @@ -17153,7 +17163,7 @@ "license": "ISC", "dependencies": { "@npmcli/arborist": "^7.5.4", - "@npmcli/installed-package-contents": "^2.1.0", + "@npmcli/installed-package-contents": "^3.0.0", "binary-extensions": "^2.3.0", "diff": "^5.1.0", "minimatch": "^9.0.4", diff --git a/workspaces/arborist/package.json b/workspaces/arborist/package.json index 47b39cf57253a..bec39143f154f 100644 --- a/workspaces/arborist/package.json +++ b/workspaces/arborist/package.json @@ -5,7 +5,7 @@ "dependencies": { "@isaacs/string-locale-compare": "^1.1.0", "@npmcli/fs": "^4.0.0", - "@npmcli/installed-package-contents": "^2.1.0", + "@npmcli/installed-package-contents": "^3.0.0", "@npmcli/map-workspaces": "^4.0.1", "@npmcli/metavuln-calculator": "^7.1.1", "@npmcli/name-from-folder": "^2.0.0", diff --git a/workspaces/libnpmdiff/package.json b/workspaces/libnpmdiff/package.json index 295cc05c7b519..ee7f098aeb316 100644 --- a/workspaces/libnpmdiff/package.json +++ b/workspaces/libnpmdiff/package.json @@ -48,7 +48,7 @@ }, "dependencies": { "@npmcli/arborist": "^7.5.4", - "@npmcli/installed-package-contents": "^2.1.0", + "@npmcli/installed-package-contents": "^3.0.0", "binary-extensions": "^2.3.0", "diff": "^5.1.0", "minimatch": "^9.0.4",