get our lint config passing

keyboardio · Jan 17, 2024 · 0cd1e09 · 0cd1e09
1 parent fc17cd3
commit 0cd1e09
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.editorconfig b/.editorconfig
@@ -4,3 +4,4 @@ charset = utf-8
 indent_style = space
 tab_width = 2
 max_line_length = 120
+indent_size = 2
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,12 +1,13 @@
 module.exports = {
+  plugins: [ "editorconfig" ],
   extends: [
+    "plugin:editorconfig/noconflict",
     "eslint:recommended",
     "plugin:import/recommended",
     "plugin:react/recommended",
     "plugin:react-hooks/recommended",
     "plugin:jsx-a11y/recommended",
     "plugin:prettier/recommended",
-    "plugin:editorconfig/all",
   ],
   parser: "@babel/eslint-parser",
   parserOptions: {