chore: bump eslint

D-Sketon · D-Sketon · commit aec4a3587e50 · 2025-11-12T00:04:08.000+08:00
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.json b/.eslintrc.json
diff --git a/assets b/assets
@@ -1 +1 @@
-Subproject commit 8d82c48e0f2294fe88e7166f6dae383e3da406e6
+Subproject commit c92a4154cd5a30e5d33b09f7e5fb629ced6100d5
diff --git a/eslint.config.js b/eslint.config.js
@@ -0,0 +1,29 @@
+const config = require('eslint-config-hexo/ts');
+const testConfig = require('eslint-config-hexo/test');
+
+module.exports = [
+  // Configurations applied globally
+  ...config,
+  {
+    rules: {
+      '@typescript-eslint/no-explicit-any': 0,
+      '@typescript-eslint/no-var-requires': 0,
+      '@typescript-eslint/no-require-imports': 0
+    }
+  },
+  // Configurations applied only to test files
+  {
+    files: [
+      'test/**/*.ts'
+    ],
+    languageOptions: {
+      ...testConfig.languageOptions
+    },
+    rules: {
+      ...testConfig.rules,
+      '@typescript-eslint/no-var-requires': 0,
+      '@typescript-eslint/ban-ts-comment': 0,
+      '@typescript-eslint/no-unused-expressions': 0
+    }
+  }
+];
diff --git a/lib/console/init.ts b/lib/console/init.ts
@@ -35,7 +35,7 @@ async function initConsole(this: Context, args: InitArgs) {
       await spawn('git', ['clone', '--recurse-submodules', '--depth=1', '--quiet', GIT_REPO_URL, target], {
         stdio: 'inherit'
       });
-    } catch (err) {
+    } catch {
       log.warn('git clone failed. Copying data instead');
       await copyAsset(target);
     }
@@ -85,7 +85,7 @@ async function initConsole(this: Context, args: InitArgs) {
       });
     }
     log.info('Start blogging with Hexo!');
-  } catch (err) {
+  } catch {
     log.warn(`Failed to install dependencies. Please run 'npm install' in "${target}" folder.`);
   }
 }
diff --git a/lib/hexo.ts b/lib/hexo.ts
@@ -7,7 +7,7 @@ import goodbye from './goodbye';
 import minimist from 'minimist';
 import resolve from 'resolve';
 import { camelCaseKeys } from 'hexo-util';
-import registerConsole from './console';
+import registerConsole from './console/index';
 import helpConsole from './console/help';
 import initConsole from './console/init';
 import versionConsole from './console/version';
@@ -89,7 +89,7 @@ function watchSignal(hexo: Context) {
     hexo.unwatch();
 
     hexo.exit().then(() => {
-      // eslint-disable-next-line no-process-exit
+      // eslint-disable-next-line n/no-process-exit
       process.exit();
     });
   });
diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
     "prepublishOnly": "npm install && npm run clean && npm run build",
     "build": "tsc -b",
     "clean": "tsc -b --clean",
-    "eslint": "eslint .",
+    "eslint": "eslint lib test",
     "pretest": "npm run clean && npm run build",
     "test": "mocha test/**/*.ts --require ts-node/register",
     "test-cov": "nyc --reporter=lcovonly npm test",
@@ -64,8 +64,8 @@
     "@types/rewire": "^2.5.30",
     "@types/sinon": "^17.0.3",
     "chai": "^4.3.4",
-    "eslint": "^8.2.0",
-    "eslint-config-hexo": "^5.0.0",
+    "eslint": "^9.39.1",
+    "eslint-config-hexo": "^6.0.0",
     "hexo-renderer-marked": "^6.0.0",
     "mocha": "^11.7.5",
     "nyc": "^15.1.0",
diff --git a/test/.eslintrc.json b/test/.eslintrc.json
diff --git a/test/scripts/console.ts b/test/scripts/console.ts
@@ -9,7 +9,7 @@ describe('console', () => {
     try {
       // @ts-expect-error
       consoleExtend.register();
-    } catch (err) {
+    } catch (err: any) {
       err.should.have.property('message', 'name is required');
     }
   });
@@ -19,7 +19,7 @@ describe('console', () => {
     try {
       // @ts-expect-error
       consoleExtend.register('test', 'fn');
-    } catch (err) {
+    } catch (err: any) {
       err.should.have.property('message', 'fn must be a function');
     }
   });
@@ -29,7 +29,7 @@ describe('console', () => {
     try {
       // @ts-expect-error
       consoleExtend.register('test', 'desc', 'fn');
-    } catch (err) {
+    } catch (err: any) {
       err.should.have.property('message', 'fn must be a function');
     }
   });
diff --git a/test/scripts/context.ts b/test/scripts/context.ts
@@ -26,7 +26,7 @@ describe('context', () => {
       try {
         await hexo.call('wtf');
         should.fail();
-      } catch (err) {
+      } catch (err: any) {
         err.should.have.property('message', 'Console `wtf` has not been registered yet!');
       }
     });
@@ -46,7 +46,7 @@ describe('context', () => {
     });
 
     it('with callback but no args', done => {
-      hexo.call('test', err => {
+      hexo.call('test', (err: any) => {
         if (err) return done(err);
 
         spy.calledOnce.should.be.true;
@@ -57,7 +57,7 @@ describe('context', () => {
   });
 
   describe('exit', () => {
-    let hexo, fatal;
+    let hexo: Context, fatal: any;
 
     beforeEach(() => {
       hexo = new Context();
diff --git a/test/scripts/help.ts b/test/scripts/help.ts
@@ -5,10 +5,10 @@ import { join } from 'path';
 import { format } from 'util';
 import rewire from 'rewire';
 import Context from '../../lib/context';
-import console from '../../lib/console';
+import console from '../../lib/console/index';
 chai.should();
 
-function getConsoleLog({ args }) {
+function getConsoleLog({ args }: { args: any[] }) {
   return args.map(arr => format(...arr)).join('\n');
 }
 
diff --git a/test/scripts/hexo.ts b/test/scripts/hexo.ts
@@ -2,6 +2,7 @@ import chai from 'chai';
 import sinon from 'sinon';
 import rewire from 'rewire';
 import ConsoleExtend from '../../lib/extend/console';
+import type Context from '../../lib/context';
 chai.should();
 
 require('chai').should();
@@ -14,7 +15,7 @@ describe('hexo', () => {
     const hexo = rewire('../../dist/hexo');
     return hexo.__with__({
       console_1: {
-        default: ctx => {
+        default: (ctx: Context) => {
           ctx.extend.console.register('help', spy);
         }
       }
@@ -30,7 +31,7 @@ describe('hexo', () => {
     const hexo = rewire('../../dist/hexo');
     return hexo.__with__({
       console_1: {
-        default: ctx => {
+        default: (ctx: Context) => {
           ctx.extend.console.register('test', spy);
         }
       }
@@ -46,7 +47,7 @@ describe('hexo', () => {
     const hexo = rewire('../../dist/hexo');
     return hexo.__with__({
       console_1: {
-        default: ctx => {
+        default: (ctx: Context) => {
           ctx.extend.console.register('help', spy);
         }
       }
@@ -58,11 +59,11 @@ describe('hexo', () => {
   });
 
   it('path - number (issue hexo#4334)', async () => {
-    let args;
+    let args: Record<string, string>;
     const hexo = rewire('../../dist/hexo');
     return hexo.__with__({
       find_pkg_1: {
-        default: (_cwd, _args) => {
+        default: (_cwd: string, _args: { cwd?: string }) => {
           args = _args;
           return Promise.resolve();
         }
@@ -77,11 +78,11 @@ describe('hexo', () => {
   });
 
   it('p - number (issue hexo#4334)', async () => {
-    let args;
+    let args: Record<string, string>;
     const hexo = rewire('../../dist/hexo');
     return hexo.__with__({
       find_pkg_1: {
-        default: (_cwd, _args) => {
+        default: (_cwd: string, _args: { cwd?: string }) => {
           args = _args;
           return Promise.resolve();
         }
@@ -96,11 +97,11 @@ describe('hexo', () => {
   });
 
   it('slug - number (issue hexo#4334)', async () => {
-    let args;
+    let args: Record<string, string>;
     const hexo = rewire('../../dist/hexo');
     return hexo.__with__({
       find_pkg_1: {
-        default: (_cwd, _args) => {
+        default: (_cwd: string, _args: { cwd?: string }) => {
           args = _args;
           return Promise.resolve();
         }
@@ -115,11 +116,11 @@ describe('hexo', () => {
   });
 
   it('s - number (issue hexo#4334)', async () => {
-    let args;
+    let args: Record<string, string>;
     const hexo = rewire('../../dist/hexo');
     return hexo.__with__({
       find_pkg_1: {
-        default: (_cwd, _args) => {
+        default: (_cwd: string, _args: { cwd?: string }) => {
           args = _args;
           return Promise.resolve();
         }
diff --git a/test/scripts/init.ts b/test/scripts/init.ts
@@ -18,21 +18,21 @@ describe('init', () => {
   async function rmDir(path: string) {
     try {
       await rmdir(path);
-    } catch (err) {
+    } catch (err: any) {
       if (err && err.code === 'ENOENT') return;
       throw err;
     }
   }
 
-  function pipeStream(rs, ws) {
+  function pipeStream(rs: ReturnType<typeof createReadStream>, ws: ReturnType<typeof createSha1Hash>) {
     return new Promise((resolve, reject) => {
       rs.pipe(ws)
         .on('error', reject)
         .on('finish', resolve);
     });
   }
 
-  async function compareFile(a, b) {
+  async function compareFile(a: string, b: string) {
     const streamA = createSha1Hash();
     const streamB = createSha1Hash();
 
@@ -44,7 +44,7 @@ describe('init', () => {
     return streamA.read().equals(streamB.read());
   }
 
-  async function check(path) {
+  async function check(path: string) {
     for (const item of assets) {
       const result = await compareFile(
         join(assetDir, item),
@@ -56,7 +56,7 @@ describe('init', () => {
 
   }
 
-  function withoutSpawn(fn) {
+  function withoutSpawn(fn: () => Promise<void>) {
     return initModule.__with__({
       'spawn_1': () => Promise.reject(new Error('spawn is not available'))
     })(fn);
diff --git a/test/scripts/version.ts b/test/scripts/version.ts
@@ -8,7 +8,7 @@ import rewire from 'rewire';
 import { spawn } from 'hexo-util';
 chai.should();
 
-function getConsoleLog({ args }) {
+function getConsoleLog({ args }: { args: any[] }) {
   return args.map(arr => format(...arr)).join('\n');
 }
 

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ async function initConsole(this: Context, args: InitArgs) {`
`35`	`35`	`await spawn('git', ['clone', '--recurse-submodules', '--depth=1', '--quiet', GIT_REPO_URL, target], {`
`36`	`36`	`stdio: 'inherit'`
`37`	`37`	`});`
`38`		`- } catch (err) {`
	`38`	`+ } catch {`
`39`	`39`	`log.warn('git clone failed. Copying data instead');`
`40`	`40`	`await copyAsset(target);`
`41`	`41`	`}`
`@@ -85,7 +85,7 @@ async function initConsole(this: Context, args: InitArgs) {`
`85`	`85`	`});`
`86`	`86`	`}`
`87`	`87`	`log.info('Start blogging with Hexo!');`
`88`		`- } catch (err) {`
	`88`	`+ } catch {`
`89`	`89`	log.warn(`Failed to install dependencies. Please run 'npm install' in "${target}" folder.`);
`90`	`90`	`}`
`91`	`91`	`}`