Skip to content

Commit aa8ffbf

Browse files
authored
deps: init-package-json@8.2.5 (#9002)
1 parent 67a0f09 commit aa8ffbf

File tree

24 files changed

+15
-1652
lines changed

24 files changed

+15
-1652
lines changed

DEPENDENCIES.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,6 @@ graph LR;
289289
init-package-json-->promzard;
290290
init-package-json-->read;
291291
init-package-json-->semver;
292-
init-package-json-->validate-npm-package-license;
293292
init-package-json-->validate-npm-package-name;
294293
is-cidr-->cidr-regex;
295294
isaacs-fs-minipass-->minipass;
@@ -703,8 +702,6 @@ graph LR;
703702
socks-proxy-agent-->agent-base;
704703
socks-proxy-agent-->debug;
705704
socks-proxy-agent-->socks;
706-
spdx-correct-->spdx-expression-parse;
707-
spdx-correct-->spdx-license-ids;
708705
spdx-expression-parse-->spdx-exceptions;
709706
spdx-expression-parse-->spdx-license-ids;
710707
ssri-->minipass;
@@ -722,8 +719,6 @@ graph LR;
722719
tufjs-models-->tufjs-canonical-json["@tufjs/canonical-json"];
723720
unique-filename-->unique-slug;
724721
unique-slug-->imurmurhash;
725-
validate-npm-package-license-->spdx-correct;
726-
validate-npm-package-license-->spdx-expression-parse;
727722
which-->isexe;
728723
write-file-atomic-->imurmurhash;
729724
write-file-atomic-->signal-exit;

node_modules/.gitignore

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,6 @@
132132
!/smart-buffer
133133
!/socks-proxy-agent
134134
!/socks
135-
!/spdx-correct
136-
!/spdx-correct/node_modules/
137-
/spdx-correct/node_modules/*
138-
!/spdx-correct/node_modules/spdx-expression-parse
139135
!/spdx-exceptions
140136
!/spdx-expression-parse
141137
!/spdx-license-ids
@@ -154,10 +150,6 @@
154150
!/unique-filename
155151
!/unique-slug
156152
!/util-deprecate
157-
!/validate-npm-package-license
158-
!/validate-npm-package-license/node_modules/
159-
/validate-npm-package-license/node_modules/*
160-
!/validate-npm-package-license/node_modules/spdx-expression-parse
161153
!/validate-npm-package-name
162154
!/walk-up-path
163155
!/which

node_modules/init-package-json/lib/default-input.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const fs = require('fs/promises')
44
const path = require('path')
5-
const validateLicense = require('validate-npm-package-license')
5+
const validateLicense = require('@npmcli/package-json/lib/license')
66
const validateName = require('validate-npm-package-name')
77
const npa = require('npm-package-arg')
88
const semver = require('semver')
@@ -264,12 +264,10 @@ if (!package.author) {
264264

265265
const license = package.license || getConfig('license') || 'ISC'
266266
exports.license = yes ? license : prompt('license', license, (data) => {
267-
const its = validateLicense(data)
268-
if (its.validForNewPackages) {
267+
if (validateLicense(data)) {
269268
return data
270269
}
271-
const errors = (its.errors || []).concat(its.warnings || [])
272-
return invalid(`Sorry, ${errors.join(' and ')}.`)
270+
return invalid('Sorry, license should be a valid SPDX license expression')
273271
})
274272

275273
const type = package.type || getConfig('type') || 'commonjs'

node_modules/init-package-json/package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "init-package-json",
3-
"version": "8.2.4",
3+
"version": "8.2.5",
44
"main": "lib/init-package-json.js",
55
"scripts": {
66
"test": "tap",
@@ -25,13 +25,12 @@
2525
"promzard": "^3.0.1",
2626
"read": "^5.0.1",
2727
"semver": "^7.7.2",
28-
"validate-npm-package-license": "^3.0.4",
2928
"validate-npm-package-name": "^7.0.0"
3029
},
3130
"devDependencies": {
3231
"@npmcli/config": "^10.0.0",
3332
"@npmcli/eslint-config": "^6.0.1",
34-
"@npmcli/template-oss": "4.23.4",
33+
"@npmcli/template-oss": "4.29.0",
3534
"tap": "^16.0.1"
3635
},
3736
"engines": {
@@ -61,7 +60,7 @@
6160
],
6261
"templateOSS": {
6362
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
64-
"version": "4.23.4",
63+
"version": "4.29.0",
6564
"publish": true
6665
}
6766
}

node_modules/spdx-correct/LICENSE

Lines changed: 0 additions & 202 deletions
This file was deleted.

0 commit comments

Comments
 (0)