From 686f216003b89b6a0c2440f06f252ac0f1998415 Mon Sep 17 00:00:00 2001 From: Joey Perrott Date: Wed, 8 Jan 2025 17:17:33 +0000 Subject: [PATCH] fix(ng-dev): remove `ng-dev misc validate-licenses` as we no longer use it for license checks We now use our github action for license validation checks so this is no longer needed. Closes #2527 as it removes the package its updating --- ng-dev/misc/BUILD.bazel | 1 - ng-dev/misc/cli.ts | 2 - ng-dev/misc/validate-licenses/BUILD.bazel | 16 -- ng-dev/misc/validate-licenses/cli.ts | 59 ----- ng-dev/misc/validate-licenses/validate.ts | 122 ---------- package.json | 4 - yarn.lock | 264 ++-------------------- 7 files changed, 15 insertions(+), 453 deletions(-) delete mode 100644 ng-dev/misc/validate-licenses/BUILD.bazel delete mode 100644 ng-dev/misc/validate-licenses/cli.ts delete mode 100644 ng-dev/misc/validate-licenses/validate.ts diff --git a/ng-dev/misc/BUILD.bazel b/ng-dev/misc/BUILD.bazel index bf89679d7..5ee959a81 100644 --- a/ng-dev/misc/BUILD.bazel +++ b/ng-dev/misc/BUILD.bazel @@ -5,7 +5,6 @@ ts_library( srcs = glob(["**/*.ts"]), visibility = ["//ng-dev:__subpackages__"], deps = [ - "//ng-dev/misc/validate-licenses", "//ng-dev/release/build", "//ng-dev/release/config", "//ng-dev/utils", diff --git a/ng-dev/misc/cli.ts b/ng-dev/misc/cli.ts index 3787f379d..aa9d5d3cb 100644 --- a/ng-dev/misc/cli.ts +++ b/ng-dev/misc/cli.ts @@ -9,7 +9,6 @@ import {Argv} from 'yargs'; import {BuildAndLinkCommandModule} from './build-and-link/cli.js'; import {UpdateYarnCommandModule} from './update-yarn/cli.js'; -import {ValidateLicensesModule} from './validate-licenses/cli.js'; import {GeneratedFilesModule} from './generated-files/cli.js'; /** Build the parser for the misc commands. */ @@ -19,6 +18,5 @@ export function buildMiscParser(localYargs: Argv) { .strict() .command(BuildAndLinkCommandModule) .command(UpdateYarnCommandModule) - .command(ValidateLicensesModule) .command(GeneratedFilesModule); } diff --git a/ng-dev/misc/validate-licenses/BUILD.bazel b/ng-dev/misc/validate-licenses/BUILD.bazel deleted file mode 100644 index c768da9f2..000000000 --- a/ng-dev/misc/validate-licenses/BUILD.bazel +++ /dev/null @@ -1,16 +0,0 @@ -load("//tools:defaults.bzl", "ts_library") - -ts_library( - name = "validate-licenses", - srcs = glob(["*.ts"]), - visibility = ["//ng-dev/misc:__pkg__"], - deps = [ - "//ng-dev/utils", - "@npm//@types/license-checker", - "@npm//@types/node", - "@npm//@types/spdx-satisfies", - "@npm//@types/yargs", - "@npm//license-checker", - "@npm//spdx-satisfies", - ], -) diff --git a/ng-dev/misc/validate-licenses/cli.ts b/ng-dev/misc/validate-licenses/cli.ts deleted file mode 100644 index 0f9c3012a..000000000 --- a/ng-dev/misc/validate-licenses/cli.ts +++ /dev/null @@ -1,59 +0,0 @@ -/** - * @license - * Copyright Google LLC - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.io/license - */ - -import {Argv, Arguments, CommandModule} from 'yargs'; -import {Log, green, red} from '../../utils/logging.js'; -import {determineRepoBaseDirFromCwd} from '../../utils/repo-directory.js'; - -import {checkAllLicenses} from './validate.js'; - -/** Command line options. */ -export interface Options {} - -/** Yargs command builder for the command. */ -function builder(argv: Argv): Argv { - return argv; -} - -/** Yargs command handler for the command. */ -async function handler({}: Arguments) { - try { - const {valid, maxPkgNameLength, packages} = await checkAllLicenses( - determineRepoBaseDirFromCwd(), - ); - if (valid) { - Log.info( - ` ${green('✓')} All discovered licenses comply with our restrictions (${ - packages.length - } packages)`, - ); - return; - } - - Log.info(red(' ✘ The following packages were found to have disallowed licenses:\n')); - Log.info(`${' Package Name'.padEnd(maxPkgNameLength)} | LICENSE`); - packages - .filter((pkg) => !pkg.allowed) - .forEach((pkg) => { - Log.info(` - ${pkg.name.padEnd(maxPkgNameLength)} | ${pkg.licenses}`); - }); - process.exitCode = 1; - } catch (err) { - Log.info(red(' ✘ An error occured while processing package licenses:')); - Log.error(err); - process.exitCode = 1; - } -} - -/** CLI command module. */ -export const ValidateLicensesModule: CommandModule<{}, Options> = { - builder, - handler, - command: 'validate-licenses', - describe: 'Validate the licenses for all dependencies in the project', -}; diff --git a/ng-dev/misc/validate-licenses/validate.ts b/ng-dev/misc/validate-licenses/validate.ts deleted file mode 100644 index bcfb801c8..000000000 --- a/ng-dev/misc/validate-licenses/validate.ts +++ /dev/null @@ -1,122 +0,0 @@ -/** - * @license - * Copyright Google LLC - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.io/license - */ -import licenseChecker, {ModuleInfo, ModuleInfos} from 'license-checker'; -import spdx from 'spdx-satisfies'; - -// A general note on some disallowed licenses: -// - CC0 -// This is not a valid license. It does not grant copyright of the code/asset, and does not -// resolve patents or other licensed work. The different claims also have no standing in court -// and do not provide protection to or from Google and/or third parties. -// We cannot use nor contribute to CC0 licenses. -// - Public Domain -// Same as CC0, it is not a valid license. - -/** List of established allowed licenses for depdenencies. */ -const allowedLicenses = [ - // Notice licenses - 'MIT', - 'ISC', - 'Apache-2.0', - 'Python-2.0', - 'Artistic-2.0', - 'BSD-2-Clause', - 'BSD-3-Clause', - 'BSD-4-Clause', - 'Zlib', - 'AFL-2.1', - 'CC-BY-3.0', - 'CC-BY-4.0', - - // Unencumbered - 'Unlicense', - 'CC0-1.0', - '0BSD', -]; - -/** Known name variations of SPDX licenses. */ -const licenseReplacements = new Map([ - // Just a longer string that our script catches. SPDX official name is the shorter one. - ['Apache License, Version 2.0', 'Apache-2.0'], - ['Apache2', 'Apache-2.0'], - ['Apache 2.0', 'Apache-2.0'], - ['Apache v2', 'Apache-2.0'], - - // Alternate syntax - ['AFLv2.1', 'AFL-2.1'], - - // BSD is BSD-2-clause by default. - ['BSD', 'BSD-2-Clause'], -]); - -interface ExpandedModuleInfo extends ModuleInfo { - name: string; - allowed: boolean; -} - -export interface LicenseCheckResult { - valid: boolean; - packages: ExpandedModuleInfo[]; - maxPkgNameLength: number; -} - -export async function checkAllLicenses(start: string): Promise { - return new Promise((resolve, reject) => { - let maxPkgNameLength = 0; - licenseChecker.init({start}, (err: Error, pkgInfoObject: ModuleInfos) => { - // If the license processor fails, reject the process with the error. - if (err) { - console.log('thats an error'); - return reject(err); - } - - // Check each package to ensure its license(s) are allowed. - const packages = Object.entries(pkgInfoObject).map( - ([name, pkg]: [string, ModuleInfo]) => { - maxPkgNameLength = Math.max(maxPkgNameLength, name.length); - /** - * Array of licenses for the package. - * - * Note: Typically a package will only have one license, but support for multiple license - * is necessary for full support. - */ - const licenses = Array.isArray(pkg.licenses) ? pkg.licenses : [pkg.licenses!]; - - return { - ...pkg, - name, - allowed: licenses.some(assertAllowedLicense), - }; - }, - ); - - resolve({ - valid: packages.every((pkg) => pkg.allowed), - packages, - maxPkgNameLength, - }); - }); - }); -} - -const allowedLicensesSpdxExpression = allowedLicenses.join(' OR '); -// Check if a license is accepted by an array of accepted licenses -function assertAllowedLicense(license: string) { - // Licenses which are determined based on a file other than LICENSE are have an * appended. - // See https://www.npmjs.com/package/license-checker#how-licenses-are-found - const strippedLicense = license.endsWith('*') ? license.slice(0, -1) : license; - try { - // If the license is included in the known replacements, use the replacement instead. - return spdx( - licenseReplacements.get(strippedLicense) ?? strippedLicense, - allowedLicensesSpdxExpression, - ); - } catch { - return false; - } -} diff --git a/package.json b/package.json index ff18fc4c6..1a7e48646 100644 --- a/package.json +++ b/package.json @@ -101,10 +101,8 @@ "@types/git-raw-commits": "^2.0.0", "@types/jasmine": "5.1.5", "@types/jsdom": "^21.0.0", - "@types/license-checker": "^25.0.3", "@types/opener": "^1.4.0", "@types/semver": "^7.3.6", - "@types/spdx-satisfies": "^0.1.0", "@types/supports-color": "^8.1.1", "@types/wait-on": "^5.3.1", "@types/which": "^3.0.0", @@ -137,7 +135,6 @@ "karma-jasmine-html-reporter": "~2.1.0", "karma-requirejs": "^1.1.0", "karma-sourcemap-loader": "^0.4.0", - "license-checker": "^25.0.1", "minimatch": "^10.0.0", "multimatch": "^7.0.0", "nock": "beta", @@ -146,7 +143,6 @@ "requirejs": "^2.3.6", "rxjs": "^7.4.0", "semver": "^7.5.4", - "spdx-satisfies": "^5.0.1", "stylelint": "^16.0.0", "supports-color": "10.0.0", "terser": "5.37.0", diff --git a/yarn.lock b/yarn.lock index c7844b533..be2b293f5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -310,14 +310,12 @@ __metadata: "@types/git-raw-commits": "npm:^2.0.0" "@types/jasmine": "npm:5.1.5" "@types/jsdom": "npm:^21.0.0" - "@types/license-checker": "npm:^25.0.3" "@types/minimatch": "npm:^5.1.2" "@types/node": "npm:^18.19.21" "@types/opener": "npm:^1.4.0" "@types/selenium-webdriver": "npm:^4.1.21" "@types/semver": "npm:^7.3.6" "@types/send": "npm:^0.17.1" - "@types/spdx-satisfies": "npm:^0.1.0" "@types/supports-color": "npm:^8.1.1" "@types/tmp": "npm:^0.2.1" "@types/wait-on": "npm:^5.3.1" @@ -354,7 +352,6 @@ __metadata: karma-jasmine-html-reporter: "npm:~2.1.0" karma-requirejs: "npm:^1.1.0" karma-sourcemap-loader: "npm:^0.4.0" - license-checker: "npm:^25.0.1" minimatch: "npm:^10.0.0" multimatch: "npm:^7.0.0" nock: "npm:beta" @@ -368,7 +365,6 @@ __metadata: semver: "npm:^7.5.4" send: "npm:^1.0.0" source-map: "npm:^0.7.4" - spdx-satisfies: "npm:^5.0.1" stylelint: "npm:^16.0.0" supports-color: "npm:10.0.0" terser: "npm:5.37.0" @@ -4812,13 +4808,6 @@ __metadata: languageName: node linkType: hard -"@types/license-checker@npm:^25.0.3": - version: 25.0.6 - resolution: "@types/license-checker@npm:25.0.6" - checksum: 10c0/b7bb58bb656fe85117b70fbfc067d769e68e5a89ea2f3539e8e6213b663159a7e3b1a44a691e11b949f97a28214062c31815c73145e467bc8f9518815db41293 - languageName: node - linkType: hard - "@types/long@npm:^4.0.0": version: 4.0.2 resolution: "@types/long@npm:4.0.2" @@ -4999,13 +4988,6 @@ __metadata: languageName: node linkType: hard -"@types/spdx-satisfies@npm:^0.1.0": - version: 0.1.2 - resolution: "@types/spdx-satisfies@npm:0.1.2" - checksum: 10c0/5dc5700c8baab7e89b5d5a6ebd535a82b338477e4502e70e5a3e2ab50ecf8b7dbc588a2d1c65c2c92f40c2926cf116aa84bafdea1f3c189891208b3ee7aaeced - languageName: node - linkType: hard - "@types/stack-trace@npm:0.0.33": version: 0.0.33 resolution: "@types/stack-trace@npm:0.0.33" @@ -5124,13 +5106,6 @@ __metadata: languageName: node linkType: hard -"abbrev@npm:1": - version: 1.1.1 - resolution: "abbrev@npm:1.1.1" - checksum: 10c0/3f762677702acb24f65e813070e306c61fafe25d4b2583f9dfc935131f774863f3addd5741572ed576bd69cabe473c5af18e1e108b829cb7b6b4747884f726e6 - languageName: node - linkType: hard - "abbrev@npm:^2.0.0": version: 2.0.0 resolution: "abbrev@npm:2.0.0" @@ -5462,13 +5437,6 @@ __metadata: languageName: node linkType: hard -"array-find-index@npm:^1.0.2": - version: 1.0.2 - resolution: "array-find-index@npm:1.0.2" - checksum: 10c0/86b9485c74ddd324feab807e10a6de3f9c1683856267236fac4bb4d4667ada6463e106db3f6c540ae6b720e0442b590ec701d13676df4c6af30ebf4da09b4f57 - languageName: node - linkType: hard - "array-flatten@npm:1.1.1": version: 1.1.1 resolution: "array-flatten@npm:1.1.1" @@ -5534,13 +5502,6 @@ __metadata: languageName: node linkType: hard -"asap@npm:^2.0.0": - version: 2.0.6 - resolution: "asap@npm:2.0.6" - checksum: 10c0/c6d5e39fe1f15e4b87677460bd66b66050cd14c772269cee6688824c1410a08ab20254bb6784f9afb75af9144a9f9a7692d49547f4d19d715aeb7c0318f3136d - languageName: node - linkType: hard - "asn1@npm:~0.2.3": version: 0.2.6 resolution: "asn1@npm:0.2.6" @@ -6168,7 +6129,7 @@ __metadata: languageName: node linkType: hard -"chalk@npm:^2.3.0, chalk@npm:^2.4.1": +"chalk@npm:^2.3.0": version: 2.4.2 resolution: "chalk@npm:2.4.2" dependencies: @@ -6978,13 +6939,6 @@ __metadata: languageName: node linkType: hard -"debuglog@npm:^1.0.1": - version: 1.0.1 - resolution: "debuglog@npm:1.0.1" - checksum: 10c0/d98ac9abe6a528fcbb4d843b1caf5a9116998c76e1263d8ff4db2c086aa96fa7ea4c752a81050fa2e4304129ef330e6e4dc9dd4d47141afd7db80bf699f08219 - languageName: node - linkType: hard - "decamelize@npm:^1.2.0": version: 1.2.0 resolution: "decamelize@npm:1.2.0" @@ -7132,16 +7086,6 @@ __metadata: languageName: node linkType: hard -"dezalgo@npm:^1.0.0": - version: 1.0.4 - resolution: "dezalgo@npm:1.0.4" - dependencies: - asap: "npm:^2.0.0" - wrappy: "npm:1" - checksum: 10c0/8a870ed42eade9a397e6141fe5c025148a59ed52f1f28b1db5de216b4d57f0af7a257070c3af7ce3d5508c1ce9dd5009028a76f4b2cc9370dc56551d2355fad8 - languageName: node - linkType: hard - "di@npm:^0.0.1": version: 0.0.1 resolution: "di@npm:0.0.1" @@ -9134,13 +9078,6 @@ __metadata: languageName: node linkType: hard -"hosted-git-info@npm:^2.1.4": - version: 2.8.9 - resolution: "hosted-git-info@npm:2.8.9" - checksum: 10c0/317cbc6b1bbbe23c2a40ae23f3dafe9fa349ce42a89a36f930e3f9c0530c179a3882d2ef1e4141a4c3674d6faaea862138ec55b43ad6f75e387fda2483a13c70 - languageName: node - linkType: hard - "hosted-git-info@npm:^8.0.0": version: 8.0.2 resolution: "hosted-git-info@npm:8.0.2" @@ -10647,26 +10584,6 @@ __metadata: languageName: node linkType: hard -"license-checker@npm:^25.0.1": - version: 25.0.1 - resolution: "license-checker@npm:25.0.1" - dependencies: - chalk: "npm:^2.4.1" - debug: "npm:^3.1.0" - mkdirp: "npm:^0.5.1" - nopt: "npm:^4.0.1" - read-installed: "npm:~4.0.3" - semver: "npm:^5.5.0" - spdx-correct: "npm:^3.0.0" - spdx-expression-parse: "npm:^3.0.0" - spdx-satisfies: "npm:^4.0.0" - treeify: "npm:^1.1.0" - bin: - license-checker: ./bin/license-checker - checksum: 10c0/d916aad6bcb97d857b97e5fdaf24ca485d08a50ec193b1addf9a735732a54bd389a294d9cc19e295abf93b799fdbf8e44234fde3a91d964c076bcb4388cdc0d1 - languageName: node - linkType: hard - "lie@npm:~3.3.0": version: 3.3.0 resolution: "lie@npm:3.3.0" @@ -11425,7 +11342,7 @@ __metadata: languageName: node linkType: hard -"mkdirp@npm:^0.5.1, mkdirp@npm:^0.5.3, mkdirp@npm:^0.5.5, mkdirp@npm:^0.5.6": +"mkdirp@npm:^0.5.3, mkdirp@npm:^0.5.5, mkdirp@npm:^0.5.6": version: 0.5.6 resolution: "mkdirp@npm:0.5.6" dependencies: @@ -11780,18 +11697,6 @@ __metadata: languageName: node linkType: hard -"nopt@npm:^4.0.1": - version: 4.0.3 - resolution: "nopt@npm:4.0.3" - dependencies: - abbrev: "npm:1" - osenv: "npm:^0.1.4" - bin: - nopt: bin/nopt.js - checksum: 10c0/03e54cdf8c9b46924cfadf333b2b86fc180410d74d51f9c72fec5ef9c6f1a19ec533f647c05e40d49ef7491af59664c5d0baace808d6ccfe3ff064ae630a61b4 - languageName: node - linkType: hard - "nopt@npm:^7.0.0": version: 7.2.1 resolution: "nopt@npm:7.2.1" @@ -11814,18 +11719,6 @@ __metadata: languageName: node linkType: hard -"normalize-package-data@npm:^2.0.0": - version: 2.5.0 - resolution: "normalize-package-data@npm:2.5.0" - dependencies: - hosted-git-info: "npm:^2.1.4" - resolve: "npm:^1.10.0" - semver: "npm:2 || 3 || 4 || 5" - validate-npm-package-license: "npm:^3.0.1" - checksum: 10c0/357cb1646deb42f8eb4c7d42c4edf0eec312f3628c2ef98501963cc4bbe7277021b2b1d977f982b2edce78f5a1014613ce9cf38085c3df2d76730481357ca504 - languageName: node - linkType: hard - "normalize-package-data@npm:^7.0.0": version: 7.0.0 resolution: "normalize-package-data@npm:7.0.0" @@ -11862,13 +11755,6 @@ __metadata: languageName: node linkType: hard -"npm-normalize-package-bin@npm:^1.0.0": - version: 1.0.1 - resolution: "npm-normalize-package-bin@npm:1.0.1" - checksum: 10c0/b0c8c05fe419a122e0ff970ccbe7874ae24b4b4b08941a24d18097fe6e1f4b93e3f6abfb5512f9c5488827a5592f2fb3ce2431c41d338802aed24b9a0c160551 - languageName: node - linkType: hard - "npm-normalize-package-bin@npm:^4.0.0": version: 4.0.0 resolution: "npm-normalize-package-bin@npm:4.0.0" @@ -12090,30 +11976,13 @@ __metadata: languageName: node linkType: hard -"os-homedir@npm:^1.0.0": - version: 1.0.2 - resolution: "os-homedir@npm:1.0.2" - checksum: 10c0/6be4aa67317ee247b8d46142e243fb4ef1d2d65d3067f54bfc5079257a2f4d4d76b2da78cba7af3cb3f56dbb2e4202e0c47f26171d11ca1ed4008d842c90363f - languageName: node - linkType: hard - -"os-tmpdir@npm:^1.0.0, os-tmpdir@npm:~1.0.1, os-tmpdir@npm:~1.0.2": +"os-tmpdir@npm:~1.0.1, os-tmpdir@npm:~1.0.2": version: 1.0.2 resolution: "os-tmpdir@npm:1.0.2" checksum: 10c0/f438450224f8e2687605a8dd318f0db694b6293c5d835ae509a69e97c8de38b6994645337e5577f5001115470414638978cc49da1cdcc25106dad8738dc69990 languageName: node linkType: hard -"osenv@npm:^0.1.4": - version: 0.1.5 - resolution: "osenv@npm:0.1.5" - dependencies: - os-homedir: "npm:^1.0.0" - os-tmpdir: "npm:^1.0.0" - checksum: 10c0/b33ed4b77e662f3ee2a04bf4b56cad2107ab069dee982feb9e39ad44feb9aa0cf1016b9ac6e05d0d84c91fa496798fe48dd05a33175d624e51668068b9805302 - languageName: node - linkType: hard - "outvariant@npm:^1.4.0, outvariant@npm:^1.4.3": version: 1.4.3 resolution: "outvariant@npm:1.4.3" @@ -13073,36 +12942,6 @@ __metadata: languageName: node linkType: hard -"read-installed@npm:~4.0.3": - version: 4.0.3 - resolution: "read-installed@npm:4.0.3" - dependencies: - debuglog: "npm:^1.0.1" - graceful-fs: "npm:^4.1.2" - read-package-json: "npm:^2.0.0" - readdir-scoped-modules: "npm:^1.0.0" - semver: "npm:2 || 3 || 4 || 5" - slide: "npm:~1.1.3" - util-extend: "npm:^1.0.1" - dependenciesMeta: - graceful-fs: - optional: true - checksum: 10c0/3b90a1897c84ea7a59d9265f228c0543e6f66bb902b3beb65a159804e9e60cd4a520e24460325959c49f4e31c1f03d9d35aa275589d36721fc08cee162bcedcb - languageName: node - linkType: hard - -"read-package-json@npm:^2.0.0": - version: 2.1.2 - resolution: "read-package-json@npm:2.1.2" - dependencies: - glob: "npm:^7.1.1" - json-parse-even-better-errors: "npm:^2.3.0" - normalize-package-data: "npm:^2.0.0" - npm-normalize-package-bin: "npm:^1.0.0" - checksum: 10c0/2ff44e00a2e71bd87209021e3dd2b21d94f72dad2f5230c9ec3afb66acaf6d8c3ee4b6d09aa5c1ec660207d5c8d0b92b4b932459038ab448e74f35dbd8f2aa6a - languageName: node - linkType: hard - "readable-stream@npm:3, readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.2": version: 3.6.2 resolution: "readable-stream@npm:3.6.2" @@ -13151,18 +12990,6 @@ __metadata: languageName: node linkType: hard -"readdir-scoped-modules@npm:^1.0.0": - version: 1.1.0 - resolution: "readdir-scoped-modules@npm:1.1.0" - dependencies: - debuglog: "npm:^1.0.1" - dezalgo: "npm:^1.0.0" - graceful-fs: "npm:^4.1.2" - once: "npm:^1.3.0" - checksum: 10c0/21a53741c488775cbf78b0b51f1b897e9c523b1bcf54567fc2c8ed09b12d9027741f45fcb720f388c0c3088021b54dc3f616c07af1531417678cc7962fc15e5c - languageName: node - linkType: hard - "readdirp@npm:^4.0.1": version: 4.0.2 resolution: "readdirp@npm:4.0.2" @@ -13320,7 +13147,7 @@ __metadata: languageName: node linkType: hard -"resolve@npm:^1.1.6, resolve@npm:^1.10.0, resolve@npm:^1.22.1, resolve@npm:^1.3.2, resolve@npm:~1.22.1, resolve@npm:~1.22.2": +"resolve@npm:^1.1.6, resolve@npm:^1.22.1, resolve@npm:^1.3.2, resolve@npm:~1.22.1, resolve@npm:~1.22.2": version: 1.22.10 resolution: "resolve@npm:1.22.10" dependencies: @@ -13346,7 +13173,7 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@npm%3A^1.1.6#optional!builtin, resolve@patch:resolve@npm%3A^1.10.0#optional!builtin, resolve@patch:resolve@npm%3A^1.22.1#optional!builtin, resolve@patch:resolve@npm%3A^1.3.2#optional!builtin, resolve@patch:resolve@npm%3A~1.22.1#optional!builtin, resolve@patch:resolve@npm%3A~1.22.2#optional!builtin": +"resolve@patch:resolve@npm%3A^1.1.6#optional!builtin, resolve@patch:resolve@npm%3A^1.22.1#optional!builtin, resolve@patch:resolve@npm%3A^1.3.2#optional!builtin, resolve@patch:resolve@npm%3A~1.22.1#optional!builtin, resolve@patch:resolve@npm%3A~1.22.2#optional!builtin": version: 1.22.10 resolution: "resolve@patch:resolve@npm%3A1.22.10#optional!builtin::version=1.22.10&hash=c3c19d" dependencies: @@ -13790,15 +13617,6 @@ __metadata: languageName: node linkType: hard -"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.3.0, semver@npm:^5.5.0": - version: 5.7.2 - resolution: "semver@npm:5.7.2" - bin: - semver: bin/semver - checksum: 10c0/e4cf10f86f168db772ae95d86ba65b3fd6c5967c94d97c708ccb463b778c2ee53b914cd7167620950fc07faf5a564e6efe903836639e512a1aa15fbc9667fa25 - languageName: node - linkType: hard - "semver@npm:5.6.0": version: 5.6.0 resolution: "semver@npm:5.6.0" @@ -13817,6 +13635,15 @@ __metadata: languageName: node linkType: hard +"semver@npm:^5.3.0, semver@npm:^5.5.0": + version: 5.7.2 + resolution: "semver@npm:5.7.2" + bin: + semver: bin/semver + checksum: 10c0/e4cf10f86f168db772ae95d86ba65b3fd6c5967c94d97c708ccb463b778c2ee53b914cd7167620950fc07faf5a564e6efe903836639e512a1aa15fbc9667fa25 + languageName: node + linkType: hard + "semver@npm:^6.0.0, semver@npm:^6.3.0, semver@npm:^6.3.1": version: 6.3.1 resolution: "semver@npm:6.3.1" @@ -14138,13 +13965,6 @@ __metadata: languageName: node linkType: hard -"slide@npm:~1.1.3": - version: 1.1.6 - resolution: "slide@npm:1.1.6" - checksum: 10c0/f3bde70fd4c0a2ba6c23c674f010849865ddfacbc0ae3a57522d7ce88e4cc6c186d627943c34004d4f009a3fb477c03307b247ab69a266de4b3c72b271a6a03a - languageName: node - linkType: hard - "smart-buffer@npm:^4.2.0": version: 4.2.0 resolution: "smart-buffer@npm:4.2.0" @@ -14286,17 +14106,6 @@ __metadata: languageName: node linkType: hard -"spdx-compare@npm:^1.0.0": - version: 1.0.0 - resolution: "spdx-compare@npm:1.0.0" - dependencies: - array-find-index: "npm:^1.0.2" - spdx-expression-parse: "npm:^3.0.0" - spdx-ranges: "npm:^2.0.0" - checksum: 10c0/39d584129b00eaf0bb314984e5d662e511980c1fc6c4eb1d80677044a7b2b9cc3f84f6838695cf988807bf81ea0fce7438e33b0ee54fa87d302635bd143b7fc7 - languageName: node - linkType: hard - "spdx-correct@npm:^3.0.0": version: 3.2.0 resolution: "spdx-correct@npm:3.2.0" @@ -14331,35 +14140,6 @@ __metadata: languageName: node linkType: hard -"spdx-ranges@npm:^2.0.0": - version: 2.1.1 - resolution: "spdx-ranges@npm:2.1.1" - checksum: 10c0/2d6bf9ec8e0f509c1a119361ff784f0bfa8ebbd8cfbc8e10f79579def54af060bb5058b36372f19770e659051082c451145c1284d2980419a720675accdb4a3d - languageName: node - linkType: hard - -"spdx-satisfies@npm:^4.0.0": - version: 4.0.1 - resolution: "spdx-satisfies@npm:4.0.1" - dependencies: - spdx-compare: "npm:^1.0.0" - spdx-expression-parse: "npm:^3.0.0" - spdx-ranges: "npm:^2.0.0" - checksum: 10c0/aee8703dc55cb03de45b47115fc24ffefde584f5d9b574e84136a4af59d3ffd12f9a1f8b7ec5d73ce5144f0cb24cb8c599f2d3b3eff88b04b42758c42bf55d29 - languageName: node - linkType: hard - -"spdx-satisfies@npm:^5.0.1": - version: 5.0.1 - resolution: "spdx-satisfies@npm:5.0.1" - dependencies: - spdx-compare: "npm:^1.0.0" - spdx-expression-parse: "npm:^3.0.0" - spdx-ranges: "npm:^2.0.0" - checksum: 10c0/47bf163108e64fe4c179a5e2f8dc5fd4ece1665739fc61eae3157a9d4b9b2eb389df7f645223192557659155dda9071ceaa3dfd06ecab65cc3862032c20f2e61 - languageName: node - linkType: hard - "split-array-stream@npm:^1.0.0": version: 1.0.3 resolution: "split-array-stream@npm:1.0.3" @@ -15106,13 +14886,6 @@ __metadata: languageName: node linkType: hard -"treeify@npm:^1.1.0": - version: 1.1.0 - resolution: "treeify@npm:1.1.0" - checksum: 10c0/2f0dea9e89328b8a42296a3963d341ab19897a05b723d6b0bced6b28701a340d2a7b03241aef807844198e46009aaf3755139274eb082cfce6fdc1935cbd69dd - languageName: node - linkType: hard - "triple-beam@npm:^1.3.0": version: 1.4.1 resolution: "triple-beam@npm:1.4.1" @@ -15592,13 +15365,6 @@ __metadata: languageName: node linkType: hard -"util-extend@npm:^1.0.1": - version: 1.0.3 - resolution: "util-extend@npm:1.0.3" - checksum: 10c0/93d5a4faec6ce92d6976fc421ed716888054291602fed8067134867a37226738a557e4785f47b8a5ecde60837e0c694da73895f66badbd4bc8d57ec9d4799bfd - languageName: node - linkType: hard - "utils-merge@npm:1.0.1": version: 1.0.1 resolution: "utils-merge@npm:1.0.1" @@ -15667,7 +15433,7 @@ __metadata: languageName: node linkType: hard -"validate-npm-package-license@npm:^3.0.1, validate-npm-package-license@npm:^3.0.4": +"validate-npm-package-license@npm:^3.0.4": version: 3.0.4 resolution: "validate-npm-package-license@npm:3.0.4" dependencies: