From 0efbb3fe380464eb3546d30dbe6379fc0f3c93d3 Mon Sep 17 00:00:00 2001
From: ppoffice <8849362+ppoffice@users.noreply.github.com>
Date: Sat, 3 Feb 2024 00:44:33 -0800
Subject: [PATCH] fix: correct the import of some hexo dependencies

---
 include/config.js          | 2 +-
 include/dependency.js      | 2 +-
 include/migration/v2_v3.js | 2 +-
 include/register.js        | 2 +-
 layout/archive.jsx         | 2 +-
 layout/common/article.jsx  | 2 +-
 layout/common/comment.jsx  | 2 +-
 layout/common/donates.jsx  | 2 +-
 layout/common/plugins.jsx  | 2 +-
 layout/common/scripts.jsx  | 2 +-
 layout/common/search.jsx   | 2 +-
 layout/common/share.jsx    | 2 +-
 layout/common/widgets.jsx  | 2 +-
 scripts/index.js           | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/include/config.js b/include/config.js
index aa05d0e..e82b9c9 100644
--- a/include/config.js
+++ b/include/config.js
@@ -9,7 +9,7 @@ const { Migrator } = require('hexo-component-inferno/lib/core/migrate');
 const { SchemaLoader } = require('hexo-component-inferno/lib/core/schema');
 const { yellow } = require('./util/console');
 
-const logger = typeof createLogger === 'function' ? createLogger() : createLogger.default();
+const logger = createLogger.default();
 
 function loadThemeConfig(hexo, cfgPaths) {
     const configs = cfgPaths.map(cfgPath => fs.readFileSync(cfgPath))
diff --git a/include/dependency.js b/include/dependency.js
index 886380b..5d4d201 100644
--- a/include/dependency.js
+++ b/include/dependency.js
@@ -4,7 +4,7 @@ const createLogger = require('hexo-log');
 const packageInfo = require('../package.json');
 const { yellow, red, green } = require('./util/console');
 
-const logger = typeof createLogger === 'function' ? createLogger() : createLogger.default();
+const logger = createLogger.default();
 
 module.exports = hexo => {
     function checkDependency(name, reqVer) {
diff --git a/include/migration/v2_v3.js b/include/migration/v2_v3.js
index 0a2fd2d..0679b69 100644
--- a/include/migration/v2_v3.js
+++ b/include/migration/v2_v3.js
@@ -2,7 +2,7 @@ const createLogger = require('hexo-log');
 const deepmerge = require('deepmerge');
 const Migration = require('hexo-component-inferno/lib/core/migrate').Migration;
 
-const logger = typeof createLogger === 'function' ? createLogger() : createLogger.default();
+const logger = createLogger.default();
 
 module.exports = class extends Migration {
     constructor() {
diff --git a/include/register.js b/include/register.js
index d798763..4ef8a13 100644
--- a/include/register.js
+++ b/include/register.js
@@ -1,6 +1,6 @@
 const createLogger = require('hexo-log');
 
-const logger = typeof createLogger === 'function' ? createLogger() : createLogger.default();
+const logger = createLogger.default();
 
 module.exports = hexo => {
     logger.info('=== Registering Hexo extensions ===');
diff --git a/layout/archive.jsx b/layout/archive.jsx
index b7ce994..720ef3d 100644
--- a/layout/archive.jsx
+++ b/layout/archive.jsx
@@ -1,6 +1,6 @@
 const moment = require('moment');
 const { Component, Fragment } = require('inferno');
-const { toMomentLocale } = require('hexo/lib/plugins/helper/date');
+const { toMomentLocale } = require('hexo/dist/plugins/helper/date');
 const Paginator = require('hexo-component-inferno/lib/view/misc/paginator');
 const ArticleMedia = require('hexo-component-inferno/lib/view/common/article_media');
 
diff --git a/layout/common/article.jsx b/layout/common/article.jsx
index d8668b4..c47ec25 100644
--- a/layout/common/article.jsx
+++ b/layout/common/article.jsx
@@ -1,6 +1,6 @@
 const moment = require('moment');
 const { Component, Fragment } = require('inferno');
-const { toMomentLocale } = require('hexo/lib/plugins/helper/date');
+const { toMomentLocale } = require('hexo/dist/plugins/helper/date');
 const Share = require('./share');
 const Donates = require('./donates');
 const Comment = require('./comment');
diff --git a/layout/common/comment.jsx b/layout/common/comment.jsx
index 35df4c6..f7d684e 100644
--- a/layout/common/comment.jsx
+++ b/layout/common/comment.jsx
@@ -2,7 +2,7 @@ const createLogger = require('hexo-log');
 const { Component } = require('inferno');
 const view = require('hexo-component-inferno/lib/core/view');
 
-const logger = typeof createLogger === 'function' ? createLogger() : createLogger.default();
+const logger = createLogger.default();
 
 module.exports = class extends Component {
     render() {
diff --git a/layout/common/donates.jsx b/layout/common/donates.jsx
index 56c41e4..c00f864 100644
--- a/layout/common/donates.jsx
+++ b/layout/common/donates.jsx
@@ -2,7 +2,7 @@ const createLogger = require('hexo-log');
 const { Component } = require('inferno');
 const view = require('hexo-component-inferno/lib/core/view');
 
-const logger = typeof createLogger === 'function' ? createLogger() : createLogger.default();
+const logger = createLogger.default();
 
 module.exports = class extends Component {
     render() {
diff --git a/layout/common/plugins.jsx b/layout/common/plugins.jsx
index bd3fc9c..fb759cb 100644
--- a/layout/common/plugins.jsx
+++ b/layout/common/plugins.jsx
@@ -2,7 +2,7 @@ const createLogger = require('hexo-log');
 const { Component, Fragment } = require('inferno');
 const view = require('hexo-component-inferno/lib/core/view');
 
-const logger = typeof createLogger === 'function' ? createLogger() : createLogger.default();
+const logger = createLogger.default();
 
 module.exports = class extends Component {
     render() {
diff --git a/layout/common/scripts.jsx b/layout/common/scripts.jsx
index 98a85c4..42fe538 100644
--- a/layout/common/scripts.jsx
+++ b/layout/common/scripts.jsx
@@ -1,5 +1,5 @@
 const { Component, Fragment } = require('inferno');
-const { toMomentLocale } = require('hexo/lib/plugins/helper/date');
+const { toMomentLocale } = require('hexo/dist/plugins/helper/date');
 const Plugins = require('./plugins');
 
 module.exports = class extends Component {
diff --git a/layout/common/search.jsx b/layout/common/search.jsx
index fcd7290..a41d306 100644
--- a/layout/common/search.jsx
+++ b/layout/common/search.jsx
@@ -2,7 +2,7 @@ const createLogger = require('hexo-log');
 const { Component } = require('inferno');
 const view = require('hexo-component-inferno/lib/core/view');
 
-const logger = typeof createLogger === 'function' ? createLogger() : createLogger.default();
+const logger = createLogger.default();
 
 module.exports = class extends Component {
     render() {
diff --git a/layout/common/share.jsx b/layout/common/share.jsx
index 7b3ed2b..0d90a38 100644
--- a/layout/common/share.jsx
+++ b/layout/common/share.jsx
@@ -2,7 +2,7 @@ const createLogger = require('hexo-log');
 const { Component } = require('inferno');
 const view = require('hexo-component-inferno/lib/core/view');
 
-const logger = typeof createLogger === 'function' ? createLogger() : createLogger.default();
+const logger = createLogger.default();
 
 module.exports = class extends Component {
     render() {
diff --git a/layout/common/widgets.jsx b/layout/common/widgets.jsx
index 6f84af6..47c0561 100644
--- a/layout/common/widgets.jsx
+++ b/layout/common/widgets.jsx
@@ -3,7 +3,7 @@ const { Component } = require('inferno');
 const view = require('hexo-component-inferno/lib/core/view');
 const classname = require('hexo-component-inferno/lib/util/classname');
 
-const logger = typeof createLogger === 'function' ? createLogger() : createLogger.default();
+const logger = createLogger.default();
 
 function formatWidgets(widgets) {
     const result = {};
diff --git a/scripts/index.js b/scripts/index.js
index b9ac0f7..e92272d 100644
--- a/scripts/index.js
+++ b/scripts/index.js
@@ -1,7 +1,7 @@
 /* global hexo */
 const createLogger = require('hexo-log');
 
-const logger = typeof createLogger === 'function' ? createLogger() : createLogger.default();
+const logger = createLogger.default();
 
 /**
  * Print welcome message