Merge branch 'main' into svg_io

alexrudd2 · Jan 23, 2025 · a4bbc7d · a4bbc7d
2 parents 72f964d + 4805a74
commit a4bbc7d
Show file tree

Hide file tree

Showing 15 changed files with 947 additions and 680 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,6 +1,6 @@
 module.exports = {
   parser: '@typescript-eslint/parser',
-  plugins: ['@typescript-eslint'],
+  plugins: ['@typescript-eslint', '@stylistic/eslint-plugin'],
   extends: [
     'eslint:recommended',
     'plugin:react/recommended',
@@ -15,14 +15,18 @@ module.exports = {
     // Place to specify ESLint rules. Can be used to overwrite rules specified from the extended configs
     // e.g. "@typescript-eslint/explicit-function-return-type": "off",
     indent: "off",
-    "@typescript-eslint/indent": ["error", 2],
     "@typescript-eslint/no-use-before-define": "off",
     "@typescript-eslint/no-explicit-any": "off",
     "@typescript-eslint/explicit-function-return-type": "off",
     "@typescript-eslint/no-unused-vars": ["error", {
       argsIgnorePattern: "^_",
       varsIgnorePattern: "^_",
     }],
+    '@stylistic/indent': ['error', 2],
+    "@stylistic/space-infix-ops": 1,
+    '@stylistic/object-curly-spacing': ['error', 'always'],
+    // "semi": [1, "always"],
+    // "consistent-return": 2,
   },
   settings: {
     react: {