diff --git a/internal/lint-configs/eslint-config/package.json b/internal/lint-configs/eslint-config/package.json index 28ec876d0..df7ec3d3c 100644 --- a/internal/lint-configs/eslint-config/package.json +++ b/internal/lint-configs/eslint-config/package.json @@ -28,8 +28,7 @@ }, "dependencies": { "@vben/oxlint-config": "workspace:*", - "eslint-config-turbo": "catalog:", - "eslint-plugin-command": "catalog:" + "eslint-config-turbo": "catalog:" }, "devDependencies": { "@eslint/js": "catalog:", diff --git a/internal/lint-configs/eslint-config/src/configs/command.ts b/internal/lint-configs/eslint-config/src/configs/command.ts deleted file mode 100644 index d0c902de2..000000000 --- a/internal/lint-configs/eslint-config/src/configs/command.ts +++ /dev/null @@ -1,9 +0,0 @@ -import createCommand from 'eslint-plugin-command/config'; - -export async function command() { - return [ - { - ...createCommand(), - }, - ]; -} diff --git a/internal/lint-configs/eslint-config/src/configs/index.ts b/internal/lint-configs/eslint-config/src/configs/index.ts index b9d53cc1c..3ce6f248d 100644 --- a/internal/lint-configs/eslint-config/src/configs/index.ts +++ b/internal/lint-configs/eslint-config/src/configs/index.ts @@ -1,4 +1,3 @@ -export * from './command'; export * from './ignores'; export * from './javascript'; export * from './jsonc'; diff --git a/internal/lint-configs/eslint-config/src/index.ts b/internal/lint-configs/eslint-config/src/index.ts index 02a6c4bda..e5d6a91aa 100644 --- a/internal/lint-configs/eslint-config/src/index.ts +++ b/internal/lint-configs/eslint-config/src/index.ts @@ -1,7 +1,6 @@ import type { Linter } from 'eslint'; import { - command, ignores, javascript, jsonc, @@ -34,7 +33,6 @@ async function defineConfig(config: FlatConfig[] = []) { node(), perfectionist(), unicorn(), - command(), turbo(), yaml(), pnpm(), diff --git a/internal/lint-configs/oxlint-config/package.json b/internal/lint-configs/oxlint-config/package.json index ac2aabcbe..05d3bedfe 100644 --- a/internal/lint-configs/oxlint-config/package.json +++ b/internal/lint-configs/oxlint-config/package.json @@ -29,6 +29,7 @@ "dependencies": { "@eslint-community/eslint-plugin-eslint-comments": "catalog:", "eslint-plugin-better-tailwindcss": "catalog:", + "eslint-plugin-command": "catalog:", "oxlint": "catalog:" } } diff --git a/internal/lint-configs/oxlint-config/src/configs/command.ts b/internal/lint-configs/oxlint-config/src/configs/command.ts new file mode 100644 index 000000000..1a3498cb4 --- /dev/null +++ b/internal/lint-configs/oxlint-config/src/configs/command.ts @@ -0,0 +1,15 @@ +import type { OxlintConfig } from 'oxlint'; + +const command: OxlintConfig = { + jsPlugins: [ + { + name: 'command', + specifier: 'eslint-plugin-command', + }, + ], + rules: { + 'command/command': 'error', + }, +}; + +export { command }; diff --git a/internal/lint-configs/oxlint-config/src/configs/index.ts b/internal/lint-configs/oxlint-config/src/configs/index.ts index 35a6b6b6c..361ced9a2 100644 --- a/internal/lint-configs/oxlint-config/src/configs/index.ts +++ b/internal/lint-configs/oxlint-config/src/configs/index.ts @@ -2,6 +2,7 @@ import type { OxlintConfig } from 'oxlint'; import { defineConfig as defineOxlintConfig } from 'oxlint'; +import { command } from './command'; import { comments } from './comments'; import { ignores } from './ignores'; import { importPluginConfig } from './import'; @@ -61,6 +62,7 @@ function mergeOxlintConfigs(...configs: OxlintConfig[]): OxlintConfig { const oxlintConfig = defineOxlintConfig( mergeOxlintConfigs( javascript, + command, comments, ignores, plugins, @@ -76,6 +78,7 @@ const oxlintConfig = defineOxlintConfig( ); export { + command, comments, ignores, importPluginConfig,