From a0d8878d31c249a4a971a5c03309ae1b9130d604 Mon Sep 17 00:00:00 2001 From: D-Sketon <2055272094@qq.com> Date: Sat, 29 Nov 2025 12:59:27 +0800 Subject: [PATCH] fix: update ESLint test configuration --- eslint.config.js | 23 +++++++++++------------ lib/box/file.ts | 1 - lib/hexo/index.ts | 2 -- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/eslint.config.js b/eslint.config.js index e8e537fc50..bf21af32dc 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -1,5 +1,5 @@ const config = require('eslint-config-hexo/ts'); -const testConfig = require('eslint-config-hexo/test'); +const testConfig = require('eslint-config-hexo/ts-test'); module.exports = [ // Configurations applied globally @@ -7,10 +7,9 @@ module.exports = [ { rules: { '@typescript-eslint/no-explicit-any': 0, - '@typescript-eslint/no-var-requires': 0, '@typescript-eslint/no-require-imports': 0, - 'n/no-missing-require': 0, 'n/no-missing-import': 0, + 'n/no-missing-require': 0, '@typescript-eslint/no-unused-vars': [ 'error', { 'argsIgnorePattern': '^_' @@ -19,15 +18,15 @@ module.exports = [ } }, // Configurations applied only to test files - { - files: [ - 'test/**/*.ts' - ], - languageOptions: { - ...testConfig.languageOptions - }, + ...testConfig.map(config => ({ + ...config, + files: ['test/**/*.ts'], rules: { - ...testConfig.rules, + ...config.rules, + '@typescript-eslint/no-explicit-any': 0, + '@typescript-eslint/no-require-imports': 0, + 'n/no-missing-require': 0, + 'n/no-missing-import': 0, '@typescript-eslint/ban-ts-comment': 0, '@typescript-eslint/no-unused-expressions': 0, '@typescript-eslint/no-unused-vars': [ @@ -38,5 +37,5 @@ module.exports = [ } ] } - } + })) ]; diff --git a/lib/box/file.ts b/lib/box/file.ts index 6515a74582..fbd421ab41 100644 --- a/lib/box/file.ts +++ b/lib/box/file.ts @@ -22,7 +22,6 @@ class File { /** * File type. The value can be create, update, skip, delete. */ - // eslint-disable-next-line no-use-before-define public type: typeof File.TYPE_CREATE | typeof File.TYPE_UPDATE | typeof File.TYPE_SKIP | typeof File.TYPE_DELETE; static TYPE_CREATE: 'create'; static TYPE_UPDATE: 'update'; diff --git a/lib/hexo/index.ts b/lib/hexo/index.ts index e5cdc1d82b..fe81e8d102 100644 --- a/lib/hexo/index.ts +++ b/lib/hexo/index.ts @@ -51,7 +51,6 @@ const routeCache = new WeakMap(); const castArray = (obj: any) => { return Array.isArray(obj) ? obj : [obj]; }; -// eslint-disable-next-line no-use-before-define const mergeCtxThemeConfig = (ctx: Hexo) => { // Merge hexo.config.theme_config into hexo.theme.config before post rendering & generating // config.theme_config has "_config.[theme].yml" merged in load_theme_config.js @@ -60,7 +59,6 @@ const mergeCtxThemeConfig = (ctx: Hexo) => { } }; -// eslint-disable-next-line no-use-before-define const createLoadThemeRoute = function(generatorResult: BaseGeneratorReturn, locals: LocalsType, ctx: Hexo) { const { log, theme } = ctx; const { path, cache: useCache } = locals;