Merge branch 'master' into chore/deps/update-and-pinned-deps

Author: yoshinorin

eslint.config.js

@@ -1,16 +1,15 @@
 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
   ...config,
   {
     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 = [
         }
       ]
     }
-  }
+  }))
 ];

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';

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;

lib/plugins/filter/after_post_render/external_link.ts

@@ -3,7 +3,7 @@ import type Hexo from '../../../hexo';
 import type { RenderData } from '../../../types';
 
 let EXTERNAL_LINK_POST_ENABLED = true;
-const rATag = /<a(?:\s+?|\s+?[^<>]+?\s+?)href=["']((?:https?:|\/\/)[^<>"']+)["'][^<>]*>/gi;
+const rATag = /<a\s[^<>]*?href=["']((?:https?:|\/\/)[^<>"']+)["'][^<>]*>/gi;
 const rTargetAttr = /target=/i;
 const rRelAttr = /rel=/i;
 const rRelStrAttr = /rel=["']([^<>"']*)["']/i;

lib/plugins/filter/after_render/external_link.ts

@@ -2,7 +2,7 @@ import { isExternalLink } from 'hexo-util';
 import type Hexo from '../../../hexo';
 
 let EXTERNAL_LINK_SITE_ENABLED = true;
-const rATag = /<a(?:\s+?|\s+?[^<>]+?\s+?)href=["']((?:https?:|\/\/)[^<>"']+)["'][^<>]*>/gi;
+const rATag = /<a\s[^<>]*?href=["']((?:https?:|\/\/)[^<>"']+)["'][^<>]*>/gi;
 const rTargetAttr = /target=/i;
 const rRelAttr = /rel=/i;
 const rRelStrAttr = /rel=["']([^<>"']*)["']/i;

test/scripts/filters/save_database.ts

@@ -18,7 +18,7 @@ describe('Save database', () => {
     const exist = await exists(dbPath);
     exist.should.be.true;
 
-    unlink(dbPath);
+    await unlink(dbPath);
   });
 
   it('do nothing if hexo is not initialized', async () => {