From 85741240f1a21a42c2ea846b66c99c08d957c6ff Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Sat, 6 Dec 2025 14:50:41 +0200
Subject: [PATCH] chore(eslint): reintegrate simple import sort

---
 _regroup/eslint.config.js | 26 --------------------------
 eslint.config.mjs         | 22 ++++++++++++++++++++++
 package.json              |  1 +
 pnpm-lock.yaml            | 19 ++++++++++++-------
 4 files changed, 35 insertions(+), 33 deletions(-)
 delete mode 100644 _regroup/eslint.config.js

diff --git a/_regroup/eslint.config.js b/_regroup/eslint.config.js
deleted file mode 100644
index 2162c7eb7..000000000
--- a/_regroup/eslint.config.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import tseslint from "typescript-eslint";
-import simpleImportSort from "eslint-plugin-simple-import-sort";
-
-export default tseslint.config(
-    {
-        plugins: {
-            "simple-import-sort": simpleImportSort
-        }
-    },
-    {
-        rules: {
-            // add rule overrides here
-            "no-undef": "off",
-            "no-unused-vars": "off",
-            "@typescript-eslint/no-unused-vars": [
-                "error",
-                {
-                    argsIgnorePattern: "^_",
-                    varsIgnorePattern: "^_"
-                }
-            ],
-            "simple-import-sort/imports": "error",
-            "simple-import-sort/exports": "error"
-        }
-    }
-);
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 082bcad22..11628d8a0 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -3,6 +3,7 @@
 import eslint from '@eslint/js';
 import { defineConfig, globalIgnores } from 'eslint/config';
 import tseslint from 'typescript-eslint';
+import simpleImportSort from "eslint-plugin-simple-import-sort";
 
 export default defineConfig(
   globalIgnores([
@@ -29,5 +30,26 @@ export default defineConfig(
         tsconfigRootDir: import.meta.dirname
       }
     }
+  },
+  {
+    plugins: {
+      "simple-import-sort": simpleImportSort
+    },
+
+    rules: {
+      "no-undef": "off",
+      "no-unused-vars": "off",
+
+      "@typescript-eslint/no-unused-vars": [
+        "error",
+        {
+          argsIgnorePattern: "^_",
+          varsIgnorePattern: "^_"
+        }
+      ],
+
+      "simple-import-sort/imports": "error",
+      "simple-import-sort/exports": "error"
+    }
   }
 );
diff --git a/package.json b/package.json
index 35068b908..de41a674e 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,7 @@
     "eslint-config-prettier": "10.1.8",
     "eslint-plugin-playwright": "2.4.0",
     "eslint-plugin-react-hooks": "7.0.1",
+    "eslint-plugin-simple-import-sort": "12.1.1",
     "happy-dom": "~20.0.0",
     "http-server": "14.1.1",
     "jiti": "2.6.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a04e794e4..05e111d24 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -85,6 +85,9 @@ importers:
       eslint-plugin-react-hooks:
         specifier: 7.0.1
         version: 7.0.1(eslint@9.39.1(jiti@2.6.1))
+      eslint-plugin-simple-import-sort:
+        specifier: 12.1.1
+        version: 12.1.1(eslint@9.39.1(jiti@2.6.1))
       happy-dom:
         specifier: ~20.0.0
         version: 20.0.11
@@ -154,9 +157,6 @@ importers:
 
   apps/client:
     dependencies:
-      '@eslint/js':
-        specifier: 9.39.1
-        version: 9.39.1
       '@excalidraw/excalidraw':
         specifier: 0.18.0
         version: 0.18.0(@types/react-dom@19.1.6(@types/react@19.1.7))(@types/react@19.1.7)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
@@ -7812,6 +7812,11 @@ packages:
     peerDependencies:
       eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7
 
+  eslint-plugin-simple-import-sort@12.1.1:
+    resolution: {integrity: sha512-6nuzu4xwQtE3332Uz0to+TxDQYRLTKRESSc2hefVT48Zc8JthmN23Gx9lnYhu0FtkRSL1oxny3kJ2aveVhmOVA==}
+    peerDependencies:
+      eslint: '>=5.0.0'
+
   eslint-scope@5.1.1:
     resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
     engines: {node: '>=8.0.0'}
@@ -15305,8 +15310,6 @@ snapshots:
       '@ckeditor/ckeditor5-utils': 47.3.0
       ckeditor5: 47.3.0
       es-toolkit: 1.39.5
-    transitivePeerDependencies:
-      - supports-color
 
   '@ckeditor/ckeditor5-editor-classic@47.3.0':
     dependencies:
@@ -15358,8 +15361,6 @@ snapshots:
       '@ckeditor/ckeditor5-table': 47.3.0
       '@ckeditor/ckeditor5-utils': 47.3.0
       ckeditor5: 47.3.0
-    transitivePeerDependencies:
-      - supports-color
 
   '@ckeditor/ckeditor5-emoji@47.3.0':
     dependencies:
@@ -23278,6 +23279,10 @@ snapshots:
       string.prototype.matchall: 4.0.12
       string.prototype.repeat: 1.0.0
 
+  eslint-plugin-simple-import-sort@12.1.1(eslint@9.39.1(jiti@2.6.1)):
+    dependencies:
+      eslint: 9.39.1(jiti@2.6.1)
+
   eslint-scope@5.1.1:
     dependencies:
       esrecurse: 4.3.0