From ae429238d4bc16ef0bae9299cb52f4fcb1f826db Mon Sep 17 00:00:00 2001
From: Satya Patel <satyapatel111@gmail.com>
Date: Mon, 13 Oct 2025 23:56:16 -0700
Subject: [PATCH] WIP

---
 tooling/eslint/base.js    | 10 +++++-----
 tooling/prettier/index.js |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tooling/eslint/base.js b/tooling/eslint/base.js
index f35bdcf5da..1871a35322 100644
--- a/tooling/eslint/base.js
+++ b/tooling/eslint/base.js
@@ -58,10 +58,11 @@ export default tseslint.config(
                     varsIgnorePattern: '^_',
                 },
             ],
-            '@typescript-eslint/consistent-type-imports': [
-                'warn',
-                { prefer: 'type-imports', fixStyle: 'inline-type-imports' },
-            ],
+            // Disabled: Let prettier handle type import style via @ianvs/prettier-plugin-sort-imports
+            // '@typescript-eslint/consistent-type-imports': [
+            //     'warn',
+            //     { prefer: 'type-imports', fixStyle: 'separate-type-imports' },
+            // ],
             '@typescript-eslint/no-misused-promises': [
                 2,
                 { checksVoidReturn: { attributes: false } },
@@ -73,7 +74,6 @@ export default tseslint.config(
                 },
             ],
             '@typescript-eslint/no-non-null-assertion': 'error',
-            'import/consistent-type-specifier-style': ['error', 'prefer-top-level'],
         },
     },
     {
diff --git a/tooling/prettier/index.js b/tooling/prettier/index.js
index c42707820a..cc3ee2ee65 100644
--- a/tooling/prettier/index.js
+++ b/tooling/prettier/index.js
@@ -31,7 +31,7 @@ const config = {
         '^[./]',
     ],
     importOrderParserPlugins: ['typescript', 'jsx', 'decorators-legacy'],
-    importOrderTypeScriptVersion: '4.4.0',
+    importOrderTypeScriptVersion: '5.8.2',
 };
 
 export default config;