diff --git a/.eslintrc.json b/.eslintrc.json index 3921b8dec7..83aa0fbd6a 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,6 +1,6 @@ { - "extends": ["plugin:react/recommended", "@freecodecamp/eslint-config"], - "rules": { "no-shadow": 0, "react/no-unescaped-entities": 0 }, + "root": true, + "extends": "@freecodecamp/eslint-config", "settings": { "react": { "version": "16.4.2" diff --git a/package-lock.json b/package-lock.json index b79c3ed45a..0dcf319b4b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -183,9 +183,9 @@ } }, "@freecodecamp/eslint-config": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@freecodecamp/eslint-config/-/eslint-config-2.0.0.tgz", - "integrity": "sha512-Ly8a2XKEOxGT2DKJcdOrUR4+m+dcfnBZdA4mLg1n1/QbVABNTCjLmjrE2ify5Mi6lnO5PHva9O8t9qz7KEGCvw==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@freecodecamp/eslint-config/-/eslint-config-2.0.2.tgz", + "integrity": "sha512-SqM/owGFbUt8itsdvQLf050whkU0riofwoUi7IeTkzp8aXCqsdYArCkoqT0OIcNap62aa44CqRcdFewuTAZtHw==", "dev": true }, "@lerna/add": { diff --git a/package.json b/package.json index 953902e726..0214851f48 100644 --- a/package.json +++ b/package.json @@ -8,12 +8,7 @@ "develop:client": "cd ./client && npm run develop", "develop:server": "cd ./api-server && node development-entry.js", "ensure-env": "cross-env DEBUG=fcc:* node ./tools/scripts/ensure-env.js", - "lint": "npm-run-all -p lint:*", - "lint:api": "eslint api-server --ignore-pattern 'api-server/node_modules/**/*.js' --ignore-pattern 'api-server/public/js/**/*.js' --ignore-pattern 'api-server/lib/**/*.js'", - "lint:client": "eslint client --ignore-pattern 'client/node_modules/**/*.js' --ignore-pattern 'client/plugins/**/node_modules/**/*.js' --ignore-pattern 'client/.cache/**/*.js' --ignore-pattern 'client/public/**/*.js' --ignore-pattern 'client/static/js/*.js' --ignore-pattern 'client/static/js/*.js.map'", - "lint:config": "eslint config", - "lint:curriculum": "eslint curriculum --ignore-pattern 'curriculum/node_modules/**/*.js'", - "lint:tools": "eslint tools --ignore-pattern 'tools/**/node_modules/**/*.js'", + "lint": "eslint .", "seed": "npm-run-all -p seed:*", "seed:auth-user": "cross-env DEBUG=fcc:* node ./tools/scripts/seed/seedAuthUser", "seed:challenges": "cross-env DEBUG=fcc:* node ./tools/scripts/seed/seedChallenges", @@ -27,7 +22,7 @@ "test:tools": "jest ./tools" }, "devDependencies": { - "@freecodecamp/eslint-config": "^2.0.0", + "@freecodecamp/eslint-config": "^2.0.2", "babel-eslint": "^10.0.1", "cross-env": "^5.2.0", "debug": "^4.0.1",