From ce42da2f9d17d8763b423dd19e5e0c3337dcf2b0 Mon Sep 17 00:00:00 2001 From: legobt <6wbvkn0j@anonaddy.me> Date: Thu, 8 Feb 2024 15:14:21 +0000 Subject: [PATCH] deps: spdx-satisfies@^5.0.1 -> @metamask/spdx-satisfies@^6.0.0 --- lib/index.js | 4 ++-- package.json | 2 +- yarn.lock | 40 +++++++++++++++++----------------------- 3 files changed, 20 insertions(+), 26 deletions(-) diff --git a/lib/index.js b/lib/index.js index 2eca8e8..14bb69c 100644 --- a/lib/index.js +++ b/lib/index.js @@ -15,7 +15,7 @@ var license = require('./license'); var licenseFiles = require('./license-files'); var debug = require('debug'); var mkdirp = require('mkdirp'); -var spdxSatisfies = require('spdx-satisfies'); +var spdxSatisfies = require('@metamask/spdx-satisfies'); var spdxCorrect =require('spdx-correct'); // Set up debug logging @@ -212,7 +212,7 @@ var flatten = function(options) { .replace(/\n/g, '. ') .trim(); } - + // Mark files with multiple copyright statements. This might be // an indicator to take a closer look at the LICENSE file. if(linesWithCopyright.length > 1) { diff --git a/package.json b/package.json index 6e0de38..ca7617c 100644 --- a/package.json +++ b/package.json @@ -57,6 +57,7 @@ "zodiac403 " ], "dependencies": { + "@metamask/spdx-satisfies": "^6.0.0", "chalk": "^2.4.1", "debug": "^4.3.4", "mkdirp": "^3.0.1", @@ -65,7 +66,6 @@ "semver": "^7.5.0", "spdx-correct": "^3.2.0", "spdx-expression-parse": "^3.0.1", - "spdx-satisfies": "^5.0.1", "treeify": "^1.1.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 335a88d..f476e15 100644 --- a/yarn.lock +++ b/yarn.lock @@ -23,6 +23,23 @@ chalk "^2.0.0" js-tokens "^4.0.0" +"@metamask/spdx-compare@^2.0.0": + version "2.0.0" + resolved "http://registry.yarnpkg.com/@metamask/spdx-compare/-/spdx-compare-2.0.0.tgz#7a638bae5849622c5c14bf080fc03082db86d5c6" + integrity sha512-3a8jBnuL4JwicD63NSbNME2IHQNbc9t5z1AsJ3VkA1aMAtUKL+Ozn2+MsjiH/bIOXZbJutc0X7DkGC/g/fAwCw== + dependencies: + spdx-expression-parse "^3.0.0" + spdx-ranges "^2.0.0" + +"@metamask/spdx-satisfies@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@metamask/spdx-satisfies/-/spdx-satisfies-6.0.0.tgz#25631d39d976e31bb7bd13d908e2ebc983562813" + integrity sha512-HcoFxG01QqW/aAFLWHpUHSbWrj9/fiosiLEo0KyBayWJ8QdqkqBB6TfPxzJ4TfNaaia5/4iRDcme+JJEIhvL+w== + dependencies: + "@metamask/spdx-compare" "^2.0.0" + spdx-expression-parse "^3.0.0" + spdx-ranges "^2.0.0" + "@octokit/auth-token@^2.4.4": version "2.5.0" resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.5.0.tgz#27c37ea26c205f28443402477ffd261311f21e36" @@ -265,11 +282,6 @@ arr-union@^3.1.0: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q== -array-find-index@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" - integrity sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw== - array-unique@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" @@ -2938,15 +2950,6 @@ spawn-wrap@^1.4.2: signal-exit "^3.0.2" which "^1.3.0" -spdx-compare@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/spdx-compare/-/spdx-compare-1.0.0.tgz#2c55f117362078d7409e6d7b08ce70a857cd3ed7" - integrity sha512-C1mDZOX0hnu0ep9dfmuoi03+eOdDoz2yvK79RxbcrVEG1NO1Ph35yW102DHWKN4pk80nwCgeMmSY5L25VE4D9A== - dependencies: - array-find-index "^1.0.2" - spdx-expression-parse "^3.0.0" - spdx-ranges "^2.0.0" - spdx-correct@^3.0.0, spdx-correct@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c" @@ -2978,15 +2981,6 @@ spdx-ranges@^2.0.0: resolved "https://registry.yarnpkg.com/spdx-ranges/-/spdx-ranges-2.1.1.tgz#87573927ba51e92b3f4550ab60bfc83dd07bac20" integrity sha512-mcdpQFV7UDAgLpXEE/jOMqvK4LBoO0uTQg0uvXUewmEFhpiZx5yJSZITHB8w1ZahKdhfZqP5GPEOKLyEq5p8XA== -spdx-satisfies@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/spdx-satisfies/-/spdx-satisfies-5.0.1.tgz#9feeb2524686c08e5f7933c16248d4fdf07ed6a6" - integrity sha512-Nwor6W6gzFp8XX4neaKQ7ChV4wmpSh2sSDemMFSzHxpTw460jxFYeOn+jq4ybnSSw/5sc3pjka9MQPouksQNpw== - dependencies: - spdx-compare "^1.0.0" - spdx-expression-parse "^3.0.0" - spdx-ranges "^2.0.0" - spec-xunit-file@0.0.1-3: version "0.0.1-3" resolved "https://registry.yarnpkg.com/spec-xunit-file/-/spec-xunit-file-0.0.1-3.tgz#855a66ab8c382eb3165df928a81d0749029d2386"