update eslint config to include prettier (#3937)

* update eslint config * run prettier from eslint * remove prettier in precommit hook
rjsf-team · Nov 3, 2023 · 2f8a2fd · 2f8a2fd
1 parent 31cc1ac
commit 2f8a2fd
Show file tree

Hide file tree

Showing 34 changed files with 103 additions and 56 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1,3 @@
+packages/*/lib
+packages/*/dist
+packages/docs/build
diff --git a/.eslintrc-typescript → .eslintrc.json b/.eslintrc-typescript → .eslintrc.json
@@ -5,7 +5,8 @@
     "plugin:@typescript-eslint/recommended",
     "plugin:react/recommended",
     "plugin:react-hooks/recommended",
-    "plugin:react/jsx-runtime"
+    "plugin:react/jsx-runtime",
+    "plugin:prettier/recommended"
   ],
   "rules": {
     "react/no-deprecated": "warn",
@@ -60,5 +61,10 @@
     "es6": true,
     "browser": true,
     "node": true
+  },
+  "settings": {
+    "react": {
+      "version": "detect"
+    }
   }
 }
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,7 +24,6 @@ jobs:
       - run: npm i -g npm@9
       - run: npm ci
       - run: npm run lint
-      - run: npm run cs-check
 
       - name: Build with Netlify badge
         if: github.ref != 'refs/heads/main' && matrix.node-version != '14.x'

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,7 +22,6 @@ jobs:
           NODE_OPTIONS: --max_old_space_size=4096
       - run: npm test
       - run: npm run lint
-      - run: npm run cs-check
       - run: echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} > .npmrc
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "changed": "lerna changed",
     "test": "lerna run --concurrency 2 --stream test",
     "test:update": "lerna run --concurrency 2 --stream test:update",
-    "lint": "lerna run lint",
+    "lint": "eslint './packages/**/*.{ts,js,tsx,jsx}' --quiet",
     "cs-check": "lerna run cs-check",
     "cs-format": "lerna run cs-format",
     "build": "lerna run --stream build",
@@ -42,8 +42,10 @@
     "@typescript-eslint/parser": "^5.62.0",
     "cross-env": "^7.0.3",
     "eslint": "^8.48.0",
+    "eslint-config-prettier": "^8.10.0",
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-jsx-a11y": "^6.7.1",
+    "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "husky": "^8.0.3",

diff --git a/packages/antd/.eslintrc b/packages/antd/.eslintrc
@@ -1,4 +1,4 @@
 {
-  "extends": "../../.eslintrc-typescript",
+  "extends": "../../.eslintrc",
   "plugins": ["@typescript-eslint", "jsx-a11y", "react", "import"]
 }
diff --git a/packages/antd/package.json b/packages/antd/package.json
@@ -20,8 +20,7 @@
   },
   "lint-staged": {
     "{src,test}/**/*.ts?(x)": [
-      "eslint --fix",
-      "prettier --write"
+      "eslint --fix"
     ]
   },
   "files": [

diff --git a/packages/bootstrap-4/.eslintrc b/packages/bootstrap-4/.eslintrc
@@ -1,4 +1,4 @@
 {
-  "extends": ["../../.eslintrc-typescript"],
+  "extends": ["../../.eslintrc"],
   "plugins": ["@typescript-eslint", "jsx-a11y", "react", "import"]
 }
diff --git a/packages/bootstrap-4/package.json b/packages/bootstrap-4/package.json
@@ -29,8 +29,7 @@
   },
   "lint-staged": {
     "{src,test}/**/*.ts?(x)": [
-      "eslint --fix",
-      "prettier --write"
+      "eslint --fix"
     ]
   },
   "peerDependencies": {

diff --git a/packages/chakra-ui/.eslintrc b/packages/chakra-ui/.eslintrc
@@ -1,5 +1,5 @@
 {
-  "extends": ["../../.eslintrc-typescript"],
+  "extends": ["../../.eslintrc"],
   "plugins": ["@typescript-eslint", "jsx-a11y", "react", "import", "@emotion"],
   "rules": { "@emotion/jsx-import": "error" }
 }
diff --git a/packages/chakra-ui/babel.config.js b/packages/chakra-ui/babel.config.js
@@ -1,4 +1,3 @@
-
 const defaultConfig = require('../../babel.config');
 
 module.exports = defaultConfig;
diff --git a/packages/chakra-ui/package.json b/packages/chakra-ui/package.json
@@ -26,8 +26,7 @@
   },
   "lint-staged": {
     "{src,test}/**/*.ts?(x)": [
-      "eslint --fix",
-      "prettier --write"
+      "eslint --fix"
     ]
   },
   "engineStrict": false,

diff --git a/packages/core/.eslintrc b/packages/core/.eslintrc
@@ -1,4 +1,4 @@
 {
-  "extends": ["../../.eslintrc-typescript"],
+  "extends": ["../../.eslintrc"],
   "plugins": ["@typescript-eslint", "jsx-a11y", "react", "import"]
 }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -21,8 +21,7 @@
   },
   "lint-staged": {
     "{src,test,testSnap}/**/*.[jt]s?(x)": [
-      "eslint --fix",
-      "prettier --write"
+      "eslint --fix"
     ]
   },
   "main": "dist/index.js",

diff --git a/packages/docs/docusaurus.config.js b/packages/docs/docusaurus.config.js
@@ -43,7 +43,7 @@ const config = {
           editUrl: 'https://github.com/rjsf-team/react-jsonschema-form/tree/main/packages/docs/',
           lastVersion: 'current',
           versions: {
-            'current': {
+            current: {
               label: 'v5',
               path: '',
             },

diff --git a/packages/docs/sidebars.js b/packages/docs/sidebars.js
@@ -14,9 +14,7 @@
 /** @type {import('@docusaurus/plugin-content-docs').SidebarsConfig} */
 const sidebars = {
   // By default, Docusaurus generates a sidebar from the docs folder structure
-  docs: [
-    {type: "autogenerated", dirName: '.'},
-  ],
+  docs: [{ type: 'autogenerated', dirName: '.' }],
 };
 
 module.exports = sidebars;
diff --git a/packages/fluent-ui/.eslintrc b/packages/fluent-ui/.eslintrc
@@ -1,4 +1,4 @@
 {
-  "extends": ["../../.eslintrc-typescript"],
+  "extends": ["../../.eslintrc"],
   "plugins": ["@typescript-eslint", "jsx-a11y", "react", "import"]
 }
diff --git a/packages/fluent-ui/package.json b/packages/fluent-ui/package.json
@@ -25,8 +25,7 @@
   },
   "lint-staged": {
     "{src,test}/**/*.ts?(x)": [
-      "eslint --fix",
-      "prettier --write"
+      "eslint --fix"
     ]
   },
   "engineStrict": false,

diff --git a/packages/material-ui/.eslintrc b/packages/material-ui/.eslintrc
@@ -1,4 +1,4 @@
 {
-  "extends": ["../../.eslintrc-typescript"],
+  "extends": ["../../.eslintrc"],
   "plugins": ["@typescript-eslint", "jsx-a11y", "react", "import"]
 }
diff --git a/packages/material-ui/package.json b/packages/material-ui/package.json
@@ -25,8 +25,7 @@
   },
   "lint-staged": {
     "{src,test}/**/*.ts?(x)": [
-      "eslint --fix",
-      "prettier --write"
+      "eslint --fix"
     ]
   },
   "engines": {

diff --git a/packages/mui/.eslintrc b/packages/mui/.eslintrc
@@ -1,4 +1,4 @@
 {
-  "extends": ["../../.eslintrc-typescript"],
+  "extends": ["../../.eslintrc"],
   "plugins": ["@typescript-eslint", "jsx-a11y", "react", "import"]
 }
diff --git a/packages/mui/package.json b/packages/mui/package.json
@@ -25,8 +25,7 @@
   },
   "lint-staged": {
     "{src,test}/**/*.ts?(x)": [
-      "eslint --fix",
-      "prettier --write"
+      "eslint --fix"
     ]
   },
   "engines": {

diff --git a/packages/playground/.eslintrc b/packages/playground/.eslintrc
@@ -1,4 +1,4 @@
 {
-  "extends": "../../.eslintrc-typescript",
+  "extends": "../../.eslintrc",
   "plugins": ["@typescript-eslint", "jsx-a11y", "react", "import"]
 }
diff --git a/packages/playground/package.json b/packages/playground/package.json
@@ -17,8 +17,7 @@
   },
   "lint-staged": {
     "src/**/*.ts?(x)": [
-      "eslint --fix",
-      "prettier --write"
+      "eslint --fix"
     ]
   },
   "files": [

diff --git a/packages/playground/vite.config.ts b/packages/playground/vite.config.ts
@@ -15,21 +15,21 @@ export default defineConfig({
     preserveSymlinks: true, // Fixes https://github.com/rjsf-team/react-jsonschema-form/issues/3228
     alias: {
       // mapping packages in monorepo to make vite use sources directly avoiding build step
-      "@rjsf/antd" : path.resolve(__dirname, '../antd/src'),
-      "@rjsf/bootstrap-4" : path.resolve(__dirname, '../bootstrap-4/src'),
-      "@rjsf/chakra-ui" : path.resolve(__dirname, '../chakra-ui/src'),
-      "@rjsf/core" : path.resolve(__dirname, '../core/src'),
-      "@rjsf/fluent-ui" : path.resolve(__dirname, '../fluent-ui/src'),
-      "@rjsf/material-ui" : path.resolve(__dirname, '../material-ui/src'),
-      "@rjsf/mui" : path.resolve(__dirname, '../mui/src'),
-      "@rjsf/semantic-ui" : path.resolve(__dirname, '../semantic-ui/src'),
-      "@rjsf/utils": path.resolve(__dirname, '../utils/src'),
-      "@rjsf/validator-ajv8" : path.resolve(__dirname, '../validator-ajv8/src'),
+      '@rjsf/antd': path.resolve(__dirname, '../antd/src'),
+      '@rjsf/bootstrap-4': path.resolve(__dirname, '../bootstrap-4/src'),
+      '@rjsf/chakra-ui': path.resolve(__dirname, '../chakra-ui/src'),
+      '@rjsf/core': path.resolve(__dirname, '../core/src'),
+      '@rjsf/fluent-ui': path.resolve(__dirname, '../fluent-ui/src'),
+      '@rjsf/material-ui': path.resolve(__dirname, '../material-ui/src'),
+      '@rjsf/mui': path.resolve(__dirname, '../mui/src'),
+      '@rjsf/semantic-ui': path.resolve(__dirname, '../semantic-ui/src'),
+      '@rjsf/utils': path.resolve(__dirname, '../utils/src'),
+      '@rjsf/validator-ajv8': path.resolve(__dirname, '../validator-ajv8/src'),
       // validator-ajv6 can not be mapped directly to the sources, because that causes wrong ajv version resolution
       // which looks related to: https://github.com/vitejs/vite/issues/12618
       //
       // the difference when mapping directly vs mapping to src folder - @vitejs/plugin-react can not be applied in the 2nd case
-      "@rjsf/validator-ajv6" : '@rjsf/validator-ajv6/src',
+      '@rjsf/validator-ajv6': '@rjsf/validator-ajv6/src',
     },
   },
 });
diff --git a/packages/semantic-ui/.eslintrc b/packages/semantic-ui/.eslintrc
@@ -1,4 +1,4 @@
 {
-  "extends": "../../.eslintrc-typescript",
+  "extends": "../../.eslintrc",
   "plugins": ["@typescript-eslint", "jsx-a11y", "react", "import"]
 }
diff --git a/packages/semantic-ui/package.json b/packages/semantic-ui/package.json
@@ -29,8 +29,7 @@
   },
   "lint-staged": {
     "{src,test}/**/*.ts(x)": [
-      "eslint --fix",
-      "prettier --write"
+      "eslint --fix"
     ]
   },
   "peerDependencies": {

diff --git a/packages/utils/.eslintrc b/packages/utils/.eslintrc
@@ -1,4 +1,4 @@
 {
-  "extends": ["../../.eslintrc-typescript"],
+  "extends": ["../../.eslintrc"],
   "plugins": ["@typescript-eslint", "jsx-a11y", "react", "import"]
 }
diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -29,8 +29,7 @@
   },
   "lint-staged": {
     "{src,test}/**/*.ts?(x)": [
-      "eslint --fix",
-      "prettier --write"
+      "eslint --fix"
     ]
   },
   "peerDependencies": {

diff --git a/packages/validator-ajv6/.eslintrc b/packages/validator-ajv6/.eslintrc
@@ -1,4 +1,4 @@
 {
-  "extends": ["../../.eslintrc-typescript"],
+  "extends": ["../../.eslintrc"],
   "plugins": ["@typescript-eslint", "jsx-a11y", "react", "import"]
 }
diff --git a/packages/validator-ajv6/package.json b/packages/validator-ajv6/package.json
@@ -28,8 +28,7 @@
   },
   "lint-staged": {
     "{src,test}/**/*.ts?(x)": [
-      "eslint --fix",
-      "prettier --write"
+      "eslint --fix"
     ]
   },
   "dependencies": {

diff --git a/packages/validator-ajv8/.eslintrc b/packages/validator-ajv8/.eslintrc
@@ -1,4 +1,4 @@
 {
-  "extends": ["../../.eslintrc-typescript"],
+  "extends": ["../../.eslintrc"],
   "plugins": ["@typescript-eslint", "jsx-a11y", "react", "import"]
 }
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		const defaultConfig = require('../../babel.config');

		module.exports = defaultConfig;