Merge pull request #11 from ijsto/SA/ESLint-8

Add support to ESLint V8

index.js

@@ -10,6 +10,7 @@ const base = require('./src/base');
 const jsxA11y = require('./src/jsx-a11y');
 const next = require('./src/next');
 const node = require('./src/node');
+const strapi = require('./src/strapi');
 const prettier = require('./src/prettier');
 const react = require('./src/react');
 const reactHooks = require('./src/react-hooks');
@@ -27,6 +28,8 @@ const usesBabelConfig = findUp.sync([
 ]);
 const usesNext = checkIfHasPackage('next');
 const usesReact = checkIfHasPackage('react');
+const usesStrapiAboveV4 = checkIfHasPackage('@strapi/strapi');
+const usesStrapi = checkIfHasPackage('strapi');
 const reactVersion = usesReact ? semver.coerce(usesReact).version : undefined;
 
 const config = {
@@ -80,8 +83,6 @@ if (hasWorkspaces) {
 
   config.plugins.push('react');
   config.rules = rulesForWorkspaces;
-
-  return;
 }
 
 if (usesReact || usesNext) {
@@ -126,5 +127,11 @@ if (usesNext) {
     ...next,
   };
 }
+if (usesStrapiAboveV4 || usesStrapi) {
+  config.rules = {
+    ...config.rules,
+    ...strapi,
+  };
+}
 
 module.exports = config;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ijsto/eslint-config",
-  "version": "4.1.7",
+  "version": "4.2.7",
   "description": "ESLint and Prettier setup",
   "author": "Scott Agirs Neminskis <scott@ijs.to>",
   "repository": "git@github.com:ijsto/eslint-config.git",
@@ -11,30 +11,30 @@
   },
   "main": "index.js",
   "peerDependencies": {
-    "eslint": "^7.25.0"
+    "eslint": "^7.25.0 || ^8.0.0"
   },
   "dependencies": {
-    "@babel/core": "^7.14.0",
-    "@babel/eslint-parser": "^7.13.14",
-    "@rushstack/eslint-patch": "^1.0.6",
+    "@babel/core": "^7.15.8",
+    "@babel/eslint-parser": "^7.15.8",
+    "@rushstack/eslint-patch": "^1.0.8",
     "dot-prop": "^6.0.1",
     "eslint-config-airbnb": "^18.2.1",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-html": "^6.1.2",
-    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-html": "^6.2.0",
+    "eslint-plugin-import": "^2.25.2",
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.4.0",
-    "eslint-plugin-react": "^7.23.2",
-    "eslint-plugin-react-hooks": "^4.2.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-react": "^7.27.0",
+    "eslint-plugin-react-hooks": "^4.3.0",
     "find-up": "5.0.0",
     "prettier": "^2.3.0",
     "read-pkg-up": "7.0.1",
     "semver": "7.3.5"
   },
   "devDependencies": {
-    "eslint": "^7.26.0",
-    "prettier": "^2.3.0"
+    "eslint": "^8.0.0",
+    "prettier": "^2.4.1"
   },
   "keywords": [
     "config",

src/base.js

@@ -3,10 +3,10 @@ module.exports = {
   'comma-dangle': 0,
   'import/extensions': [
     'error',
-    'ignorePackages',
     {
       js: 'never',
       jsx: 'never',
+      svg: 'always',
       ts: 'never',
       tsx: 'never',
     },

src/strapi.js

@@ -0,0 +1,5 @@
+module.exports = {
+  // __ STRAPI.JS
+  'sort-keys': 0,
+  strict: 0,
+};