From 2b179056912c3c3556ac564d1badd472fb4310e4 Mon Sep 17 00:00:00 2001 From: Tobias Lidskog Date: Fri, 29 Sep 2017 17:14:57 +0200 Subject: [PATCH] Fix license checker. --- package.json | 2 +- tools/check-licenses.js | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 6bcaf6a62..9d002cf84 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "eslint-config-prettier": "^2.6.0", "eslint-plugin-prettier": "^2.3.1", "jsdoc": "^3.3.3", - "license-checker": "^5.1.2", + "license-checker": "^14.0.0", "mocha": "^3.1.2", "node-sass": "^4.5.0", "prettier": "^1.7.2", diff --git a/tools/check-licenses.js b/tools/check-licenses.js index b9a877cc0..ec2e2864e 100755 --- a/tools/check-licenses.js +++ b/tools/check-licenses.js @@ -5,13 +5,11 @@ const checker = require('license-checker'); -const INCOMPATIBLE_LICENCE_REGEX = /GPL/; - checker.init( { start: '.' }, - function(json, err) { + function(err, json) { if (err) { console.error(err.message); process.exit(1); @@ -21,7 +19,18 @@ checker.init( if (!Array.isArray(licenses)) licenses = [licenses]; - if (licenses.find(license => license.match(INCOMPATIBLE_LICENCE_REGEX))) + if ( + licenses + .filter( + license => + !( + license.match(/LGPL/) || + license.match(/MIT/) || + license.match(/BSD/) + ) + ) + .find(license => license.match(/GPL/)) + ) return packageName; });