Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions DEPENDENCIES.md
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,6 @@ graph LR;
init-package-json-->promzard;
init-package-json-->read;
init-package-json-->semver;
init-package-json-->validate-npm-package-license;
init-package-json-->validate-npm-package-name;
is-cidr-->cidr-regex;
isaacs-fs-minipass-->minipass;
Expand Down Expand Up @@ -703,8 +702,6 @@ graph LR;
socks-proxy-agent-->agent-base;
socks-proxy-agent-->debug;
socks-proxy-agent-->socks;
spdx-correct-->spdx-expression-parse;
spdx-correct-->spdx-license-ids;
spdx-expression-parse-->spdx-exceptions;
spdx-expression-parse-->spdx-license-ids;
ssri-->minipass;
Expand All @@ -722,8 +719,6 @@ graph LR;
tufjs-models-->tufjs-canonical-json["@tufjs/canonical-json"];
unique-filename-->unique-slug;
unique-slug-->imurmurhash;
validate-npm-package-license-->spdx-correct;
validate-npm-package-license-->spdx-expression-parse;
which-->isexe;
write-file-atomic-->imurmurhash;
write-file-atomic-->signal-exit;
Expand Down
8 changes: 0 additions & 8 deletions node_modules/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,6 @@
!/smart-buffer
!/socks-proxy-agent
!/socks
!/spdx-correct
!/spdx-correct/node_modules/
/spdx-correct/node_modules/*
!/spdx-correct/node_modules/spdx-expression-parse
!/spdx-exceptions
!/spdx-expression-parse
!/spdx-license-ids
Expand All @@ -154,10 +150,6 @@
!/unique-filename
!/unique-slug
!/util-deprecate
!/validate-npm-package-license
!/validate-npm-package-license/node_modules/
/validate-npm-package-license/node_modules/*
!/validate-npm-package-license/node_modules/spdx-expression-parse
!/validate-npm-package-name
!/walk-up-path
!/which
Expand Down
8 changes: 3 additions & 5 deletions node_modules/init-package-json/lib/default-input.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

const fs = require('fs/promises')
const path = require('path')
const validateLicense = require('validate-npm-package-license')
const validateLicense = require('@npmcli/package-json/lib/license')
const validateName = require('validate-npm-package-name')
const npa = require('npm-package-arg')
const semver = require('semver')
Expand Down Expand Up @@ -264,12 +264,10 @@ if (!package.author) {

const license = package.license || getConfig('license') || 'ISC'
exports.license = yes ? license : prompt('license', license, (data) => {
const its = validateLicense(data)
if (its.validForNewPackages) {
if (validateLicense(data)) {
return data
}
const errors = (its.errors || []).concat(its.warnings || [])
return invalid(`Sorry, ${errors.join(' and ')}.`)
return invalid('Sorry, license should be a valid SPDX license expression')
})

const type = package.type || getConfig('type') || 'commonjs'
Expand Down
7 changes: 3 additions & 4 deletions node_modules/init-package-json/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "init-package-json",
"version": "8.2.4",
"version": "8.2.5",
"main": "lib/init-package-json.js",
"scripts": {
"test": "tap",
Expand All @@ -25,13 +25,12 @@
"promzard": "^3.0.1",
"read": "^5.0.1",
"semver": "^7.7.2",
"validate-npm-package-license": "^3.0.4",
"validate-npm-package-name": "^7.0.0"
},
"devDependencies": {
"@npmcli/config": "^10.0.0",
"@npmcli/eslint-config": "^6.0.1",
"@npmcli/template-oss": "4.23.4",
"@npmcli/template-oss": "4.29.0",
"tap": "^16.0.1"
},
"engines": {
Expand Down Expand Up @@ -61,7 +60,7 @@
],
"templateOSS": {
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
"version": "4.23.4",
"version": "4.29.0",
"publish": true
}
}
202 changes: 0 additions & 202 deletions node_modules/spdx-correct/LICENSE

This file was deleted.

Loading
Loading