From 6f8cbc56ebfd7e53c7e611244fe04017c13ccf86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Breitbart?= Date: Fri, 25 Oct 2019 18:07:32 +0200 Subject: [PATCH] skip folder w'o package.json; restrict linter to src folders --- bin/install-addons.js | 15 ++++++++++++--- package.json | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/bin/install-addons.js b/bin/install-addons.js index b042552a..0a3ebe0c 100644 --- a/bin/install-addons.js +++ b/bin/install-addons.js @@ -22,9 +22,18 @@ if (fs.existsSync(addonsPath)) { const addonPath = path.join(addonsPath, folder); // install only if there are dependencies listed - const packageJson = require(path.join(addonPath, 'package.json')); - if ((packageJson.devDependencies && Object.keys(packageJson.devDependencies).length) - || (packageJson.dependencies && Object.keys(packageJson.dependencies).length)) + // also skip addon if it does not contain any package.json + // (might happen after branch switches) + let packageJson; + try { + packageJson = require(path.join(addonPath, 'package.json')); + } catch (e) {} + if (packageJson + && ( + (packageJson.devDependencies && Object.keys(packageJson.devDependencies).length) + || (packageJson.dependencies && Object.keys(packageJson.dependencies).length) + ) + ) { console.log('Preparing', folder); if (hasYarn) { diff --git a/package.json b/package.json index 773d954a..7762cd84 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "prepackage": "npm run build", "package": "webpack", "start": "node demo/start", - "lint": "tslint 'src/**/*.ts' 'addons/**/*.ts'", + "lint": "tslint 'src/**/*.ts' 'addons/*/src/**/*.ts'", "test": "npm run test-unit", "posttest": "npm run lint", "test-api": "mocha \"**/*.api.js\"",