Skip to content

Commit 591130d

Browse files
reggireggi
committed
deps: update [email protected]
1 parent be6ae96 commit 591130d

File tree

11 files changed

+84
-82
lines changed

11 files changed

+84
-82
lines changed

‎node_modules/.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
/@npmcli/package-json/node_modules/@npmcli/*
5252
!/@npmcli/package-json/node_modules/@npmcli/git
5353
!/@npmcli/package-json/node_modules/isexe
54-
!/@npmcli/package-json/node_modules/npm-install-checks
5554
!/@npmcli/package-json/node_modules/npm-normalize-package-bin
5655
!/@npmcli/package-json/node_modules/npm-package-arg
5756
!/@npmcli/package-json/node_modules/npm-pick-manifest
@@ -241,6 +240,9 @@
241240
!/npm-package-arg/node_modules/hosted-git-info
242241
!/npm-packlist
243242
!/npm-pick-manifest
243+
!/npm-pick-manifest/node_modules/
244+
/npm-pick-manifest/node_modules/*
245+
!/npm-pick-manifest/node_modules/npm-install-checks
244246
!/npm-profile
245247
!/npm-registry-fetch
246248
!/npm-registry-fetch/node_modules/

‎node_modules/@npmcli/package-json/node_modules/npm-install-checks/lib/current-env.js ‎node_modules/npm-install-checks/lib/current-env.js

File renamed without changes.

‎node_modules/@npmcli/package-json/node_modules/npm-install-checks/lib/dev-engines.js ‎node_modules/npm-install-checks/lib/dev-engines.js

File renamed without changes.

‎node_modules/npm-install-checks/lib/index.js

+15-26
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
const semver = require('semver')
2+
const currentEnv = require('./current-env')
3+
const { checkDevEngines } = require('./dev-engines')
24

35
const checkEngine = (target, npmVer, nodeVer, force = false) => {
46
const nodev = force ? null : nodeVer
@@ -20,44 +22,29 @@ const checkEngine = (target, npmVer, nodeVer, force = false) => {
2022
}
2123
}
2224

23-
const isMusl = (file) => file.includes('libc.musl-') || file.includes('ld-musl-')
24-
2525
const checkPlatform = (target, force = false, environment = {}) => {
2626
if (force) {
2727
return
2828
}
2929

30-
const platform = environment.os || process.platform
31-
const arch = environment.cpu || process.arch
32-
const osOk = target.os ? checkList(platform, target.os) : true
33-
const cpuOk = target.cpu ? checkList(arch, target.cpu) : true
30+
const os = environment.os || currentEnv.os()
31+
const cpu = environment.cpu || currentEnv.cpu()
32+
const libc = environment.libc || currentEnv.libc(os)
3433

35-
let libcOk = true
36-
let libcFamily = null
37-
if (target.libc) {
38-
// libc checks only work in linux, any value is a failure if we aren't
39-
if (environment.libc) {
40-
libcOk = checkList(environment.libc, target.libc)
41-
} else if (platform !== 'linux') {
42-
libcOk = false
43-
} else {
44-
const report = process.report.getReport()
45-
if (report.header?.glibcVersionRuntime) {
46-
libcFamily = 'glibc'
47-
} else if (Array.isArray(report.sharedObjects) && report.sharedObjects.some(isMusl)) {
48-
libcFamily = 'musl'
49-
}
50-
libcOk = libcFamily ? checkList(libcFamily, target.libc) : false
51-
}
34+
const osOk = target.os ? checkList(os, target.os) : true
35+
const cpuOk = target.cpu ? checkList(cpu, target.cpu) : true
36+
let libcOk = target.libc ? checkList(libc, target.libc) : true
37+
if (target.libc && !libc) {
38+
libcOk = false
5239
}
5340

5441
if (!osOk || !cpuOk || !libcOk) {
5542
throw Object.assign(new Error('Unsupported platform'), {
5643
pkgid: target._id,
5744
current: {
58-
os: platform,
59-
cpu: arch,
60-
libc: libcFamily,
45+
os,
46+
cpu,
47+
libc,
6148
},
6249
required: {
6350
os: target.os,
@@ -98,4 +85,6 @@ const checkList = (value, list) => {
9885
module.exports = {
9986
checkEngine,
10087
checkPlatform,
88+
checkDevEngines,
89+
currentEnv,
10190
}

‎node_modules/npm-install-checks/package.json

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
11
{
22
"name": "npm-install-checks",
3-
"version": "6.3.0",
3+
"version": "7.1.0",
44
"description": "Check the engines and platform fields in package.json",
55
"main": "lib/index.js",
66
"dependencies": {
77
"semver": "^7.1.1"
88
},
99
"devDependencies": {
10-
"@npmcli/eslint-config": "^4.0.0",
11-
"@npmcli/template-oss": "4.19.0",
10+
"@npmcli/eslint-config": "^5.0.0",
11+
"@npmcli/template-oss": "4.23.3",
1212
"tap": "^16.0.1"
1313
},
1414
"scripts": {
1515
"test": "tap",
16-
"lint": "eslint \"**/*.js\"",
16+
"lint": "npm run eslint",
1717
"postlint": "template-oss-check",
1818
"template-oss-apply": "template-oss-apply --force",
19-
"lintfix": "npm run lint -- --fix",
19+
"lintfix": "npm run eslint -- --fix",
2020
"snap": "tap",
21-
"posttest": "npm run lint"
21+
"posttest": "npm run lint",
22+
"eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
2223
},
2324
"repository": {
2425
"type": "git",
25-
"url": "https://github.com/npm/npm-install-checks.git"
26+
"url": "git+https://github.com/npm/npm-install-checks.git"
2627
},
2728
"keywords": [
2829
"npm,",
@@ -34,12 +35,12 @@
3435
"lib/"
3536
],
3637
"engines": {
37-
"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
38+
"node": "^18.17.0 || >=20.5.0"
3839
},
3940
"author": "GitHub Inc.",
4041
"templateOSS": {
4142
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
42-
"version": "4.19.0",
43+
"version": "4.23.3",
4344
"publish": "true"
4445
},
4546
"tap": {

‎node_modules/@npmcli/package-json/node_modules/npm-install-checks/LICENSE ‎node_modules/npm-pick-manifest/node_modules/npm-install-checks/LICENSE

File renamed without changes.

‎node_modules/@npmcli/package-json/node_modules/npm-install-checks/lib/index.js ‎node_modules/npm-pick-manifest/node_modules/npm-install-checks/lib/index.js

+26-15
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
const semver = require('semver')
2-
const currentEnv = require('./current-env')
3-
const { checkDevEngines } = require('./dev-engines')
42

53
const checkEngine = (target, npmVer, nodeVer, force = false) => {
64
const nodev = force ? null : nodeVer
@@ -22,29 +20,44 @@ const checkEngine = (target, npmVer, nodeVer, force = false) => {
2220
}
2321
}
2422

23+
const isMusl = (file) => file.includes('libc.musl-') || file.includes('ld-musl-')
24+
2525
const checkPlatform = (target, force = false, environment = {}) => {
2626
if (force) {
2727
return
2828
}
2929

30-
const os = environment.os || currentEnv.os()
31-
const cpu = environment.cpu || currentEnv.cpu()
32-
const libc = environment.libc || currentEnv.libc(os)
30+
const platform = environment.os || process.platform
31+
const arch = environment.cpu || process.arch
32+
const osOk = target.os ? checkList(platform, target.os) : true
33+
const cpuOk = target.cpu ? checkList(arch, target.cpu) : true
3334

34-
const osOk = target.os ? checkList(os, target.os) : true
35-
const cpuOk = target.cpu ? checkList(cpu, target.cpu) : true
36-
let libcOk = target.libc ? checkList(libc, target.libc) : true
37-
if (target.libc && !libc) {
38-
libcOk = false
35+
let libcOk = true
36+
let libcFamily = null
37+
if (target.libc) {
38+
// libc checks only work in linux, any value is a failure if we aren't
39+
if (environment.libc) {
40+
libcOk = checkList(environment.libc, target.libc)
41+
} else if (platform !== 'linux') {
42+
libcOk = false
43+
} else {
44+
const report = process.report.getReport()
45+
if (report.header?.glibcVersionRuntime) {
46+
libcFamily = 'glibc'
47+
} else if (Array.isArray(report.sharedObjects) && report.sharedObjects.some(isMusl)) {
48+
libcFamily = 'musl'
49+
}
50+
libcOk = libcFamily ? checkList(libcFamily, target.libc) : false
51+
}
3952
}
4053

4154
if (!osOk || !cpuOk || !libcOk) {
4255
throw Object.assign(new Error('Unsupported platform'), {
4356
pkgid: target._id,
4457
current: {
45-
os,
46-
cpu,
47-
libc,
58+
os: platform,
59+
cpu: arch,
60+
libc: libcFamily,
4861
},
4962
required: {
5063
os: target.os,
@@ -85,6 +98,4 @@ const checkList = (value, list) => {
8598
module.exports = {
8699
checkEngine,
87100
checkPlatform,
88-
checkDevEngines,
89-
currentEnv,
90101
}

‎node_modules/@npmcli/package-json/node_modules/npm-install-checks/package.json ‎node_modules/npm-pick-manifest/node_modules/npm-install-checks/package.json

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
11
{
22
"name": "npm-install-checks",
3-
"version": "7.1.0",
3+
"version": "6.3.0",
44
"description": "Check the engines and platform fields in package.json",
55
"main": "lib/index.js",
66
"dependencies": {
77
"semver": "^7.1.1"
88
},
99
"devDependencies": {
10-
"@npmcli/eslint-config": "^5.0.0",
11-
"@npmcli/template-oss": "4.23.3",
10+
"@npmcli/eslint-config": "^4.0.0",
11+
"@npmcli/template-oss": "4.19.0",
1212
"tap": "^16.0.1"
1313
},
1414
"scripts": {
1515
"test": "tap",
16-
"lint": "npm run eslint",
16+
"lint": "eslint \"**/*.js\"",
1717
"postlint": "template-oss-check",
1818
"template-oss-apply": "template-oss-apply --force",
19-
"lintfix": "npm run eslint -- --fix",
19+
"lintfix": "npm run lint -- --fix",
2020
"snap": "tap",
21-
"posttest": "npm run lint",
22-
"eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
21+
"posttest": "npm run lint"
2322
},
2423
"repository": {
2524
"type": "git",
26-
"url": "git+https://github.com/npm/npm-install-checks.git"
25+
"url": "https://github.com/npm/npm-install-checks.git"
2726
},
2827
"keywords": [
2928
"npm,",
@@ -35,12 +34,12 @@
3534
"lib/"
3635
],
3736
"engines": {
38-
"node": "^18.17.0 || >=20.5.0"
37+
"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
3938
},
4039
"author": "GitHub Inc.",
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.19.0",
4443
"publish": "true"
4544
},
4645
"tap": {

‎package-lock.json

+19-19
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
"nopt": "^8.0.0",
132132
"normalize-package-data": "^7.0.0",
133133
"npm-audit-report": "^6.0.0",
134-
"npm-install-checks": "^6.3.0",
134+
"npm-install-checks": "^7.1.0",
135135
"npm-package-arg": "^11.0.3",
136136
"npm-pick-manifest": "^9.1.0",
137137
"npm-profile": "^10.0.0",
@@ -1832,19 +1832,6 @@
18321832
"node": ">=16"
18331833
}
18341834
},
1835-
"node_modules/@npmcli/package-json/node_modules/npm-install-checks": {
1836-
"version": "7.1.0",
1837-
"resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-7.1.0.tgz",
1838-
"integrity": "sha512-bkTildVlofeMX7wiOaWk3PlW7YcBXAuEc7TWpOxwUgalG5ZvgT/ms+6OX9zt7iGLv4+VhKbRZhpOfgQJzk1YAw==",
1839-
"inBundle": true,
1840-
"license": "BSD-2-Clause",
1841-
"dependencies": {
1842-
"semver": "^7.1.1"
1843-
},
1844-
"engines": {
1845-
"node": "^18.17.0 || >=20.5.0"
1846-
}
1847-
},
18481835
"node_modules/@npmcli/package-json/node_modules/npm-normalize-package-bin": {
18491836
"version": "4.0.0",
18501837
"resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-4.0.0.tgz",
@@ -10271,16 +10258,16 @@
1027110258
}
1027210259
},
1027310260
"node_modules/npm-install-checks": {
10274-
"version": "6.3.0",
10275-
"resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.3.0.tgz",
10276-
"integrity": "sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==",
10261+
"version": "7.1.0",
10262+
"resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-7.1.0.tgz",
10263+
"integrity": "sha512-bkTildVlofeMX7wiOaWk3PlW7YcBXAuEc7TWpOxwUgalG5ZvgT/ms+6OX9zt7iGLv4+VhKbRZhpOfgQJzk1YAw==",
1027710264
"inBundle": true,
1027810265
"license": "BSD-2-Clause",
1027910266
"dependencies": {
1028010267
"semver": "^7.1.1"
1028110268
},
1028210269
"engines": {
10283-
"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
10270+
"node": "^18.17.0 || >=20.5.0"
1028410271
}
1028510272
},
1028610273
"node_modules/npm-normalize-package-bin": {
@@ -10351,6 +10338,19 @@
1035110338
"node": "^16.14.0 || >=18.0.0"
1035210339
}
1035310340
},
10341+
"node_modules/npm-pick-manifest/node_modules/npm-install-checks": {
10342+
"version": "6.3.0",
10343+
"resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.3.0.tgz",
10344+
"integrity": "sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==",
10345+
"inBundle": true,
10346+
"license": "BSD-2-Clause",
10347+
"dependencies": {
10348+
"semver": "^7.1.1"
10349+
},
10350+
"engines": {
10351+
"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
10352+
}
10353+
},
1035410354
"node_modules/npm-profile": {
1035510355
"version": "10.0.0",
1035610356
"resolved": "https://registry.npmjs.org/npm-profile/-/npm-profile-10.0.0.tgz",
@@ -17041,7 +17041,7 @@
1704117041
"lru-cache": "^10.2.2",
1704217042
"minimatch": "^9.0.4",
1704317043
"nopt": "^8.0.0",
17044-
"npm-install-checks": "^6.2.0",
17044+
"npm-install-checks": "^7.1.0",
1704517045
"npm-package-arg": "^11.0.2",
1704617046
"npm-pick-manifest": "^9.0.1",
1704717047
"npm-registry-fetch": "^17.0.1",

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"nopt": "^8.0.0",
9797
"normalize-package-data": "^7.0.0",
9898
"npm-audit-report": "^6.0.0",
99-
"npm-install-checks": "^6.3.0",
99+
"npm-install-checks": "^7.1.0",
100100
"npm-package-arg": "^11.0.3",
101101
"npm-pick-manifest": "^9.1.0",
102102
"npm-profile": "^10.0.0",

‎workspaces/arborist/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"lru-cache": "^10.2.2",
2424
"minimatch": "^9.0.4",
2525
"nopt": "^8.0.0",
26-
"npm-install-checks": "^6.2.0",
26+
"npm-install-checks": "^7.1.0",
2727
"npm-package-arg": "^11.0.2",
2828
"npm-pick-manifest": "^9.0.1",
2929
"npm-registry-fetch": "^17.0.1",

0 commit comments

Comments
 (0)