Fix eslint config

TryQuiet · Jun 19, 2023 · f8d1b38 · f8d1b38
1 parent ff0d219
commit f8d1b38
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 64 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/eslint-config-custom/.prettierrc.js b/packages/eslint-config-custom/.prettierrc.js
@@ -1,27 +1,10 @@
-// const prettierConfigStandard = require('prettier-config-standard')
-
-// {
-//   "arrowParens": "always",
-//   "bracketSpacing": true,
-//   "jsxBracketSameLine": false,
-//   "jsxSingleQuote": false,
-//   "quoteProps": "as-needed",
-//   "singleQuote": true,
-//   "semi": false,
-//   "printWidth": 140,
-//   "useTabs": false,
-//   "tabWidth": 2,
-//   "trailingComma": "es5"
-// }
-
 const modifiedConfig = {
-  // ...prettierConfigStandard,
   singleQuote: true,
   jsxSingleQuote: true,
   spaceBeforeFunctionParen: true,
   printWidth: 100,
-  parser: 'typescript'
-  // ... other modified settings here
+  parser: 'typescript',
+  semi: false
 }
 
 module.exports = modifiedConfig
diff --git a/packages/eslint-config-custom/index.js b/packages/eslint-config-custom/index.js
@@ -2,12 +2,16 @@ module.exports = {
   env: {
     "jest/globals": true
   },
-  extends: ['standard-with-typescript', 'plugin:prettier/recommended',],
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:prettier/recommended'
+  ],
   parserOptions: {
     project: './tsconfig.json'
   },
   parser: '@typescript-eslint/parser',
-  plugins: ['react-hooks', 'jest', 'prettier'],
+  plugins: ['@typescript-eslint', 'react-hooks', 'jest'],
   rules: {
     'node/no-path-concat': 'off',
     'multiline-ternary': 'off',
@@ -58,7 +62,14 @@ module.exports = {
         }
       }
     ],
-    // "prettier/prettier": "error"
+    // 'prettier/prettier': [
+    //   "error", {
+    //     semi: false,
+    //     singleQuote: true
+    //   },
+    //   {
+    //     "usePrettierrc": false
+    //   }],
   },
   overrides: [
     {