refactor(*): use hexo-component-inferno

StephenChen2016 · Jan 23, 2020 · fe70756 · fe70756
1 parent e3737f5
commit fe70756
Show file tree

Hide file tree

Showing 130 changed files with 75 additions and 3,894 deletions.
diff --git a/include/config.js b/include/config.js
@@ -10,8 +10,8 @@ module.exports = hexo => {
         const SCHEMA_ROOT = path.join(hexo.theme_dir, 'include/schema/');
         const CONFIG_PATH = path.join(hexo.theme_dir, '_config.yml');
 
-        const yaml = require('../include/util/yaml');
-        const { SchemaLoader } = require('../include/util/schema');
+        const yaml = require('hexo-component-inferno/lib/util/yaml');
+        const { SchemaLoader } = require('hexo-component-inferno/lib/core/schema');
         const loader = SchemaLoader.load(require(path.join(SCHEMA_ROOT, 'config.json')), SCHEMA_ROOT);
         const schema = loader.getSchema('/config.json');
         logger.info('=== Checking the configuration file ===');
@@ -32,7 +32,7 @@ module.exports = hexo => {
             let cfg = yaml.parse(cfgStr);
             // Check config version
             if (!process.argv.includes('--icarus-dont-upgrade-config')) {
-                const migrator = new(require('../include/util/migrate'))(path.join(hexo.theme_dir, 'include/migration'));
+                const migrator = new(require('hexo-component-inferno/lib/core/migrate'))(path.join(hexo.theme_dir, 'include/migration'));
                 // Upgrade config
                 if (migrator.isOudated(cfg.version)) {
                     logger.info(`Your configuration file is outdated (${cfg.version} < ${migrator.getLatestVersion()}). `

diff --git a/include/filter/locals.js b/include/filter/locals.js
diff --git a/include/generator/categories.js b/include/generator/categories.js
diff --git a/include/generator/tags.js b/include/generator/tags.js
diff --git a/include/helper/cdn.js b/include/helper/cdn.js
diff --git a/include/helper/page.js b/include/helper/page.js
diff --git a/include/helper/thumbnail.js b/include/helper/thumbnail.js
diff --git a/include/migration/v2_v3.js b/include/migration/v2_v3.js
@@ -1,13 +1,13 @@
 const logger = require('hexo-log')();
 const deepmerge = require('deepmerge');
-const Migration = require('../util/migrate').Migration;
+const Migration = require('hexo-component-inferno/lib/core/migrate').Migration;
 
 module.exports = class extends Migration {
     constructor() {
         super('3.0.0', null);
     }
 
-    doMigrate(config) {
+    upgrade(config) {
         const result = deepmerge({}, config);
         result.head = {
             favicon: config.favicon || null,

diff --git a/include/register.js b/include/register.js
@@ -1,15 +1,16 @@
 const logger = require('hexo-log')();
 
 module.exports = hexo => {
-    logger.info('=== Patching Hexo ===');
-    require('../include/generator/categories')(hexo);
-    require('../include/generator/category')(hexo);
-    require('../include/generator/tags')(hexo);
-    require('../include/generator/insight')(hexo);
-    require('../include/filter/locals')(hexo);
-    require('../include/helper/cdn')(hexo);
-    require('../include/helper/page')(hexo);
-    require('../include/helper/thumbnail')(hexo);
+    logger.info('=== Registering Hexo extensions ===');
+    require('hexo-component-inferno/lib/hexo/filter/locals')(hexo);
+    require('./generator/category')(hexo);
+    require('./generator/insight')(hexo);
+    require('hexo-component-inferno/lib/hexo/generator/categories')(hexo);
+    require('hexo-component-inferno/lib/hexo/generator/tags')(hexo);
+    require('hexo-component-inferno/lib/hexo/helper/cdn')(hexo);
+    require('hexo-component-inferno/lib/hexo/helper/page')(hexo);
+    require('hexo-component-inferno/lib/hexo/helper/thumbnail')(hexo);
+    require('hexo-component-inferno/lib/core/view').init(hexo);
 
     const hooks = [
         'after_render:html',

diff --git a/include/schema/comment/.gitkeep b/include/schema/comment/.gitkeep
diff --git a/include/schema/comment/changyan.json b/include/schema/comment/changyan.json
diff --git a/include/schema/comment/disqus.json b/include/schema/comment/disqus.json