From 4adcc89ec2c8f270236cd0c541239868c4d675a2 Mon Sep 17 00:00:00 2001 From: "mgquan@myseneca.ca" Date: Sat, 21 Jul 2018 15:15:22 -0400 Subject: [PATCH 1/5] changed isValid check --- src/util/normalize-manifest/util.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/util/normalize-manifest/util.js b/src/util/normalize-manifest/util.js index 73f904882c..9073240a96 100644 --- a/src/util/normalize-manifest/util.js +++ b/src/util/normalize-manifest/util.js @@ -5,6 +5,14 @@ import type {PersonObject} from '../../types.js'; const validateLicense = require('validate-npm-package-license'); export function isValidLicense(license: string): boolean { + if (license.trim().length == 0) { + return true; + } + + try { + validateLicense(license); + } catch (e) {} + return !!license && validateLicense(license).validForNewPackages; } From 4381315ee1b150344735804ed4cf966600bc6757 Mon Sep 17 00:00:00 2001 From: "mgquan@myseneca.ca" Date: Tue, 7 Aug 2018 21:58:55 -0400 Subject: [PATCH 2/5] updated validate-npm-package-license --- yarn.lock | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index ec85cbb353..6d9bc010d4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6462,13 +6462,20 @@ v8flags@^2.0.2: dependencies: user-home "^1.1.1" -validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.3: +validate-npm-package-license@^3.0.1: version "3.0.3" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338" dependencies: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" +validate-npm-package-license@^3.0.3: + version "3.0.4" + resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" + dependencies: + spdx-correct "^3.0.0" + spdx-expression-parse "^3.0.0" + verror@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/verror/-/verror-1.3.6.tgz#cff5df12946d297d2baaefaa2689e25be01c005c" From 07364257cd7f2d1dfcaa3b1b1e267ab65261df20 Mon Sep 17 00:00:00 2001 From: "mgquan@myseneca.ca" Date: Wed, 8 Aug 2018 20:17:48 -0400 Subject: [PATCH 3/5] removed try catch --- src/util/normalize-manifest/util.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/util/normalize-manifest/util.js b/src/util/normalize-manifest/util.js index 9073240a96..73f904882c 100644 --- a/src/util/normalize-manifest/util.js +++ b/src/util/normalize-manifest/util.js @@ -5,14 +5,6 @@ import type {PersonObject} from '../../types.js'; const validateLicense = require('validate-npm-package-license'); export function isValidLicense(license: string): boolean { - if (license.trim().length == 0) { - return true; - } - - try { - validateLicense(license); - } catch (e) {} - return !!license && validateLicense(license).validForNewPackages; } From 759ff50e0da75cda06450047aff9bcb94c86de4b Mon Sep 17 00:00:00 2001 From: "mgquan@myseneca.ca" Date: Thu, 9 Aug 2018 21:55:49 -0400 Subject: [PATCH 4/5] updated version number --- package.json | 2 +- yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 9d9e8294e0..ad45f10a76 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "tar-stream": "^1.6.1", "uuid": "^3.0.1", "v8-compile-cache": "^2.0.0", - "validate-npm-package-license": "^3.0.3", + "validate-npm-package-license": "3.0.4", "yn": "^2.0.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 6d9bc010d4..49a8344567 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6462,16 +6462,16 @@ v8flags@^2.0.2: dependencies: user-home "^1.1.1" -validate-npm-package-license@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338" +validate-npm-package-license@3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" dependencies: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" -validate-npm-package-license@^3.0.3: - version "3.0.4" - resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" +validate-npm-package-license@^3.0.1: + version "3.0.3" + resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338" dependencies: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" From b85dfc5d2352208d95f5876894352eac040557b4 Mon Sep 17 00:00:00 2001 From: "mgquan@myseneca.ca" Date: Fri, 10 Aug 2018 20:51:26 -0400 Subject: [PATCH 5/5] changed to ^ --- package.json | 2 +- yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index ad45f10a76..72bd1b1cdd 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "tar-stream": "^1.6.1", "uuid": "^3.0.1", "v8-compile-cache": "^2.0.0", - "validate-npm-package-license": "3.0.4", + "validate-npm-package-license": "^3.0.4", "yn": "^2.0.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 49a8344567..77e6983f0a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6462,16 +6462,16 @@ v8flags@^2.0.2: dependencies: user-home "^1.1.1" -validate-npm-package-license@3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" +validate-npm-package-license@^3.0.1: + version "3.0.3" + resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338" dependencies: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" -validate-npm-package-license@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338" +validate-npm-package-license@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" dependencies: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0"