diff --git a/packages/strapi-lint/lib/internals/eslint/front/.eslintrc.json b/packages/strapi-lint/lib/internals/eslint/front/.eslintrc.json index 0051fee528..01880629f2 100644 --- a/packages/strapi-lint/lib/internals/eslint/front/.eslintrc.json +++ b/packages/strapi-lint/lib/internals/eslint/front/.eslintrc.json @@ -76,7 +76,6 @@ "class-methods-use-this": 0, "react/forbid-prop-types": 0, "react/react-in-jsx-scope": 0, - "react/forbid-prop-types": 0, "react/jsx-first-prop-new-line": [ 2, "multiline" diff --git a/scripts/lint.js b/scripts/lint.js index 7170dac323..ab32043d11 100644 --- a/scripts/lint.js +++ b/scripts/lint.js @@ -6,7 +6,7 @@ const glob = require('glob'); const fs = require('fs'); const listChangedFiles = require('../packages/strapi-lint/lib/internals/shared/listChangedFiles.js'); const changedFiles = listChangedFiles(); -const { take } = require('lodash'); +const { includes, take } = require('lodash'); const frontCmd = 'node ../../node_modules/strapi-lint/node_modules/.bin/eslint --ignore-path .gitignore --ignore-pattern \'/admin/build/\' --config ../../node_modules/strapi-lint/lib/internals/eslint/front/.eslintrc.json admin'; @@ -19,7 +19,8 @@ const backCmd = const watcher = (label, pckgName, type = 'front') => { shell.echo(label); shell.cd(pckgName); - const cmd = pckgName === 'strapi-helper-plugin' ? helperCmd : `${frontCmd} && ${backCmd}`; + const cmd = includes(pckgName, 'strapi-helper-plugin') ? helperCmd : `${frontCmd} && ${backCmd}`; + const data = shell.exec(cmd, { silent: true }); shell.echo(chalk(eslintErrorsFormatter(data.stdout))); shell.cd('../..'); @@ -34,7 +35,7 @@ const files = glob .sync('**/*.js', { ignore: '**/node_modules/**' }) .filter(f => changedFiles.has(f)) .filter( - package => + package => !package.includes('README.md') && !package.includes('strapi-middleware-views') && !package.includes('strapi-lint') && @@ -49,8 +50,9 @@ const files = glob return take(directoryArray, toTake).join('/'); }); + files .filter((directory, index) => files.indexOf(directory) === index) .forEach(package => { watcher(`Testing ${package}`, package); - }); + }); \ No newline at end of file