Merge branch 'master' of github.com:ppoffice/hexo-theme-icarus

.github/workflows/npm-publish.yml

@@ -9,7 +9,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 12
+          node-version: 14
           registry-url: https://registry.npmjs.org/
       - run: npm publish
         env:

include/config.js

@@ -3,12 +3,14 @@ const fs = require('fs');
 const path = require('path');
 const util = require('util');
 const crypto = require('crypto');
-const logger = require('hexo-log')();
+const createLogger = require('hexo-log');
 const yaml = require('hexo-component-inferno/lib/util/yaml');
 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 = createLogger.default();
+
 function loadThemeConfig(hexo, cfgPaths) {
     const configs = cfgPaths.map(cfgPath => fs.readFileSync(cfgPath))
         .map(cfgPath => yaml.parse(cfgPath));

include/dependency.js

@@ -1,9 +1,11 @@
 /* eslint no-process-exit: "off" */
 const semver = require('semver');
-const logger = require('hexo-log')();
+const createLogger = require('hexo-log');
 const packageInfo = require('../package.json');
 const { yellow, red, green } = require('./util/console');
 
+const logger = createLogger.default();
+
 module.exports = hexo => {
     function checkDependency(name, reqVer) {
         try {

include/migration/v2_v3.js

@@ -1,7 +1,9 @@
-const logger = require('hexo-log')();
+const createLogger = require('hexo-log');
 const deepmerge = require('deepmerge');
 const Migration = require('hexo-component-inferno/lib/core/migrate').Migration;
 
+const logger = createLogger.default();
+
 module.exports = class extends Migration {
     constructor() {
         super('3.0.0', null);

include/register.js

@@ -1,4 +1,6 @@
-const logger = require('hexo-log')();
+const createLogger = require('hexo-log');
+
+const logger = createLogger.default();
 
 module.exports = hexo => {
     logger.info('=== Registering Hexo extensions ===');

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

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

layout/common/comment.jsx

@@ -1,7 +1,9 @@
-const logger = require('hexo-log')();
+const createLogger = require('hexo-log');
 const { Component } = require('inferno');
 const view = require('hexo-component-inferno/lib/core/view');
 
+const logger = createLogger.default();
+
 module.exports = class extends Component {
     render() {
         const { config, page, helper } = this.props;

layout/common/donates.jsx

@@ -1,7 +1,9 @@
-const logger = require('hexo-log')();
+const createLogger = require('hexo-log');
 const { Component } = require('inferno');
 const view = require('hexo-component-inferno/lib/core/view');
 
+const logger = createLogger.default();
+
 module.exports = class extends Component {
     render() {
         const { config, helper } = this.props;

layout/common/plugins.jsx

@@ -1,7 +1,9 @@
-const logger = require('hexo-log')();
+const createLogger = require('hexo-log');
 const { Component, Fragment } = require('inferno');
 const view = require('hexo-component-inferno/lib/core/view');
 
+const logger = createLogger.default();
+
 module.exports = class extends Component {
     render() {
         const { site, config, page, helper, head } = this.props;

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 {

layout/common/search.jsx

@@ -1,7 +1,9 @@
-const logger = require('hexo-log')();
+const createLogger = require('hexo-log');
 const { Component } = require('inferno');
 const view = require('hexo-component-inferno/lib/core/view');
 
+const logger = createLogger.default();
+
 module.exports = class extends Component {
     render() {
         const { config, helper } = this.props;

layout/common/share.jsx

@@ -1,7 +1,9 @@
-const logger = require('hexo-log')();
+const createLogger = require('hexo-log');
 const { Component } = require('inferno');
 const view = require('hexo-component-inferno/lib/core/view');
 
+const logger = createLogger.default();
+
 module.exports = class extends Component {
     render() {
         const { config, page, helper } = this.props;

layout/common/widgets.jsx

@@ -1,8 +1,10 @@
-const logger = require('hexo-log')();
+const createLogger = require('hexo-log');
 const { Component } = require('inferno');
 const view = require('hexo-component-inferno/lib/core/view');
 const classname = require('hexo-component-inferno/lib/util/classname');
 
+const logger = createLogger.default();
+
 function formatWidgets(widgets) {
     const result = {};
     if (Array.isArray(widgets)) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-amane",
-  "version": "0.0.46",
+  "version": "1.0.47",
   "author": "Nofated095 <nofated095@users.noreply.github.com>",
   "license": "MIT",
   "description": "A simple, delicate, and modern theme for Hexo",
@@ -15,30 +15,30 @@
     "url": "https://github.com/ppoffice/hexo-theme-icarus/issues"
   },
   "engines": {
-    "node": ">=12.4.0"
+    "node": ">=14"
   },
   "scripts": {
     "lint": "eslint --ext .js --ext .jsx --ext .json ."
   },
   "devDependencies": {
-    "eslint": "^8.6.0",
+    "eslint": "^8.56.0",
     "eslint-config-hexo": "^5.0.0",
-    "eslint-plugin-json": "^3.0.0",
-    "eslint-plugin-react": "^7.17.0"
+    "eslint-plugin-json": "^3.1.0",
+    "eslint-plugin-react": "^7.33.2"
   },
   "dependencies": {
     "bulma-stylus": "0.8.0",
-    "deepmerge": "^4.2.2",
-    "hexo": "^6.0.0",
-    "hexo-component-inferno": "^2.0.2",
-    "hexo-log": "^3.0.0",
-    "hexo-pagination": "^2.0.0",
-    "hexo-renderer-inferno": "^0.1.3",
-    "hexo-renderer-stylus": "^2.0.0",
-    "hexo-util": "^2.4.0",
-    "inferno": "^7.3.3",
-    "inferno-create-element": "^7.3.3",
-    "moment": "^2.22.2",
-    "semver": ">=5.0.0"
+    "deepmerge": "^4.3.1",
+    "hexo": "^7.1.1",
+    "hexo-component-inferno": "^2.0.4",
+    "hexo-log": "^4.1.0",
+    "hexo-pagination": "^3.0.0",
+    "hexo-renderer-inferno": "^1.0.2",
+    "hexo-renderer-stylus": "^3.0.1",
+    "hexo-util": "^3.2.0",
+    "inferno": "^8.2.3",
+    "inferno-create-element": "^8.2.3",
+    "moment": "^2.30.1",
+    "semver": "^7.5.4"
   }
 }

scripts/index.js

@@ -1,5 +1,7 @@
 /* global hexo */
-const logger = require('hexo-log')();
+const createLogger = require('hexo-log');
+
+const logger = createLogger.default();
 
 /**
  * Print welcome message