Skip to content

Commit 820e983

Browse files
committed
deps: update @npmcli/[email protected]
1 parent 9cd6603 commit 820e983

File tree

19 files changed

+243
-106
lines changed

19 files changed

+243
-106
lines changed

node_modules/.gitignore

+8-5
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
!/@npmcli/fs
2121
!/@npmcli/git
2222
!/@npmcli/installed-package-contents
23+
!/@npmcli/installed-package-contents/node_modules/
24+
/@npmcli/installed-package-contents/node_modules/*
25+
!/@npmcli/installed-package-contents/node_modules/npm-normalize-package-bin
2326
!/@npmcli/map-workspaces
2427
!/@npmcli/map-workspaces/node_modules/
2528
/@npmcli/map-workspaces/node_modules/*
@@ -34,6 +37,7 @@
3437
!/@npmcli/metavuln-calculator/node_modules/@npmcli/agent
3538
!/@npmcli/metavuln-calculator/node_modules/@npmcli/fs
3639
!/@npmcli/metavuln-calculator/node_modules/@npmcli/git
40+
!/@npmcli/metavuln-calculator/node_modules/@npmcli/installed-package-contents
3741
!/@npmcli/metavuln-calculator/node_modules/@npmcli/package-json
3842
!/@npmcli/metavuln-calculator/node_modules/@npmcli/promise-spawn
3943
!/@npmcli/metavuln-calculator/node_modules/@npmcli/redact
@@ -45,6 +49,7 @@
4549
!/@npmcli/metavuln-calculator/node_modules/json-parse-even-better-errors
4650
!/@npmcli/metavuln-calculator/node_modules/make-fetch-happen
4751
!/@npmcli/metavuln-calculator/node_modules/normalize-package-data
52+
!/@npmcli/metavuln-calculator/node_modules/npm-bundled
4853
!/@npmcli/metavuln-calculator/node_modules/npm-install-checks
4954
!/@npmcli/metavuln-calculator/node_modules/npm-package-arg
5055
!/@npmcli/metavuln-calculator/node_modules/npm-pick-manifest
@@ -226,6 +231,9 @@
226231
!/normalize-package-data
227232
!/npm-audit-report
228233
!/npm-bundled
234+
!/npm-bundled/node_modules/
235+
/npm-bundled/node_modules/*
236+
!/npm-bundled/node_modules/npm-normalize-package-bin
229237
!/npm-install-checks
230238
!/npm-normalize-package-bin
231239
!/npm-package-arg
@@ -246,12 +254,7 @@
246254
!/pacote
247255
!/pacote/node_modules/
248256
/pacote/node_modules/*
249-
!/pacote/node_modules/@npmcli/
250-
/pacote/node_modules/@npmcli/*
251-
!/pacote/node_modules/@npmcli/installed-package-contents
252257
!/pacote/node_modules/ignore-walk
253-
!/pacote/node_modules/npm-bundled
254-
!/pacote/node_modules/npm-normalize-package-bin
255258
!/pacote/node_modules/npm-packlist
256259
!/parse-conflict-json
257260
!/path-key

node_modules/@npmcli/installed-package-contents/package.json

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@npmcli/installed-package-contents",
3-
"version": "2.1.0",
3+
"version": "3.0.0",
44
"description": "Get the list of files installed in a package in node_modules, including bundled dependencies",
55
"author": "GitHub Inc.",
66
"main": "lib/index.js",
@@ -11,35 +11,36 @@
1111
"scripts": {
1212
"test": "tap",
1313
"snap": "tap",
14-
"lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
14+
"lint": "npm run eslint",
1515
"postlint": "template-oss-check",
1616
"template-oss-apply": "template-oss-apply --force",
17-
"lintfix": "npm run lint -- --fix",
18-
"posttest": "npm run lint"
17+
"lintfix": "npm run eslint -- --fix",
18+
"posttest": "npm run lint",
19+
"eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
1920
},
2021
"devDependencies": {
21-
"@npmcli/eslint-config": "^4.0.0",
22-
"@npmcli/template-oss": "4.21.4",
22+
"@npmcli/eslint-config": "^5.0.0",
23+
"@npmcli/template-oss": "4.23.3",
2324
"tap": "^16.3.0"
2425
},
2526
"dependencies": {
26-
"npm-bundled": "^3.0.0",
27-
"npm-normalize-package-bin": "^3.0.0"
27+
"npm-bundled": "^4.0.0",
28+
"npm-normalize-package-bin": "^4.0.0"
2829
},
2930
"repository": {
3031
"type": "git",
31-
"url": "https://github.com/npm/installed-package-contents.git"
32+
"url": "git+https://github.com/npm/installed-package-contents.git"
3233
},
3334
"files": [
3435
"bin/",
3536
"lib/"
3637
],
3738
"engines": {
38-
"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
39+
"node": "^18.17.0 || >=20.5.0"
3940
},
4041
"templateOSS": {
4142
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
42-
"version": "4.21.4",
43+
"version": "4.23.3",
4344
"publish": true
4445
},
4546
"tap": {

node_modules/pacote/node_modules/@npmcli/installed-package-contents/package.json node_modules/@npmcli/metavuln-calculator/node_modules/@npmcli/installed-package-contents/package.json

+11-12
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@npmcli/installed-package-contents",
3-
"version": "3.0.0",
3+
"version": "2.1.0",
44
"description": "Get the list of files installed in a package in node_modules, including bundled dependencies",
55
"author": "GitHub Inc.",
66
"main": "lib/index.js",
@@ -11,36 +11,35 @@
1111
"scripts": {
1212
"test": "tap",
1313
"snap": "tap",
14-
"lint": "npm run eslint",
14+
"lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
1515
"postlint": "template-oss-check",
1616
"template-oss-apply": "template-oss-apply --force",
17-
"lintfix": "npm run eslint -- --fix",
18-
"posttest": "npm run lint",
19-
"eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
17+
"lintfix": "npm run lint -- --fix",
18+
"posttest": "npm run lint"
2019
},
2120
"devDependencies": {
22-
"@npmcli/eslint-config": "^5.0.0",
23-
"@npmcli/template-oss": "4.23.3",
21+
"@npmcli/eslint-config": "^4.0.0",
22+
"@npmcli/template-oss": "4.21.4",
2423
"tap": "^16.3.0"
2524
},
2625
"dependencies": {
27-
"npm-bundled": "^4.0.0",
28-
"npm-normalize-package-bin": "^4.0.0"
26+
"npm-bundled": "^3.0.0",
27+
"npm-normalize-package-bin": "^3.0.0"
2928
},
3029
"repository": {
3130
"type": "git",
32-
"url": "git+https://github.com/npm/installed-package-contents.git"
31+
"url": "https://github.com/npm/installed-package-contents.git"
3332
},
3433
"files": [
3534
"bin/",
3635
"lib/"
3736
],
3837
"engines": {
39-
"node": "^18.17.0 || >=20.5.0"
38+
"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
4039
},
4140
"templateOSS": {
4241
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
43-
"version": "4.23.3",
42+
"version": "4.21.4",
4443
"publish": true
4544
},
4645
"tap": {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"name": "npm-bundled",
3+
"version": "3.0.1",
4+
"description": "list things in node_modules that are bundledDependencies, or transitive dependencies thereof",
5+
"main": "lib/index.js",
6+
"repository": {
7+
"type": "git",
8+
"url": "git+https://github.com/npm/npm-bundled.git"
9+
},
10+
"author": "GitHub Inc.",
11+
"license": "ISC",
12+
"devDependencies": {
13+
"@npmcli/eslint-config": "^4.0.0",
14+
"@npmcli/template-oss": "4.22.0",
15+
"mutate-fs": "^2.1.1",
16+
"tap": "^16.3.0"
17+
},
18+
"scripts": {
19+
"test": "tap",
20+
"lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
21+
"postlint": "template-oss-check",
22+
"template-oss-apply": "template-oss-apply --force",
23+
"lintfix": "npm run lint -- --fix",
24+
"snap": "tap",
25+
"posttest": "npm run lint"
26+
},
27+
"files": [
28+
"bin/",
29+
"lib/"
30+
],
31+
"dependencies": {
32+
"npm-normalize-package-bin": "^3.0.0"
33+
},
34+
"engines": {
35+
"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
36+
},
37+
"templateOSS": {
38+
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
39+
"version": "4.22.0",
40+
"publish": true
41+
},
42+
"tap": {
43+
"nyc-arg": [
44+
"--exclude",
45+
"tap-snapshots/**"
46+
]
47+
}
48+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
The ISC License
2+
3+
Copyright (c) npm, Inc.
4+
5+
Permission to use, copy, modify, and/or distribute this software for any
6+
purpose with or without fee is hereby granted, provided that the above
7+
copyright notice and this permission notice appear in all copies.
8+
9+
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10+
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11+
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12+
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13+
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14+
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
15+
IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
// pass in a manifest with a 'bin' field here, and it'll turn it
2+
// into a properly santized bin object
3+
const { join, basename } = require('path')
4+
5+
const normalize = pkg =>
6+
!pkg.bin ? removeBin(pkg)
7+
: typeof pkg.bin === 'string' ? normalizeString(pkg)
8+
: Array.isArray(pkg.bin) ? normalizeArray(pkg)
9+
: typeof pkg.bin === 'object' ? normalizeObject(pkg)
10+
: removeBin(pkg)
11+
12+
const normalizeString = pkg => {
13+
if (!pkg.name) {
14+
return removeBin(pkg)
15+
}
16+
pkg.bin = { [pkg.name]: pkg.bin }
17+
return normalizeObject(pkg)
18+
}
19+
20+
const normalizeArray = pkg => {
21+
pkg.bin = pkg.bin.reduce((acc, k) => {
22+
acc[basename(k)] = k
23+
return acc
24+
}, {})
25+
return normalizeObject(pkg)
26+
}
27+
28+
const removeBin = pkg => {
29+
delete pkg.bin
30+
return pkg
31+
}
32+
33+
const normalizeObject = pkg => {
34+
const orig = pkg.bin
35+
const clean = {}
36+
let hasBins = false
37+
Object.keys(orig).forEach(binKey => {
38+
const base = join('/', basename(binKey.replace(/\\|:/g, '/'))).slice(1)
39+
40+
if (typeof orig[binKey] !== 'string' || !base) {
41+
return
42+
}
43+
44+
const binTarget = join('/', orig[binKey].replace(/\\/g, '/'))
45+
.replace(/\\/g, '/').slice(1)
46+
47+
if (!binTarget) {
48+
return
49+
}
50+
51+
clean[base] = binTarget
52+
hasBins = true
53+
})
54+
55+
if (hasBins) {
56+
pkg.bin = clean
57+
} else {
58+
delete pkg.bin
59+
}
60+
61+
return pkg
62+
}
63+
64+
module.exports = normalize

node_modules/pacote/node_modules/npm-bundled/package.json node_modules/npm-bundled/node_modules/npm-normalize-package-bin/package.json

+10-14
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,40 @@
11
{
2-
"name": "npm-bundled",
2+
"name": "npm-normalize-package-bin",
33
"version": "4.0.0",
4-
"description": "list things in node_modules that are bundledDependencies, or transitive dependencies thereof",
4+
"description": "Turn any flavor of allowable package.json bin into a normalized object",
55
"main": "lib/index.js",
66
"repository": {
77
"type": "git",
8-
"url": "git+https://github.com/npm/npm-bundled.git"
8+
"url": "git+https://github.com/npm/npm-normalize-package-bin.git"
99
},
1010
"author": "GitHub Inc.",
1111
"license": "ISC",
12-
"devDependencies": {
13-
"@npmcli/eslint-config": "^5.0.0",
14-
"@npmcli/template-oss": "4.23.3",
15-
"mutate-fs": "^2.1.1",
16-
"tap": "^16.3.0"
17-
},
1812
"scripts": {
1913
"test": "tap",
14+
"snap": "tap",
2015
"lint": "npm run eslint",
2116
"postlint": "template-oss-check",
2217
"template-oss-apply": "template-oss-apply --force",
2318
"lintfix": "npm run eslint -- --fix",
24-
"snap": "tap",
2519
"posttest": "npm run lint",
2620
"eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
2721
},
22+
"devDependencies": {
23+
"@npmcli/eslint-config": "^5.0.0",
24+
"@npmcli/template-oss": "4.23.3",
25+
"tap": "^16.3.0"
26+
},
2827
"files": [
2928
"bin/",
3029
"lib/"
3130
],
32-
"dependencies": {
33-
"npm-normalize-package-bin": "^4.0.0"
34-
},
3531
"engines": {
3632
"node": "^18.17.0 || >=20.5.0"
3733
},
3834
"templateOSS": {
3935
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
4036
"version": "4.23.3",
41-
"publish": true
37+
"publish": "true"
4238
},
4339
"tap": {
4440
"nyc-arg": [

node_modules/npm-bundled/package.json

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "npm-bundled",
3-
"version": "3.0.1",
3+
"version": "4.0.0",
44
"description": "list things in node_modules that are bundledDependencies, or transitive dependencies thereof",
55
"main": "lib/index.js",
66
"repository": {
@@ -10,33 +10,34 @@
1010
"author": "GitHub Inc.",
1111
"license": "ISC",
1212
"devDependencies": {
13-
"@npmcli/eslint-config": "^4.0.0",
14-
"@npmcli/template-oss": "4.22.0",
13+
"@npmcli/eslint-config": "^5.0.0",
14+
"@npmcli/template-oss": "4.23.3",
1515
"mutate-fs": "^2.1.1",
1616
"tap": "^16.3.0"
1717
},
1818
"scripts": {
1919
"test": "tap",
20-
"lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
20+
"lint": "npm run eslint",
2121
"postlint": "template-oss-check",
2222
"template-oss-apply": "template-oss-apply --force",
23-
"lintfix": "npm run lint -- --fix",
23+
"lintfix": "npm run eslint -- --fix",
2424
"snap": "tap",
25-
"posttest": "npm run lint"
25+
"posttest": "npm run lint",
26+
"eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
2627
},
2728
"files": [
2829
"bin/",
2930
"lib/"
3031
],
3132
"dependencies": {
32-
"npm-normalize-package-bin": "^3.0.0"
33+
"npm-normalize-package-bin": "^4.0.0"
3334
},
3435
"engines": {
35-
"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
36+
"node": "^18.17.0 || >=20.5.0"
3637
},
3738
"templateOSS": {
3839
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
39-
"version": "4.22.0",
40+
"version": "4.23.3",
4041
"publish": true
4142
},
4243
"tap": {

0 commit comments

Comments
 (0)