From c3e2d2a66da834880bf21f573bb2015af055a88d Mon Sep 17 00:00:00 2001
From: Anthony Fu <github@antfu.me>
Date: Wed, 4 Sep 2024 13:56:06 +0200
Subject: [PATCH] feat: move disable rules to the end, remove deprecated rules

---
 src/configs/astro.ts      |  1 -
 src/configs/disables.ts   | 55 +++++++++++++++++++++++++++++++++++++++
 src/configs/imports.ts    |  9 -------
 src/configs/index.ts      |  1 +
 src/configs/javascript.ts |  8 ------
 src/configs/markdown.ts   |  1 -
 src/configs/test.ts       |  1 +
 src/configs/typescript.ts | 27 -------------------
 src/factory.ts            |  5 ++++
 9 files changed, 62 insertions(+), 46 deletions(-)
 create mode 100644 src/configs/disables.ts

diff --git a/src/configs/astro.ts b/src/configs/astro.ts
index 6ae51f270a..70e4985896 100644
--- a/src/configs/astro.ts
+++ b/src/configs/astro.ts
@@ -58,7 +58,6 @@ export async function astro(
           ? {
               'style/indent': 'off',
               'style/jsx-closing-tag-location': 'off',
-              'style/jsx-indent': 'off',
               'style/jsx-one-expression-per-line': 'off',
               'style/no-multiple-empty-lines': 'off',
             }
diff --git a/src/configs/disables.ts b/src/configs/disables.ts
new file mode 100644
index 0000000000..0d585ecca2
--- /dev/null
+++ b/src/configs/disables.ts
@@ -0,0 +1,55 @@
+import { GLOB_SRC, GLOB_SRC_EXT } from '../globs'
+import type { TypedFlatConfigItem } from '../types'
+
+export async function disables(): Promise<TypedFlatConfigItem[]> {
+  return [
+    {
+      files: [`scripts/${GLOB_SRC}`],
+      name: 'antfu/disables/scripts',
+      rules: {
+        'no-console': 'off',
+        'ts/explicit-function-return-type': 'off',
+        'unicorn/consistent-function-scoping': 'off',
+      },
+    },
+    {
+      files: [`cli/${GLOB_SRC}`, `cli.${GLOB_SRC_EXT}`],
+      name: 'antfu/disables/cli',
+      rules: {
+        'no-console': 'off',
+      },
+    },
+    {
+      files: ['**/bin/**/*', `**/bin.${GLOB_SRC_EXT}`],
+      name: 'antfu/disables/bin',
+      rules: {
+        'antfu/no-import-dist': 'off',
+        'antfu/no-import-node-modules-by-path': 'off',
+      },
+    },
+    {
+      files: ['**/*.d.?([cm])ts'],
+      name: 'antfu/disables/dts',
+      rules: {
+        'eslint-comments/no-unlimited-disable': 'off',
+        'import/no-duplicates': 'off',
+        'no-restricted-syntax': 'off',
+        'unused-imports/no-unused-vars': 'off',
+      },
+    },
+    {
+      files: ['**/*.{test,spec}.([tj])s?(x)'],
+      name: 'antfu/disables/test',
+      rules: {
+        'no-unused-expressions': 'off',
+      },
+    },
+    {
+      files: ['**/*.js', '**/*.cjs'],
+      name: 'antfu/disables/cjs',
+      rules: {
+        'ts/no-require-imports': 'off',
+      },
+    },
+  ]
+}
diff --git a/src/configs/imports.ts b/src/configs/imports.ts
index a64b8cfd23..1ae2a263e9 100644
--- a/src/configs/imports.ts
+++ b/src/configs/imports.ts
@@ -1,6 +1,5 @@
 import type { OptionsStylistic, TypedFlatConfigItem } from '../types'
 import { pluginAntfu, pluginImport } from '../plugins'
-import { GLOB_SRC_EXT } from '../globs'
 
 export async function imports(options: OptionsStylistic = {}): Promise<TypedFlatConfigItem[]> {
   const {
@@ -34,13 +33,5 @@ export async function imports(options: OptionsStylistic = {}): Promise<TypedFlat
           : {},
       },
     },
-    {
-      files: ['**/bin/**/*', `**/bin.${GLOB_SRC_EXT}`],
-      name: 'antfu/imports/disables/bin',
-      rules: {
-        'antfu/no-import-dist': 'off',
-        'antfu/no-import-node-modules-by-path': 'off',
-      },
-    },
   ]
 }
diff --git a/src/configs/index.ts b/src/configs/index.ts
index 6786c6baba..8c2e5f5a7c 100644
--- a/src/configs/index.ts
+++ b/src/configs/index.ts
@@ -24,3 +24,4 @@ export * from './unocss'
 export * from './vue'
 export * from './yaml'
 export * from './regexp'
+export * from './disables'
diff --git a/src/configs/javascript.ts b/src/configs/javascript.ts
index dc68b8e6da..0eef205854 100644
--- a/src/configs/javascript.ts
+++ b/src/configs/javascript.ts
@@ -1,7 +1,6 @@
 import globals from 'globals'
 import type { OptionsIsInEditor, OptionsOverrides, TypedFlatConfigItem } from '../types'
 import { pluginAntfu, pluginUnusedImports } from '../plugins'
-import { GLOB_SRC, GLOB_SRC_EXT } from '../globs'
 
 export async function javascript(
   options: OptionsIsInEditor & OptionsOverrides = {},
@@ -219,12 +218,5 @@ export async function javascript(
         ...overrides,
       },
     },
-    {
-      files: [`scripts/${GLOB_SRC}`, `cli.${GLOB_SRC_EXT}`],
-      name: 'antfu/javascript/disables/cli',
-      rules: {
-        'no-console': 'off',
-      },
-    },
   ]
 }
diff --git a/src/configs/markdown.ts b/src/configs/markdown.ts
index 5d65c57e41..6d38533a48 100644
--- a/src/configs/markdown.ts
+++ b/src/configs/markdown.ts
@@ -78,7 +78,6 @@ export async function markdown(
         'ts/no-unused-expressions': 'off',
         'ts/no-unused-vars': 'off',
         'ts/no-use-before-define': 'off',
-        'ts/no-var-requires': 'off',
 
         'unicode-bom': 'off',
         'unused-imports/no-unused-imports': 'off',
diff --git a/src/configs/test.ts b/src/configs/test.ts
index 83df7c4044..69893eb67d 100644
--- a/src/configs/test.ts
+++ b/src/configs/test.ts
@@ -53,6 +53,7 @@ export async function test(
         'test/prefer-lowercase-title': 'error',
 
         'ts/explicit-function-return-type': 'off',
+        'unicorn/consistent-function-scoping': 'off',
 
         ...overrides,
       },
diff --git a/src/configs/typescript.ts b/src/configs/typescript.ts
index 89115b200b..a78e810a9b 100644
--- a/src/configs/typescript.ts
+++ b/src/configs/typescript.ts
@@ -119,7 +119,6 @@ export async function typescript(
           { '@typescript-eslint': 'ts' },
         ),
         'no-dupe-class-members': 'off',
-        'no-loss-of-precision': 'off',
         'no-redeclare': 'off',
         'no-use-before-define': 'off',
         'no-useless-constructor': 'off',
@@ -138,7 +137,6 @@ export async function typescript(
         'ts/no-extraneous-class': 'off',
         'ts/no-import-type-side-effects': 'error',
         'ts/no-invalid-void-type': 'off',
-        'ts/no-loss-of-precision': 'error',
         'ts/no-non-null-assertion': 'off',
         'ts/no-redeclare': 'error',
         'ts/no-require-imports': 'error',
@@ -173,30 +171,5 @@ export async function typescript(
           },
         }]
       : [],
-    {
-      files: ['**/*.d.?([cm])ts'],
-      name: 'antfu/typescript/disables/dts',
-      rules: {
-        'eslint-comments/no-unlimited-disable': 'off',
-        'import/no-duplicates': 'off',
-        'no-restricted-syntax': 'off',
-        'unused-imports/no-unused-vars': 'off',
-      },
-    },
-    {
-      files: ['**/*.{test,spec}.ts?(x)'],
-      name: 'antfu/typescript/disables/test',
-      rules: {
-        'no-unused-expressions': 'off',
-      },
-    },
-    {
-      files: ['**/*.js', '**/*.cjs'],
-      name: 'antfu/typescript/disables/cjs',
-      rules: {
-        'ts/no-require-imports': 'off',
-        'ts/no-var-requires': 'off',
-      },
-    },
   ]
 }
diff --git a/src/factory.ts b/src/factory.ts
index aee117f21c..982d6cda17 100644
--- a/src/factory.ts
+++ b/src/factory.ts
@@ -6,6 +6,7 @@ import {
   astro,
   command,
   comments,
+  disables,
   ignores,
   imports,
   javascript,
@@ -282,6 +283,10 @@ export function antfu(
     ))
   }
 
+  configs.push(
+    disables(),
+  )
+
   if ('files' in options) {
     throw new Error('[@antfu/eslint-config] The first argument should not contain the "files" property as the options are supposed to be global. Place it in the second or later config instead.')
   }