From 95ae764d6308a2b9f23641d1d220c8469cfbbbce Mon Sep 17 00:00:00 2001 From: bzp2010 Date: Wed, 13 Aug 2025 15:10:55 +0800 Subject: [PATCH 1/3] chore: move eslintrc to eslint flat config --- .eslintignore | 1 - .eslintrc.json | 48 ------------------- apps/cli/.eslintrc.json | 18 ------- apps/cli/eslint.config.mjs | 22 +++++++++ eslint.config.mjs | 48 +++++++++++++++++++ libs/backend-api7/.eslintrc.json | 18 ------- libs/backend-api7/eslint.config.mjs | 22 +++++++++ libs/backend-api7/src/typing.ts | 1 - libs/backend-apisix-standalone/.eslintrc.json | 18 ------- .../eslint.config.mjs | 22 +++++++++ libs/backend-apisix/.eslintrc.json | 18 ------- libs/backend-apisix/eslint.config.mjs | 22 +++++++++ libs/converter-openapi/.eslintrc.json | 18 ------- libs/converter-openapi/eslint.config.mjs | 22 +++++++++ libs/differ/eslint.config.cjs | 19 -------- libs/differ/eslint.config.mjs | 22 +++++++++ libs/differ/src/differv3.ts | 2 +- libs/differ/vitest.config.ts | 2 +- libs/sdk/.eslintrc.json | 25 ---------- libs/sdk/eslint.config.mjs | 22 +++++++++ nx.json | 8 ++-- package.json | 4 +- pnpm-lock.yaml | 6 --- 23 files changed, 208 insertions(+), 200 deletions(-) delete mode 100644 .eslintignore delete mode 100644 .eslintrc.json delete mode 100644 apps/cli/.eslintrc.json create mode 100644 apps/cli/eslint.config.mjs create mode 100644 eslint.config.mjs delete mode 100644 libs/backend-api7/.eslintrc.json create mode 100644 libs/backend-api7/eslint.config.mjs delete mode 100644 libs/backend-apisix-standalone/.eslintrc.json create mode 100644 libs/backend-apisix-standalone/eslint.config.mjs delete mode 100644 libs/backend-apisix/.eslintrc.json create mode 100644 libs/backend-apisix/eslint.config.mjs delete mode 100644 libs/converter-openapi/.eslintrc.json create mode 100644 libs/converter-openapi/eslint.config.mjs delete mode 100644 libs/differ/eslint.config.cjs create mode 100644 libs/differ/eslint.config.mjs delete mode 100644 libs/sdk/.eslintrc.json create mode 100644 libs/sdk/eslint.config.mjs diff --git a/.eslintignore b/.eslintignore deleted file mode 100644 index 3c3629e6..00000000 --- a/.eslintignore +++ /dev/null @@ -1 +0,0 @@ -node_modules diff --git a/.eslintrc.json b/.eslintrc.json deleted file mode 100644 index 46b63e71..00000000 --- a/.eslintrc.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "root": true, - "ignorePatterns": ["**/*"], - "plugins": ["@nx"], - "overrides": [ - { - "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], - "rules": { - "@nx/enforce-module-boundaries": [ - "error", - { - "enforceBuildableLibDependency": true, - "allow": [], - "depConstraints": [ - { - "sourceTag": "*", - "onlyDependOnLibsWithTags": ["*"] - } - ] - } - ] - } - }, - { - "files": ["*.ts", "*.tsx"], - "extends": ["plugin:@nx/typescript"], - "rules": { - "@typescript-eslint/no-extra-semi": "error", - "no-extra-semi": "off" - } - }, - { - "files": ["*.js", "*.jsx"], - "extends": ["plugin:@nx/javascript"], - "rules": { - "@typescript-eslint/no-extra-semi": "error", - "no-extra-semi": "off" - } - }, - { - "files": ["*.spec.ts", "*.spec.tsx", "*.spec.js", "*.spec.jsx"], - "env": { - "jest": true - }, - "rules": {} - } - ] -} diff --git a/apps/cli/.eslintrc.json b/apps/cli/.eslintrc.json deleted file mode 100644 index 9d9c0db5..00000000 --- a/apps/cli/.eslintrc.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "extends": ["../../.eslintrc.json"], - "ignorePatterns": ["!**/*"], - "overrides": [ - { - "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], - "rules": {} - }, - { - "files": ["*.ts", "*.tsx"], - "rules": {} - }, - { - "files": ["*.js", "*.jsx"], - "rules": {} - } - ] -} diff --git a/apps/cli/eslint.config.mjs b/apps/cli/eslint.config.mjs new file mode 100644 index 00000000..68e70dca --- /dev/null +++ b/apps/cli/eslint.config.mjs @@ -0,0 +1,22 @@ +import baseConfig from '../../eslint.config.mjs'; + +export default [ + ...baseConfig, + { + files: ['**/*.json'], + rules: { + '@nx/dependency-checks': [ + 'error', + { + ignoredFiles: [ + '{projectRoot}/eslint.config.{js,cjs,mjs,ts,cts,mts}', + '{projectRoot}/vite.config.{js,ts,mjs,mts}', + ], + }, + ], + }, + languageOptions: { + parser: await import('jsonc-eslint-parser'), + }, + }, +]; diff --git a/eslint.config.mjs b/eslint.config.mjs new file mode 100644 index 00000000..60b64cf0 --- /dev/null +++ b/eslint.config.mjs @@ -0,0 +1,48 @@ +import nx from '@nx/eslint-plugin'; + +export default [ + ...nx.configs['flat/base'], + ...nx.configs['flat/typescript'], + ...nx.configs['flat/javascript'], + { + ignores: [ + 'node_modules', + '**/dist', + '**/vite.config.*.timestamp*', + '**/vitest.config.*.timestamp*', + '**/test-output', + ], + }, + { + files: ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx', '**/*.vue'], + rules: { + '@nx/enforce-module-boundaries': [ + 'error', + { + enforceBuildableLibDependency: true, + allow: ['^.*/eslint(\\.base)?\\.config\\.[cm]?[jt]s$'], + depConstraints: [ + { + sourceTag: '*', + onlyDependOnLibsWithTags: ['*'], + }, + ], + }, + ], + }, + }, + { + files: [ + '**/*.ts', + '**/*.tsx', + '**/*.cts', + '**/*.mts', + '**/*.js', + '**/*.jsx', + '**/*.cjs', + '**/*.mjs', + ], + // Override or add rules here + rules: {}, + }, +]; diff --git a/libs/backend-api7/.eslintrc.json b/libs/backend-api7/.eslintrc.json deleted file mode 100644 index 9d9c0db5..00000000 --- a/libs/backend-api7/.eslintrc.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "extends": ["../../.eslintrc.json"], - "ignorePatterns": ["!**/*"], - "overrides": [ - { - "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], - "rules": {} - }, - { - "files": ["*.ts", "*.tsx"], - "rules": {} - }, - { - "files": ["*.js", "*.jsx"], - "rules": {} - } - ] -} diff --git a/libs/backend-api7/eslint.config.mjs b/libs/backend-api7/eslint.config.mjs new file mode 100644 index 00000000..68e70dca --- /dev/null +++ b/libs/backend-api7/eslint.config.mjs @@ -0,0 +1,22 @@ +import baseConfig from '../../eslint.config.mjs'; + +export default [ + ...baseConfig, + { + files: ['**/*.json'], + rules: { + '@nx/dependency-checks': [ + 'error', + { + ignoredFiles: [ + '{projectRoot}/eslint.config.{js,cjs,mjs,ts,cts,mts}', + '{projectRoot}/vite.config.{js,ts,mjs,mts}', + ], + }, + ], + }, + languageOptions: { + parser: await import('jsonc-eslint-parser'), + }, + }, +]; diff --git a/libs/backend-api7/src/typing.ts b/libs/backend-api7/src/typing.ts index 4067bf3d..51e97e29 100644 --- a/libs/backend-api7/src/typing.ts +++ b/libs/backend-api7/src/typing.ts @@ -1,6 +1,5 @@ import { PluginMetadata as ADCPluginMetadata, - Upstream as ADCUpstream, Expr, Labels, Plugins, diff --git a/libs/backend-apisix-standalone/.eslintrc.json b/libs/backend-apisix-standalone/.eslintrc.json deleted file mode 100644 index 9d9c0db5..00000000 --- a/libs/backend-apisix-standalone/.eslintrc.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "extends": ["../../.eslintrc.json"], - "ignorePatterns": ["!**/*"], - "overrides": [ - { - "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], - "rules": {} - }, - { - "files": ["*.ts", "*.tsx"], - "rules": {} - }, - { - "files": ["*.js", "*.jsx"], - "rules": {} - } - ] -} diff --git a/libs/backend-apisix-standalone/eslint.config.mjs b/libs/backend-apisix-standalone/eslint.config.mjs new file mode 100644 index 00000000..68e70dca --- /dev/null +++ b/libs/backend-apisix-standalone/eslint.config.mjs @@ -0,0 +1,22 @@ +import baseConfig from '../../eslint.config.mjs'; + +export default [ + ...baseConfig, + { + files: ['**/*.json'], + rules: { + '@nx/dependency-checks': [ + 'error', + { + ignoredFiles: [ + '{projectRoot}/eslint.config.{js,cjs,mjs,ts,cts,mts}', + '{projectRoot}/vite.config.{js,ts,mjs,mts}', + ], + }, + ], + }, + languageOptions: { + parser: await import('jsonc-eslint-parser'), + }, + }, +]; diff --git a/libs/backend-apisix/.eslintrc.json b/libs/backend-apisix/.eslintrc.json deleted file mode 100644 index 9d9c0db5..00000000 --- a/libs/backend-apisix/.eslintrc.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "extends": ["../../.eslintrc.json"], - "ignorePatterns": ["!**/*"], - "overrides": [ - { - "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], - "rules": {} - }, - { - "files": ["*.ts", "*.tsx"], - "rules": {} - }, - { - "files": ["*.js", "*.jsx"], - "rules": {} - } - ] -} diff --git a/libs/backend-apisix/eslint.config.mjs b/libs/backend-apisix/eslint.config.mjs new file mode 100644 index 00000000..68e70dca --- /dev/null +++ b/libs/backend-apisix/eslint.config.mjs @@ -0,0 +1,22 @@ +import baseConfig from '../../eslint.config.mjs'; + +export default [ + ...baseConfig, + { + files: ['**/*.json'], + rules: { + '@nx/dependency-checks': [ + 'error', + { + ignoredFiles: [ + '{projectRoot}/eslint.config.{js,cjs,mjs,ts,cts,mts}', + '{projectRoot}/vite.config.{js,ts,mjs,mts}', + ], + }, + ], + }, + languageOptions: { + parser: await import('jsonc-eslint-parser'), + }, + }, +]; diff --git a/libs/converter-openapi/.eslintrc.json b/libs/converter-openapi/.eslintrc.json deleted file mode 100644 index 9d9c0db5..00000000 --- a/libs/converter-openapi/.eslintrc.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "extends": ["../../.eslintrc.json"], - "ignorePatterns": ["!**/*"], - "overrides": [ - { - "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], - "rules": {} - }, - { - "files": ["*.ts", "*.tsx"], - "rules": {} - }, - { - "files": ["*.js", "*.jsx"], - "rules": {} - } - ] -} diff --git a/libs/converter-openapi/eslint.config.mjs b/libs/converter-openapi/eslint.config.mjs new file mode 100644 index 00000000..68e70dca --- /dev/null +++ b/libs/converter-openapi/eslint.config.mjs @@ -0,0 +1,22 @@ +import baseConfig from '../../eslint.config.mjs'; + +export default [ + ...baseConfig, + { + files: ['**/*.json'], + rules: { + '@nx/dependency-checks': [ + 'error', + { + ignoredFiles: [ + '{projectRoot}/eslint.config.{js,cjs,mjs,ts,cts,mts}', + '{projectRoot}/vite.config.{js,ts,mjs,mts}', + ], + }, + ], + }, + languageOptions: { + parser: await import('jsonc-eslint-parser'), + }, + }, +]; diff --git a/libs/differ/eslint.config.cjs b/libs/differ/eslint.config.cjs deleted file mode 100644 index 1940c2b1..00000000 --- a/libs/differ/eslint.config.cjs +++ /dev/null @@ -1,19 +0,0 @@ -const baseConfig = require('../../.eslintrc.json'); - -module.exports = [ - ...baseConfig, - { - files: ['**/*.json'], - rules: { - '@nx/dependency-checks': [ - 'error', - { - ignoredFiles: ['{projectRoot}/eslint.config.{js,cjs,mjs,ts,cts,mts}'], - }, - ], - }, - languageOptions: { - parser: require('jsonc-eslint-parser'), - }, - }, -]; diff --git a/libs/differ/eslint.config.mjs b/libs/differ/eslint.config.mjs new file mode 100644 index 00000000..68e70dca --- /dev/null +++ b/libs/differ/eslint.config.mjs @@ -0,0 +1,22 @@ +import baseConfig from '../../eslint.config.mjs'; + +export default [ + ...baseConfig, + { + files: ['**/*.json'], + rules: { + '@nx/dependency-checks': [ + 'error', + { + ignoredFiles: [ + '{projectRoot}/eslint.config.{js,cjs,mjs,ts,cts,mts}', + '{projectRoot}/vite.config.{js,ts,mjs,mts}', + ], + }, + ], + }, + languageOptions: { + parser: await import('jsonc-eslint-parser'), + }, + }, +]; diff --git a/libs/differ/src/differv3.ts b/libs/differ/src/differv3.ts index e0e61995..66546031 100644 --- a/libs/differ/src/differv3.ts +++ b/libs/differ/src/differv3.ts @@ -656,7 +656,7 @@ export class DifferV3 { defaults: object, ): object { const defaultsClone = cloneDeep(defaults); - const resourceClone = cloneDeep(resource) as Record; + const resourceClone = cloneDeep(resource) as Record; const isObjectButNotArray = (val: unknown) => typeof val === 'object' && !Array.isArray(val); diff --git a/libs/differ/vitest.config.ts b/libs/differ/vitest.config.ts index 0ebddb89..dc560064 100644 --- a/libs/differ/vitest.config.ts +++ b/libs/differ/vitest.config.ts @@ -5,7 +5,7 @@ export default defineConfig({ test: { globals: true, environment: 'node', - include: ['**/*.spec.ts'], + include: ['test/**/*.spec.ts'], reporters: ['default'], coverage: { reportsDirectory: '../../coverage/libs/differ', diff --git a/libs/sdk/.eslintrc.json b/libs/sdk/.eslintrc.json deleted file mode 100644 index adbe7ae2..00000000 --- a/libs/sdk/.eslintrc.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "extends": ["../../.eslintrc.json"], - "ignorePatterns": ["!**/*"], - "overrides": [ - { - "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], - "rules": {} - }, - { - "files": ["*.ts", "*.tsx"], - "rules": {} - }, - { - "files": ["*.js", "*.jsx"], - "rules": {} - }, - { - "files": ["*.json"], - "parser": "jsonc-eslint-parser", - "rules": { - "@nx/dependency-checks": "error" - } - } - ] -} diff --git a/libs/sdk/eslint.config.mjs b/libs/sdk/eslint.config.mjs new file mode 100644 index 00000000..68e70dca --- /dev/null +++ b/libs/sdk/eslint.config.mjs @@ -0,0 +1,22 @@ +import baseConfig from '../../eslint.config.mjs'; + +export default [ + ...baseConfig, + { + files: ['**/*.json'], + rules: { + '@nx/dependency-checks': [ + 'error', + { + ignoredFiles: [ + '{projectRoot}/eslint.config.{js,cjs,mjs,ts,cts,mts}', + '{projectRoot}/vite.config.{js,ts,mjs,mts}', + ], + }, + ], + }, + languageOptions: { + parser: await import('jsonc-eslint-parser'), + }, + }, +]; diff --git a/nx.json b/nx.json index ad33425d..e447e64b 100644 --- a/nx.json +++ b/nx.json @@ -17,7 +17,7 @@ "default", "{workspaceRoot}/.eslintrc.json", "{workspaceRoot}/.eslintignore", - "{workspaceRoot}/eslint.config.js" + "{workspaceRoot}/eslint.config.mjs" ] }, "test": { @@ -38,7 +38,7 @@ "!{projectRoot}/src/test-setup.[jt]s", "!{projectRoot}/test-setup.[jt]s", "!{projectRoot}/.eslintrc.json", - "!{projectRoot}/eslint.config.js" + "!{projectRoot}/eslint.config.mjs" ], "sharedGlobals": [] }, @@ -51,9 +51,7 @@ "ts", "tsx", "js", - "jsx", - "html", - "vue" + "jsx" ] } }, diff --git a/package.json b/package.json index afc59464..2eb7cc8f 100644 --- a/package.json +++ b/package.json @@ -29,8 +29,6 @@ "@types/qs": "^6.9.15", "@types/semver": "^7.5.8", "@types/signale": "^1.4.7", - "@typescript-eslint/eslint-plugin": "^8.39.1", - "@typescript-eslint/parser": "^8.39.1", "@typescript-eslint/utils": "^8.39.1", "@vitest/coverage-v8": "^3.0.5", "@vitest/ui": "^3.0.0", @@ -77,7 +75,7 @@ "yaml": "^2.4.2", "zod": "^4.0.10" }, - "packageManager": "pnpm@10.13.1+sha512.37ebf1a5c7a30d5fabe0c5df44ee8da4c965ca0c5af3dbab28c3a1681b70a256218d05c81c9c0dcf767ef6b8551eb5b960042b9ed4300c59242336377e01cfad", + "packageManager": "pnpm@10.14.0+sha512.ad27a79641b49c3e481a16a805baa71817a04bbe06a38d17e60e2eaee83f6a146c6a688125f5792e48dd5ba30e7da52a5cda4c3992b9ccf333f9ce223af84748", "pnpm": { "onlyBuiltDependencies": [ "@parcel/watcher", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8857ecfd..540d244d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -150,12 +150,6 @@ importers: '@types/signale': specifier: ^1.4.7 version: 1.4.7 - '@typescript-eslint/eslint-plugin': - specifier: ^8.39.1 - version: 8.39.1(@typescript-eslint/parser@8.39.1(eslint@9.33.0(jiti@2.4.2))(typescript@5.8.3))(eslint@9.33.0(jiti@2.4.2))(typescript@5.8.3) - '@typescript-eslint/parser': - specifier: ^8.39.1 - version: 8.39.1(eslint@9.33.0(jiti@2.4.2))(typescript@5.8.3) '@typescript-eslint/utils': specifier: ^8.39.1 version: 8.39.1(eslint@9.33.0(jiti@2.4.2))(typescript@5.8.3) From 11cdd5bb81e96dd69f0f4e51ae2ccdf64ff6a527 Mon Sep 17 00:00:00 2001 From: bzp2010 Date: Wed, 13 Aug 2025 15:21:45 +0800 Subject: [PATCH 2/3] use ts eslint config --- .../{eslint.config.mjs => eslint.config.ts} | 8 ++++--- eslint.config.mjs => eslint.config.ts | 5 ++-- jest.config.ts | 5 ---- jest.preset.js | 3 --- .../eslint.config.ts} | 8 ++++--- .../eslint.config.ts} | 8 ++++--- .../eslint.config.ts} | 8 ++++--- libs/converter-openapi/eslint.config.mjs | 22 ----------------- libs/converter-openapi/eslint.config.ts | 24 +++++++++++++++++++ libs/differ/eslint.config.mjs | 22 ----------------- libs/differ/eslint.config.ts | 24 +++++++++++++++++++ libs/sdk/eslint.config.mjs | 22 ----------------- libs/sdk/eslint.config.ts | 24 +++++++++++++++++++ tsconfig.json | 3 +++ 14 files changed, 98 insertions(+), 88 deletions(-) rename apps/cli/{eslint.config.mjs => eslint.config.ts} (76%) rename eslint.config.mjs => eslint.config.ts (93%) delete mode 100644 jest.config.ts delete mode 100644 jest.preset.js rename libs/{backend-apisix/eslint.config.mjs => backend-api7/eslint.config.ts} (76%) rename libs/{backend-api7/eslint.config.mjs => backend-apisix-standalone/eslint.config.ts} (76%) rename libs/{backend-apisix-standalone/eslint.config.mjs => backend-apisix/eslint.config.ts} (76%) delete mode 100644 libs/converter-openapi/eslint.config.mjs create mode 100644 libs/converter-openapi/eslint.config.ts delete mode 100644 libs/differ/eslint.config.mjs create mode 100644 libs/differ/eslint.config.ts delete mode 100644 libs/sdk/eslint.config.mjs create mode 100644 libs/sdk/eslint.config.ts diff --git a/apps/cli/eslint.config.mjs b/apps/cli/eslint.config.ts similarity index 76% rename from apps/cli/eslint.config.mjs rename to apps/cli/eslint.config.ts index 68e70dca..04c7b753 100644 --- a/apps/cli/eslint.config.mjs +++ b/apps/cli/eslint.config.ts @@ -1,6 +1,8 @@ -import baseConfig from '../../eslint.config.mjs'; +import { config } from 'typescript-eslint'; -export default [ +import baseConfig from '../../eslint.config.js'; + +export default config([ ...baseConfig, { files: ['**/*.json'], @@ -19,4 +21,4 @@ export default [ parser: await import('jsonc-eslint-parser'), }, }, -]; +]); diff --git a/eslint.config.mjs b/eslint.config.ts similarity index 93% rename from eslint.config.mjs rename to eslint.config.ts index 60b64cf0..1cf7f41d 100644 --- a/eslint.config.mjs +++ b/eslint.config.ts @@ -1,6 +1,7 @@ import nx from '@nx/eslint-plugin'; +import { config } from 'typescript-eslint'; -export default [ +export default config([ ...nx.configs['flat/base'], ...nx.configs['flat/typescript'], ...nx.configs['flat/javascript'], @@ -45,4 +46,4 @@ export default [ // Override or add rules here rules: {}, }, -]; +]); diff --git a/jest.config.ts b/jest.config.ts deleted file mode 100644 index 6b3f2d6e..00000000 --- a/jest.config.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { getJestProjectsAsync } from '@nx/jest'; - -export default async () => ({ - projects: await getJestProjectsAsync(), -}); diff --git a/jest.preset.js b/jest.preset.js deleted file mode 100644 index f078ddce..00000000 --- a/jest.preset.js +++ /dev/null @@ -1,3 +0,0 @@ -const nxPreset = require('@nx/jest/preset').default; - -module.exports = { ...nxPreset }; diff --git a/libs/backend-apisix/eslint.config.mjs b/libs/backend-api7/eslint.config.ts similarity index 76% rename from libs/backend-apisix/eslint.config.mjs rename to libs/backend-api7/eslint.config.ts index 68e70dca..04c7b753 100644 --- a/libs/backend-apisix/eslint.config.mjs +++ b/libs/backend-api7/eslint.config.ts @@ -1,6 +1,8 @@ -import baseConfig from '../../eslint.config.mjs'; +import { config } from 'typescript-eslint'; -export default [ +import baseConfig from '../../eslint.config.js'; + +export default config([ ...baseConfig, { files: ['**/*.json'], @@ -19,4 +21,4 @@ export default [ parser: await import('jsonc-eslint-parser'), }, }, -]; +]); diff --git a/libs/backend-api7/eslint.config.mjs b/libs/backend-apisix-standalone/eslint.config.ts similarity index 76% rename from libs/backend-api7/eslint.config.mjs rename to libs/backend-apisix-standalone/eslint.config.ts index 68e70dca..04c7b753 100644 --- a/libs/backend-api7/eslint.config.mjs +++ b/libs/backend-apisix-standalone/eslint.config.ts @@ -1,6 +1,8 @@ -import baseConfig from '../../eslint.config.mjs'; +import { config } from 'typescript-eslint'; -export default [ +import baseConfig from '../../eslint.config.js'; + +export default config([ ...baseConfig, { files: ['**/*.json'], @@ -19,4 +21,4 @@ export default [ parser: await import('jsonc-eslint-parser'), }, }, -]; +]); diff --git a/libs/backend-apisix-standalone/eslint.config.mjs b/libs/backend-apisix/eslint.config.ts similarity index 76% rename from libs/backend-apisix-standalone/eslint.config.mjs rename to libs/backend-apisix/eslint.config.ts index 68e70dca..04c7b753 100644 --- a/libs/backend-apisix-standalone/eslint.config.mjs +++ b/libs/backend-apisix/eslint.config.ts @@ -1,6 +1,8 @@ -import baseConfig from '../../eslint.config.mjs'; +import { config } from 'typescript-eslint'; -export default [ +import baseConfig from '../../eslint.config.js'; + +export default config([ ...baseConfig, { files: ['**/*.json'], @@ -19,4 +21,4 @@ export default [ parser: await import('jsonc-eslint-parser'), }, }, -]; +]); diff --git a/libs/converter-openapi/eslint.config.mjs b/libs/converter-openapi/eslint.config.mjs deleted file mode 100644 index 68e70dca..00000000 --- a/libs/converter-openapi/eslint.config.mjs +++ /dev/null @@ -1,22 +0,0 @@ -import baseConfig from '../../eslint.config.mjs'; - -export default [ - ...baseConfig, - { - files: ['**/*.json'], - rules: { - '@nx/dependency-checks': [ - 'error', - { - ignoredFiles: [ - '{projectRoot}/eslint.config.{js,cjs,mjs,ts,cts,mts}', - '{projectRoot}/vite.config.{js,ts,mjs,mts}', - ], - }, - ], - }, - languageOptions: { - parser: await import('jsonc-eslint-parser'), - }, - }, -]; diff --git a/libs/converter-openapi/eslint.config.ts b/libs/converter-openapi/eslint.config.ts new file mode 100644 index 00000000..04c7b753 --- /dev/null +++ b/libs/converter-openapi/eslint.config.ts @@ -0,0 +1,24 @@ +import { config } from 'typescript-eslint'; + +import baseConfig from '../../eslint.config.js'; + +export default config([ + ...baseConfig, + { + files: ['**/*.json'], + rules: { + '@nx/dependency-checks': [ + 'error', + { + ignoredFiles: [ + '{projectRoot}/eslint.config.{js,cjs,mjs,ts,cts,mts}', + '{projectRoot}/vite.config.{js,ts,mjs,mts}', + ], + }, + ], + }, + languageOptions: { + parser: await import('jsonc-eslint-parser'), + }, + }, +]); diff --git a/libs/differ/eslint.config.mjs b/libs/differ/eslint.config.mjs deleted file mode 100644 index 68e70dca..00000000 --- a/libs/differ/eslint.config.mjs +++ /dev/null @@ -1,22 +0,0 @@ -import baseConfig from '../../eslint.config.mjs'; - -export default [ - ...baseConfig, - { - files: ['**/*.json'], - rules: { - '@nx/dependency-checks': [ - 'error', - { - ignoredFiles: [ - '{projectRoot}/eslint.config.{js,cjs,mjs,ts,cts,mts}', - '{projectRoot}/vite.config.{js,ts,mjs,mts}', - ], - }, - ], - }, - languageOptions: { - parser: await import('jsonc-eslint-parser'), - }, - }, -]; diff --git a/libs/differ/eslint.config.ts b/libs/differ/eslint.config.ts new file mode 100644 index 00000000..04c7b753 --- /dev/null +++ b/libs/differ/eslint.config.ts @@ -0,0 +1,24 @@ +import { config } from 'typescript-eslint'; + +import baseConfig from '../../eslint.config.js'; + +export default config([ + ...baseConfig, + { + files: ['**/*.json'], + rules: { + '@nx/dependency-checks': [ + 'error', + { + ignoredFiles: [ + '{projectRoot}/eslint.config.{js,cjs,mjs,ts,cts,mts}', + '{projectRoot}/vite.config.{js,ts,mjs,mts}', + ], + }, + ], + }, + languageOptions: { + parser: await import('jsonc-eslint-parser'), + }, + }, +]); diff --git a/libs/sdk/eslint.config.mjs b/libs/sdk/eslint.config.mjs deleted file mode 100644 index 68e70dca..00000000 --- a/libs/sdk/eslint.config.mjs +++ /dev/null @@ -1,22 +0,0 @@ -import baseConfig from '../../eslint.config.mjs'; - -export default [ - ...baseConfig, - { - files: ['**/*.json'], - rules: { - '@nx/dependency-checks': [ - 'error', - { - ignoredFiles: [ - '{projectRoot}/eslint.config.{js,cjs,mjs,ts,cts,mts}', - '{projectRoot}/vite.config.{js,ts,mjs,mts}', - ], - }, - ], - }, - languageOptions: { - parser: await import('jsonc-eslint-parser'), - }, - }, -]; diff --git a/libs/sdk/eslint.config.ts b/libs/sdk/eslint.config.ts new file mode 100644 index 00000000..04c7b753 --- /dev/null +++ b/libs/sdk/eslint.config.ts @@ -0,0 +1,24 @@ +import { config } from 'typescript-eslint'; + +import baseConfig from '../../eslint.config.js'; + +export default config([ + ...baseConfig, + { + files: ['**/*.json'], + rules: { + '@nx/dependency-checks': [ + 'error', + { + ignoredFiles: [ + '{projectRoot}/eslint.config.{js,cjs,mjs,ts,cts,mts}', + '{projectRoot}/vite.config.{js,ts,mjs,mts}', + ], + }, + ], + }, + languageOptions: { + parser: await import('jsonc-eslint-parser'), + }, + }, +]); diff --git a/tsconfig.json b/tsconfig.json index 4845f116..13bf6743 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -22,6 +22,9 @@ }, { "path": "./libs/differ" + }, + { + "path": "./libs/tstetsetse" } ] } From 076469675c4f50069b21e02de68dd1b080ae37db Mon Sep 17 00:00:00 2001 From: bzp2010 Date: Wed, 13 Aug 2025 15:27:02 +0800 Subject: [PATCH 3/3] fix --- libs/differ/vitest.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/differ/vitest.config.ts b/libs/differ/vitest.config.ts index dc560064..0ebddb89 100644 --- a/libs/differ/vitest.config.ts +++ b/libs/differ/vitest.config.ts @@ -5,7 +5,7 @@ export default defineConfig({ test: { globals: true, environment: 'node', - include: ['test/**/*.spec.ts'], + include: ['**/*.spec.ts'], reporters: ['default'], coverage: { reportsDirectory: '../../coverage/libs/differ',