diff --git a/package-lock.json b/package-lock.json index b34111b4d9722d9ce2a250da62daa26de80bcc32..d208ce97651bcb44378e9d571a6208aeb56b5fd6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4811,9 +4811,9 @@ } }, "moment": { - "version": "2.24.0", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", - "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==", + "version": "2.25.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.25.1.tgz", + "integrity": "sha512-nRKMf9wDS4Fkyd0C9LXh2FFXinD+iwbJ5p/lh3CHitW9kZbRbJ8hCruiadiIXZVbeAqKZzqcTvHnK3mRhFjb6w==", "dev": true }, "ms": { @@ -5891,9 +5891,9 @@ } }, "rollup-plugin-license": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/rollup-plugin-license/-/rollup-plugin-license-2.0.0.tgz", - "integrity": "sha512-xeCtHPluNFUJPuTdCFJrdNfCR/3yEX2M65s/i47SmEblmJxdxea2m9yodiIKtfVoWUMbosfHTcALgZk+utbrhA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/rollup-plugin-license/-/rollup-plugin-license-2.0.1.tgz", + "integrity": "sha512-w+9JIMj3rHKsI0rYDpFtzAyYZsMCDL5KLDyeb4LXGWtahcgcPbr/XwMD0yozWf4X50AbImYDTdmCHiZS3rUl0A==", "dev": true, "requires": { "commenting": "1.1.0", @@ -5901,7 +5901,7 @@ "lodash": "4.17.15", "magic-string": "0.25.7", "mkdirp": "1.0.4", - "moment": "2.24.0", + "moment": "2.25.1", "spdx-expression-validate": "2.0.0", "spdx-satisfies": "5.0.0" }, @@ -5911,17 +5911,6 @@ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", "dev": true - }, - "spdx-satisfies": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/spdx-satisfies/-/spdx-satisfies-5.0.0.tgz", - "integrity": "sha512-/hGhwh20BeGmkA+P/lm06RvXD94JduwNxtx/oX3B5ClPt1/u/m5MCaDNo1tV3Y9laLkQr/NRde63b9lLMhlNfw==", - "dev": true, - "requires": { - "spdx-compare": "^1.0.0", - "spdx-expression-parse": "^3.0.0", - "spdx-ranges": "^2.0.0" - } } } }, diff --git a/package.json b/package.json index 80802bcf5702de706f5fc7e224e0a03e27744658..893a815ca46c745bea4e39a681d97e55dbeea5d5 100644 --- a/package.json +++ b/package.json @@ -35,12 +35,11 @@ "rollup-plugin-copy": "^3.3.0", "rollup-plugin-delete": "^1.2.0", "rollup-plugin-emit-ejs": "^3.0.0", - "rollup-plugin-license": "^2.0.0", + "rollup-plugin-license": "^2.0.1", "rollup-plugin-node-builtins": "^2.1.2", "rollup-plugin-serve": "^1.0.1", "rollup-plugin-terser": "^5.2.0", - "selfsigned": "^1.10.7", - "spdx-satisfies": "^5.0.0" + "selfsigned": "^1.10.7" }, "dependencies": { "@open-wc/scoped-elements": "^1.1.1", diff --git a/rollup.config.js b/rollup.config.js index 4d18ae02dc640b63f37f0462932a547149bc4306..d5f2a520176b731ce1acde0c854a273714dfe3e1 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -2,7 +2,6 @@ import path from 'path'; import fs from 'fs'; import url from 'url'; import glob from 'glob'; -import spdxSatisfies from 'spdx-satisfies'; import resolve from '@rollup/plugin-node-resolve'; import builtins from "rollup-plugin-node-builtins"; import commonjs from '@rollup/plugin-commonjs'; @@ -240,12 +239,7 @@ Dependencies: `}, thirdParty: { allow: { - test(dependency) { - // https://github.com/mjeanroy/rollup-plugin-license/issues/550 - if (dependency.name === null) - return true; - return spdxSatisfies(dependency.license, "MIT OR BSD-3-Clause OR Apache-2.0 OR LGPL-2.1-or-later"); - }, + test: '(MIT OR BSD-3-Clause OR Apache-2.0 OR LGPL-2.1-or-later)', failOnUnlicensed: true, failOnViolation: true, },