refactor: utilize hexo-util

lib/hexo/load_config.js

@@ -6,7 +6,7 @@ const Theme = require('../theme');
 const Source = require('./source');
 const fs = require('hexo-fs');
 const chalk = require('chalk');
-const merge = require('deepmerge');
+const { deepMerge } = require('hexo-util');
 
 module.exports = ctx => {
   if (!ctx.env.init) return;
@@ -26,7 +26,9 @@ module.exports = ctx => {
 
     ctx.log.debug('Config loaded: %s', chalk.magenta(tildify(configPath)));
 
-    ctx.config = config = merge(ctx.config, config);
+    ctx.config = deepMerge(ctx.config, config);
+    config = ctx.config;
+
     ctx.config_path = configPath;
 
     config.root = config.root.replace(/\/*$/, '/');

lib/hexo/multi_config_path.js

@@ -3,7 +3,7 @@
 const { isAbsolute, resolve, join, extname } = require('path');
 const fs = require('hexo-fs');
 const yml = require('js-yaml');
-const merge = require('deepmerge');
+const { deepMerge } = require('hexo-util');
 
 module.exports = ctx => function multiConfigPath(base, configPaths, outputDir) {
   const { log } = ctx;
@@ -48,10 +48,10 @@ module.exports = ctx => function multiConfigPath(base, configPaths, outputDir) {
     const ext = extname(paths[i]).toLowerCase();
 
     if (ext === '.yml') {
-      combinedConfig = merge(combinedConfig, yml.load(file));
+      combinedConfig = deepMerge(combinedConfig, yml.load(file));
       count++;
     } else if (ext === '.json') {
-      combinedConfig = merge(combinedConfig, yml.safeLoad(file, {json: true}));
+      combinedConfig = deepMerge(combinedConfig, yml.safeLoad(file, {json: true}));
       count++;
     } else {
       log.w(`Config file ${paths[i]} not supported type.`);

package.json

@@ -44,7 +44,6 @@
     "bluebird": "^3.5.2",
     "chalk": "^3.0.0",
     "cheerio": "0.22.0",
-    "deepmerge": "^4.2.2",
     "hexo-cli": "^3.0.0",
     "hexo-front-matter": "^1.0.0",
     "hexo-fs": "^2.0.0",