Merge pull request #66 from alexandr-g/renovate/eslint-7.x

fix(deps): update dependency eslint to v7

Author: alexandr-g

.eslintrc

@@ -19,5 +19,14 @@
     "react/jsx-fragments": "off",
     // Disable prefer default export
     "import/prefer-default-export": "off"
-  }
+  },
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx"],
+      "parserOptions": {
+        "ecmaVersion": 12,
+        "project": ["./tsconfig.json"]
+      }
+    }
+  ]
 }

package.json

@@ -44,40 +44,40 @@
     "@types/react-redux": "^7.1.5",
     "@types/react-router-dom": "^5.1.3",
     "@types/redux-mock-store": "^1.0.1",
-    "@typescript-eslint/eslint-plugin": "^2.16.0",
-    "@typescript-eslint/parser": "^2.16.0",
+    "@typescript-eslint/eslint-plugin": "^4.8.1",
+    "@typescript-eslint/parser": "^4.8.1",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.2",
-    "eslint": "^6.8.0",
-    "eslint-config-airbnb-typescript": "^6.3.1",
-    "eslint-config-prettier": "^6.9.0",
-    "eslint-plugin-import": "^2.20.0",
-    "eslint-plugin-jsx-a11y": "^6.2.3",
-    "eslint-plugin-prettier": "^3.1.2",
-    "eslint-plugin-react": "^7.17.0",
-    "eslint-plugin-react-hooks": "^4.0.0",
+    "eslint": "^7.11.0",
+    "eslint-config-airbnb-typescript": "^12.0.0",
+    "eslint-config-prettier": "^6.15.0",
+    "eslint-plugin-import": "^2.22.0",
+    "eslint-plugin-jsx-a11y": "^6.4.1",
+    "eslint-plugin-prettier": "^3.1.4",
+    "eslint-plugin-react": "^7.21.5",
+    "eslint-plugin-react-hooks": "^4.0.8",
     "prettier": "^2.0.0",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
     "react-redux": "^7.1.3",
     "react-router-dom": "^5.1.2",
-    "react-scripts": "3.4.4",
+    "react-scripts": "4.0.0",
     "redux": "^4.0.5",
     "redux-devtools-extension": "^2.13.8",
     "redux-mock-store": "^1.5.4",
-    "typescript": "~4.0.0"
+    "typescript": "~4.0.3"
   },
   "scripts": {
     "start": "react-scripts start",
     "build": "react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
-    "clean-files": "rm -rf ./template/public ./template/src && rm -f ./template/.eslintignore ./template/.eslintrc  ./template/.prettierrc ./template/README.md ./template/README_CRA.md ./template/tsconfig.json",
-    "copy-files": "cp -a ./src/. template/src && cp -a ./public/. template/public && cp .eslintignore .eslintrc .prettierrc tsconfig.json README.md README_CRA.md template/",
+    "clean-files": "rm -rf ./template/public ./template/src && rm -f ./template/.eslintignore ./template/.eslintrc ./template/.prettierrc ./template/README.md ./template/README_CRA.md ./template/tsconfig.json ./template/tsconfig.eslint.json",
+    "copy-files": "cp -a ./src/. template/src && cp -a ./public/. template/public && cp .eslintignore .eslintrc .prettierrc tsconfig.json tsconfig.eslint.json README.md README_CRA.md template/",
     "prepublishOnly": "yarn clean-files && yarn copy-files",
     "commit": "npx git-cz",
-    "lint": "eslint src template cypress --ext .js,.jsx,.ts,.tsx",
-    "fix": "eslint src template cypress --ext .js,.jsx,.ts,.tsx  --fix",
+    "lint": "eslint src --ext .js,.jsx,.ts,.tsx",
+    "fix": "eslint src --ext .js,.jsx,.ts,.tsx  --fix",
     "format": "prettier --write src/**/*.{ts,tsx}",
     "e2e": "cypress run --spec 'cypress/integration/*'"
   },

template.json

@@ -13,25 +13,25 @@
       "@typescript-eslint/parser": "2.18.0",
       "enzyme": "3.11.0",
       "enzyme-adapter-react-16": "1.15.2",
-      "eslint": "6.8.0",
-      "eslint-config-airbnb-typescript": "6.3.1",
-      "eslint-config-prettier": "6.10.0",
-      "eslint-plugin-import": "2.20.1",
-      "eslint-plugin-jsx-a11y": "6.2.3",
-      "eslint-plugin-prettier": "3.1.2",
-      "eslint-plugin-react": "7.18.2",
-      "eslint-plugin-react-hooks": "2.3.0",
+      "eslint": "7.11.0",
+      "eslint-config-airbnb-typescript": "12.0.0",
+      "eslint-config-prettier": "6.15.0",
+      "eslint-plugin-import": "2.22.0",
+      "eslint-plugin-jsx-a11y": "6.4.1",
+      "eslint-plugin-prettier": "3.1.4",
+      "eslint-plugin-react": "7.21.5",
+      "eslint-plugin-react-hooks": "4.0.8",
       "prettier": "2.0.0",
       "react-redux": "7.1.3",
       "react-router-dom": "5.1.2",
       "redux": "4.0.5",
       "redux-devtools-extension": "2.13.8",
       "redux-mock-store": "1.5.4",
-      "typescript": "~3.9.0"
+      "typescript": "~4.0.3"
     },
     "scripts": {
-      "lint": "eslint --ext .js,.jsx,.ts,.tsx ./",
-      "fix": "eslint --ext .js,.jsx,.ts,.tsx  --fix ./"
+      "lint": "eslint src --ext .js,.jsx,.ts,.tsx",
+      "fix": "eslint src --ext .js,.jsx,.ts,.tsx  --fix"
     }
   }
 }

template/.eslintrc

@@ -15,6 +15,16 @@
     // Disable <Fragment> => <> replacement. Feel free to change
     "react/jsx-fragments": "off",
     // Disable prefer default export
-    "import/prefer-default-export": "off"
-  }
+    "import/prefer-default-export": "off",
+    "comma-dangle": "off"
+  },
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx"],
+      "parserOptions": {
+        "ecmaVersion": 12,
+        "project": ["./tsconfig.json"]
+      }
+    }
+  ]
 }

template/tsconfig.eslint.json

@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "allowJs": true,
+    "types": ["jest"]
+  },
+  "include": ["src", "tests"]
+}

tsconfig.eslint.json

@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "allowJs": true,
+    "types": ["jest"]
+  },
+  "include": ["src", "tests"]
+}