LF-3085 update lint-staged config and eslintrc.json

LiteFarmOrg · Nov 29, 2023 · 11893c8 · 11893c8
1 parent 2f202fa
commit 11893c8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/packages/webapp/.eslintrc.json b/packages/webapp/.eslintrc.json
@@ -24,7 +24,12 @@
     "amd": true,
     "node": true
   },
-  "extends": ["eslint:recommended", "plugin:react/recommended", "plugin:storybook/recommended"],
+  "extends": [
+    "eslint:recommended",
+    "plugin:react/recommended",
+    "plugin:storybook/recommended",
+    "plugin:jsonc/recommended-with-json"
+  ],
   "rules": {
     "react/react-in-jsx-scope": "off",
     "react/prop-types": "off",

diff --git a/packages/webapp/lint-staged.config.js b/packages/webapp/lint-staged.config.js
@@ -1,5 +1,5 @@
 export default {
   '*.{js,jsx}': ['eslint --quiet --fix'],
-  '*.{js,jsx,ts,tsx,json,md,html}': 'prettier --write',
+  '*.{js,jsx,ts,tsx,json,md,html}': ['prettier --write', 'eslint --quiet --fix'],
   '*.{ts,tsx}': [() => 'tsc -p tsconfig.json --noEmit'],
 };