Skip to content

Commit de6618e

Browse files
nlfnlf
authored
deps: @npmcli/[email protected] (#5757)
1 parent 5625274 commit de6618e

File tree

12 files changed

+66
-115
lines changed

12 files changed

+66
-115
lines changed

‎DEPENDENCIES.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ graph LR;
207207
npmcli-metavuln-calculator-->pacote;
208208
npmcli-metavuln-calculator-->semver;
209209
npmcli-package-json-->json-parse-even-better-errors;
210-
npmcli-promise-spawn-->infer-owner;
211210
npmcli-run-script-->npmcli-node-gyp["@npmcli/node-gyp"];
212211
npmcli-run-script-->npmcli-promise-spawn["@npmcli/promise-spawn"];
213212
npmcli-run-script-->read-package-json-fast;
@@ -870,7 +869,6 @@ graph LR;
870869
npmcli-move-file-->mkdirp;
871870
npmcli-move-file-->rimraf;
872871
npmcli-package-json-->json-parse-even-better-errors;
873-
npmcli-promise-spawn-->infer-owner;
874872
npmcli-query-->postcss-selector-parser;
875873
npmcli-run-script-->node-gyp;
876874
npmcli-run-script-->npmcli-node-gyp["@npmcli/node-gyp"];
@@ -1102,5 +1100,5 @@ packages higher up the chain.
11021100
- npm-registry-fetch, libnpmversion
11031101
- @npmcli/git, make-fetch-happen, @npmcli/config, init-package-json
11041102
- @npmcli/installed-package-contents, @npmcli/map-workspaces, cacache, npm-pick-manifest, @npmcli/run-script, read-package-json, readdir-scoped-modules, promzard
1105-
- @npmcli/docs, npm-bundled, read-package-json-fast, @npmcli/fs, unique-filename, @npmcli/promise-spawn, npm-install-checks, npm-package-arg, npm-packlist, normalize-package-data, @npmcli/package-json, bin-links, nopt, npmlog, parse-conflict-json, dezalgo, read
1106-
- ignore-walk, @npmcli/eslint-config, @npmcli/template-oss, npm-normalize-package-bin, @npmcli/name-from-folder, json-parse-even-better-errors, semver, @npmcli/move-file, fs-minipass, ssri, unique-slug, infer-owner, hosted-git-info, proc-log, validate-npm-package-name, @npmcli/node-gyp, minipass-fetch, @npmcli/query, cmd-shim, read-cmd-shim, write-file-atomic, abbrev, are-we-there-yet, gauge, wrappy, treeverse, minify-registry-metadata, @npmcli/disparity-colors, @npmcli/ci-detect, mute-stream, ini, npm-audit-report, npm-user-validate
1103+
- @npmcli/docs, npm-bundled, read-package-json-fast, @npmcli/fs, unique-filename, npm-install-checks, npm-package-arg, npm-packlist, normalize-package-data, @npmcli/package-json, bin-links, nopt, npmlog, parse-conflict-json, dezalgo, read
1104+
- ignore-walk, @npmcli/eslint-config, @npmcli/template-oss, npm-normalize-package-bin, @npmcli/name-from-folder, json-parse-even-better-errors, semver, @npmcli/move-file, fs-minipass, ssri, unique-slug, @npmcli/promise-spawn, hosted-git-info, proc-log, validate-npm-package-name, @npmcli/node-gyp, minipass-fetch, @npmcli/query, cmd-shim, read-cmd-shim, write-file-atomic, abbrev, are-we-there-yet, gauge, wrappy, treeverse, minify-registry-metadata, @npmcli/disparity-colors, @npmcli/ci-detect, mute-stream, ini, npm-audit-report, npm-user-validate

‎node_modules/@npmcli/git/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@npmcli/git",
3-
"version": "4.0.1",
3+
"version": "4.0.2",
44
"main": "lib/index.js",
55
"files": [
66
"bin/",
@@ -32,14 +32,14 @@
3232
},
3333
"devDependencies": {
3434
"@npmcli/eslint-config": "^4.0.0",
35-
"@npmcli/template-oss": "4.5.1",
36-
"npm-package-arg": "^9.1.0",
35+
"@npmcli/template-oss": "4.7.1",
36+
"npm-package-arg": "^10.0.0",
3737
"rimraf": "^3.0.2",
3838
"slash": "^3.0.0",
3939
"tap": "^16.0.1"
4040
},
4141
"dependencies": {
42-
"@npmcli/promise-spawn": "^4.0.0",
42+
"@npmcli/promise-spawn": "^5.0.0",
4343
"lru-cache": "^7.4.4",
4444
"mkdirp": "^1.0.4",
4545
"npm-pick-manifest": "^8.0.0",
@@ -55,6 +55,6 @@
5555
"templateOSS": {
5656
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
5757
"windowsCI": false,
58-
"version": "4.5.1"
58+
"version": "4.7.1"
5959
}
6060
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name": "@npmcli/installed-package-contents",
3-
"version": "2.0.0",
3+
"version": "2.0.1",
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",
77
"bin": {
8-
"installed-package-contents": "index.js"
8+
"installed-package-contents": "lib/index.js"
99
},
1010
"license": "ISC",
1111
"scripts": {
@@ -19,7 +19,7 @@
1919
},
2020
"devDependencies": {
2121
"@npmcli/eslint-config": "^4.0.0",
22-
"@npmcli/template-oss": "4.5.1",
22+
"@npmcli/template-oss": "4.6.2",
2323
"mkdirp": "^1.0.4",
2424
"require-inject": "^1.4.4",
2525
"tap": "^16.3.0"
@@ -41,7 +41,7 @@
4141
},
4242
"templateOSS": {
4343
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
44-
"version": "4.5.1"
44+
"version": "4.6.2"
4545
},
4646
"tap": {
4747
"nyc-arg": [

‎node_modules/@npmcli/promise-spawn/lib/index.js

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
const { spawn } = require('child_process')
2-
const inferOwner = require('infer-owner')
32

43
const isPipe = (stdio = 'pipe', fd) =>
54
stdio === 'pipe' || stdio === null ? true
@@ -8,28 +7,6 @@ const isPipe = (stdio = 'pipe', fd) =>
87

98
// 'extra' object is for decorating the error a bit more
109
const promiseSpawn = (cmd, args, opts = {}, extra = {}) => {
11-
const cwd = opts.cwd || process.cwd()
12-
const isRoot = process.getuid && process.getuid() === 0
13-
const { uid, gid } = isRoot ? inferOwner.sync(cwd) : {}
14-
return promiseSpawnUid(cmd, args, {
15-
...opts,
16-
cwd,
17-
uid,
18-
gid,
19-
}, extra)
20-
}
21-
22-
const stdioResult = (stdout, stderr, { stdioString, stdio }) =>
23-
stdioString ? {
24-
stdout: isPipe(stdio, 1) ? Buffer.concat(stdout).toString() : null,
25-
stderr: isPipe(stdio, 2) ? Buffer.concat(stderr).toString() : null,
26-
}
27-
: {
28-
stdout: isPipe(stdio, 1) ? Buffer.concat(stdout) : null,
29-
stderr: isPipe(stdio, 2) ? Buffer.concat(stderr) : null,
30-
}
31-
32-
const promiseSpawnUid = (cmd, args, opts, extra) => {
3310
let proc
3411
const p = new Promise((res, rej) => {
3512
proc = spawn(cmd, args, opts)
@@ -72,4 +49,14 @@ const promiseSpawnUid = (cmd, args, opts, extra) => {
7249
return p
7350
}
7451

52+
const stdioResult = (stdout, stderr, { stdioString, stdio }) =>
53+
stdioString ? {
54+
stdout: isPipe(stdio, 1) ? Buffer.concat(stdout).toString().trim() : null,
55+
stderr: isPipe(stdio, 2) ? Buffer.concat(stderr).toString().trim() : null,
56+
}
57+
: {
58+
stdout: isPipe(stdio, 1) ? Buffer.concat(stdout) : null,
59+
stderr: isPipe(stdio, 2) ? Buffer.concat(stderr) : null,
60+
}
61+
7562
module.exports = promiseSpawn

‎node_modules/@npmcli/promise-spawn/package.json

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@npmcli/promise-spawn",
3-
"version": "4.0.0",
3+
"version": "5.0.0",
44
"files": [
55
"bin/",
66
"lib/"
@@ -31,8 +31,8 @@
3131
]
3232
},
3333
"devDependencies": {
34-
"@npmcli/eslint-config": "^3.0.1",
35-
"@npmcli/template-oss": "4.5.1",
34+
"@npmcli/eslint-config": "^4.0.0",
35+
"@npmcli/template-oss": "4.7.1",
3636
"minipass": "^3.1.1",
3737
"tap": "^16.0.1"
3838
},
@@ -41,9 +41,6 @@
4141
},
4242
"templateOSS": {
4343
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
44-
"version": "4.5.1"
45-
},
46-
"dependencies": {
47-
"infer-owner": "^1.0.4"
44+
"version": "4.7.1"
4845
}
4946
}

‎node_modules/@npmcli/run-script/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@npmcli/run-script",
3-
"version": "5.0.0",
3+
"version": "5.0.1",
44
"description": "Run a lifecycle script for a package (descendant of npm-lifecycle)",
55
"author": "GitHub Inc.",
66
"license": "ISC",
@@ -16,14 +16,14 @@
1616
},
1717
"devDependencies": {
1818
"@npmcli/eslint-config": "^4.0.0",
19-
"@npmcli/template-oss": "4.5.1",
19+
"@npmcli/template-oss": "4.7.1",
2020
"minipass": "^3.1.6",
2121
"require-inject": "^1.4.4",
2222
"tap": "^16.0.1"
2323
},
2424
"dependencies": {
2525
"@npmcli/node-gyp": "^3.0.0",
26-
"@npmcli/promise-spawn": "^4.0.0",
26+
"@npmcli/promise-spawn": "^5.0.0",
2727
"node-gyp": "^9.0.0",
2828
"read-package-json-fast": "^3.0.0",
2929
"which": "^2.0.2"
@@ -42,7 +42,7 @@
4242
},
4343
"templateOSS": {
4444
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
45-
"version": "4.5.1"
45+
"version": "4.7.1"
4646
},
4747
"tap": {
4848
"nyc-arg": [

‎node_modules/pacote/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pacote",
3-
"version": "15.0.2",
3+
"version": "15.0.4",
44
"description": "JavaScript package downloader",
55
"author": "GitHub Inc.",
66
"bin": {
@@ -26,8 +26,8 @@
2626
},
2727
"devDependencies": {
2828
"@npmcli/arborist": "^6.0.0 || ^6.0.0-pre.0",
29-
"@npmcli/eslint-config": "^3.1.0",
30-
"@npmcli/template-oss": "4.6.2",
29+
"@npmcli/eslint-config": "^4.0.0",
30+
"@npmcli/template-oss": "4.7.1",
3131
"hosted-git-info": "^6.0.0",
3232
"mutate-fs": "^2.1.1",
3333
"nock": "^13.2.4",
@@ -45,8 +45,8 @@
4545
],
4646
"dependencies": {
4747
"@npmcli/git": "^4.0.0",
48-
"@npmcli/installed-package-contents": "^2.0.0",
49-
"@npmcli/promise-spawn": "^4.0.0",
48+
"@npmcli/installed-package-contents": "^2.0.1",
49+
"@npmcli/promise-spawn": "^5.0.0",
5050
"@npmcli/run-script": "^5.0.0",
5151
"cacache": "^17.0.0",
5252
"fs-minipass": "^2.1.0",
@@ -71,7 +71,7 @@
7171
},
7272
"templateOSS": {
7373
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
74-
"version": "4.6.2",
74+
"version": "4.7.1",
7575
"windowsCI": false
7676
}
7777
}

‎package-lock.json

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
"@npmcli/docs": "^1.0.0",
166166
"@npmcli/eslint-config": "^4.0.0",
167167
"@npmcli/git": "^4.0.1",
168-
"@npmcli/promise-spawn": "^4.0.0",
168+
"@npmcli/promise-spawn": "^5.0.0",
169169
"@npmcli/template-oss": "4.6.2",
170170
"licensee": "^8.2.0",
171171
"nock": "^13.2.4",
@@ -2224,12 +2224,12 @@
22242224
}
22252225
},
22262226
"node_modules/@npmcli/git": {
2227-
"version": "4.0.1",
2228-
"resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.0.1.tgz",
2229-
"integrity": "sha512-sfaCFyZO7Zsxia2TNHW8TeHFIUnK63896EZFA5K0vCReOMFi9aELB5RZyFveRLaBE/pT1BS6RxbTWZGjulNgSg==",
2227+
"version": "4.0.2",
2228+
"resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.0.2.tgz",
2229+
"integrity": "sha512-jBSmCI3F6KTZrWwez6mH6lJPWg3llZlQiHR05/sOw83H1vMc9nnL39ceP8x3SEkDJkaluXG/w4drdYS4FDONgA==",
22302230
"inBundle": true,
22312231
"dependencies": {
2232-
"@npmcli/promise-spawn": "^4.0.0",
2232+
"@npmcli/promise-spawn": "^5.0.0",
22332233
"lru-cache": "^7.4.4",
22342234
"mkdirp": "^1.0.4",
22352235
"npm-pick-manifest": "^8.0.0",
@@ -2244,16 +2244,16 @@
22442244
}
22452245
},
22462246
"node_modules/@npmcli/installed-package-contents": {
2247-
"version": "2.0.0",
2248-
"resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.0.0.tgz",
2249-
"integrity": "sha512-vpPDeSnqHAXaPK1l6lcIcpgK/aIe63AbNR5vbzOhO6I2rkaFZmviQZ5nAlSpt+vwKrOH1CnplOdoE5/x8FWtNA==",
2247+
"version": "2.0.1",
2248+
"resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.0.1.tgz",
2249+
"integrity": "sha512-GIykAFdOVK31Q1/zAtT5MbxqQL2vyl9mvFJv+OGu01zxbhL3p0xc8gJjdNGX1mWmUT43aEKVO2L6V/2j4TOsAA==",
22502250
"inBundle": true,
22512251
"dependencies": {
22522252
"npm-bundled": "^3.0.0",
22532253
"npm-normalize-package-bin": "^3.0.0"
22542254
},
22552255
"bin": {
2256-
"installed-package-contents": "index.js"
2256+
"installed-package-contents": "lib/index.js"
22572257
},
22582258
"engines": {
22592259
"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
@@ -2328,13 +2328,10 @@
23282328
}
23292329
},
23302330
"node_modules/@npmcli/promise-spawn": {
2331-
"version": "4.0.0",
2332-
"resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-4.0.0.tgz",
2333-
"integrity": "sha512-LM/GRZSwkxar1jgd58yW5WspFWrFefh8a/KVy+sbOMa0pCwqlXWxXEjQRQzbtWExyhwPb2XSK/4mJnLeiVOYng==",
2331+
"version": "5.0.0",
2332+
"resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-5.0.0.tgz",
2333+
"integrity": "sha512-q+Le2urM3NdxSFHj+VZXLTHKgmWxqHXUSqM5m9bjnV3EtThtJor64f5inmBkO9uEGZnhpjW0wL67Qf5qcgZkxw==",
23342334
"inBundle": true,
2335-
"dependencies": {
2336-
"infer-owner": "^1.0.4"
2337-
},
23382335
"engines": {
23392336
"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
23402337
}
@@ -2351,13 +2348,13 @@
23512348
}
23522349
},
23532350
"node_modules/@npmcli/run-script": {
2354-
"version": "5.0.0",
2355-
"resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-5.0.0.tgz",
2356-
"integrity": "sha512-AuqcoTOt7v4D2JqC7mCa+eUQHb64vWbwyu9o1hoJiq2kfZNwCB71f0s7tvUw+v+1B5XMdqcr98aGzjKIg7s6Vw==",
2351+
"version": "5.0.1",
2352+
"resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-5.0.1.tgz",
2353+
"integrity": "sha512-co/A+5LzdHQVLukfYT71x5e8+6HtIk2W9Jk5c8mE8LaGrkHazzRuZeyUmb6Ciaak7MRXRVOSoTaZ0zYEFVA/Gw==",
23572354
"inBundle": true,
23582355
"dependencies": {
23592356
"@npmcli/node-gyp": "^3.0.0",
2360-
"@npmcli/promise-spawn": "^4.0.0",
2357+
"@npmcli/promise-spawn": "^5.0.0",
23612358
"node-gyp": "^9.0.0",
23622359
"read-package-json-fast": "^3.0.0",
23632360
"which": "^2.0.2"
@@ -8920,14 +8917,14 @@
89208917
}
89218918
},
89228919
"node_modules/pacote": {
8923-
"version": "15.0.2",
8924-
"resolved": "https://registry.npmjs.org/pacote/-/pacote-15.0.2.tgz",
8925-
"integrity": "sha512-Gj4w436jiM9/0574JGI8nxpsuXssp5OhyBhnWijvzUVJdU5GvNvnYUgd5WA6mr6ImOQ7JqWqdA44ixBqqMfyZQ==",
8920+
"version": "15.0.4",
8921+
"resolved": "https://registry.npmjs.org/pacote/-/pacote-15.0.4.tgz",
8922+
"integrity": "sha512-6lSP0ly54fKrPIvXmVcmslqrcF8DL3y/RlNLwBWG1A3wd8sWcPF8hikTJDWqXUPMw6L04p6gqsJ/iLgRjth+6A==",
89268923
"inBundle": true,
89278924
"dependencies": {
89288925
"@npmcli/git": "^4.0.0",
8929-
"@npmcli/installed-package-contents": "^2.0.0",
8930-
"@npmcli/promise-spawn": "^4.0.0",
8926+
"@npmcli/installed-package-contents": "^2.0.1",
8927+
"@npmcli/promise-spawn": "^5.0.0",
89318928
"@npmcli/run-script": "^5.0.0",
89328929
"cacache": "^17.0.0",
89338930
"fs-minipass": "^2.1.0",
@@ -14024,7 +14021,7 @@
1402414021
"license": "ISC",
1402514022
"devDependencies": {
1402614023
"@npmcli/eslint-config": "^4.0.0",
14027-
"@npmcli/promise-spawn": "^4.0.0",
14024+
"@npmcli/promise-spawn": "^5.0.0",
1402814025
"@npmcli/template-oss": "4.6.2",
1402914026
"minify-registry-metadata": "^2.2.0",
1403014027
"rimraf": "^3.0.2",

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
"@npmcli/docs": "^1.0.0",
203203
"@npmcli/eslint-config": "^4.0.0",
204204
"@npmcli/git": "^4.0.1",
205-
"@npmcli/promise-spawn": "^4.0.0",
205+
"@npmcli/promise-spawn": "^5.0.0",
206206
"@npmcli/template-oss": "4.6.2",
207207
"licensee": "^8.2.0",
208208
"nock": "^13.2.4",

‎smoke-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
},
2020
"devDependencies": {
2121
"@npmcli/eslint-config": "^4.0.0",
22-
"@npmcli/promise-spawn": "^4.0.0",
22+
"@npmcli/promise-spawn": "^5.0.0",
2323
"@npmcli/template-oss": "4.6.2",
2424
"minify-registry-metadata": "^2.2.0",
2525
"rimraf": "^3.0.2",

0 commit comments

Comments
 (0)