ci: fix eslint configs

react-dropzone · Feb 6, 2022 · 17de92e · 17de92e
1 parent cc4dc34
commit 17de92e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -15,10 +15,8 @@
     "prettier"
   ],
   "extends": [
-    // TODO: Fix this so we can use
-    // "okonet/node"
     "eslint:recommended",
-    "prettier"
+    "plugin:prettier/recommended"
   ],
   "rules": {
     "strict": 0,

diff --git a/package.json b/package.json
@@ -12,9 +12,10 @@
     "build:es": "cross-env BABEL_ENV=es babel ./src --out-dir ./dist/es --ignore '**/*.spec.js'",
     "start": "styleguidist server",
     "styleguide": "styleguidist build",
-    "test": "cross-env NODE_ENV=test yarn eslint:src && jest --coverage && yarn typescript",
+    "test": "cross-env NODE_ENV=test yarn lint && jest --coverage && yarn typescript",
     "test:watch": "cross-env NODE_ENV=test jest --watch",
-    "eslint:src": "eslint .",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
     "commitmsg": "commitlint -e",
     "prepublish": "yarn build && yarn size",
     "postinstall": "husky install",
@@ -38,7 +39,7 @@
   ],
   "lint-staged": {
     "*.js": [
-      "eslint --fix"
+      "eslint . --fix"
     ],
     "*.ts": [
       "eslint ."

diff --git a/src/.eslintrc b/src/.eslintrc
@@ -19,11 +19,10 @@
     "react-hooks"
   ],
   "extends": [
-    //"okonet/react",
     "eslint:recommended",
     "plugin:react/recommended",
     "plugin:jsx-a11y/recommended",
-    "prettier"
+    "plugin:prettier/recommended"
   ],
   "rules": {
     "react-hooks/rules-of-hooks": 2,

diff --git a/typings/.eslintrc b/typings/.eslintrc
@@ -15,7 +15,7 @@
   "extends": [
     "eslint:recommended",
     "plugin:@typescript-eslint/recommended",
-    "prettier"
+    "plugin:prettier/recommended"
   ],
   "settings": {
     "react": {