Merge branch 'master' into issue/3225/vimeo-responsive-video

appveyor.yml

@@ -7,7 +7,7 @@ environment:
   matrix:
     - nodejs_version: "6"
     - nodejs_version: "8"
-    - nodejs_version: "9"
+    - nodejs_version: "10"
 
 matrix:
   fast_finish: true

lib/box/index.js

@@ -2,7 +2,6 @@
 
 const pathFn = require('path');
 const Promise = require('bluebird');
-const _ = require('lodash');
 const File = require('./file');
 const util = require('hexo-util');
 const fs = require('hexo-fs');
@@ -19,7 +18,7 @@ const defaultPattern = new Pattern(() => ({}));
 function Box(ctx, base, options) {
   EventEmitter.call(this);
 
-  this.options = _.assign({
+  this.options = Object.assign({
     persistent: true
   }, options);
 

lib/hexo/index.js

@@ -26,6 +26,8 @@ const loadDatabase = require('./load_database');
 const multiConfigPath = require('./multi_config_path');
 const resolve = require('resolve');
 
+const { cloneDeep, debounce } = _;
+
 const libDir = pathFn.dirname(__dirname);
 const sep = pathFn.sep;
 const dbVersion = 1;
@@ -64,7 +66,7 @@ function Hexo(base = process.cwd(), args = {}) {
     tag: new extend.Tag()
   };
 
-  this.config = _.cloneDeep(defaultConfig);
+  this.config = cloneDeep(defaultConfig);
 
   this.log = logger(this.env);
 
@@ -260,7 +262,7 @@ Hexo.prototype.load = function(callback) {
 Hexo.prototype.watch = function(callback) {
   const self = this;
 
-  this._watchBox = _.debounce(() => self._generate({cache: false}), 100);
+  this._watchBox = debounce(() => self._generate({cache: false}), 100);
 
   return loadDatabase(this).then(() => {
     self.log.info('Start processing');
@@ -321,7 +323,7 @@ Hexo.prototype._generate = function(options) {
   }
 
   Locals.prototype.config = config;
-  Locals.prototype.theme = _.assign({}, config, theme.config, config.theme_config);
+  Locals.prototype.theme = Object.assign({}, config, theme.config, config.theme_config);
   Locals.prototype._ = _;
   Locals.prototype.layout = 'layout';
   Locals.prototype.cache = options.cache;
@@ -362,7 +364,7 @@ Hexo.prototype._generate = function(options) {
       }
 
       if (Array.isArray(layout)) {
-        layout = _.uniq(layout);
+        layout = layout.filter((item, index, self) => self.indexOf(item) === index);
       } else {
         layout = [layout];
       }
@@ -398,7 +400,7 @@ Hexo.prototype._generate = function(options) {
         });
     }).then(() => {
       // Remove old routes
-      const removed = _.difference(routeList, newRouteList);
+      const removed = routeList.filter(item => !newRouteList.includes(item));
 
       for (let i = 0, len = removed.length; i < len; i++) {
         route.remove(removed[i]);

lib/hexo/load_config.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const _ = require('lodash');
+const merge = require('lodash/merge');
 const pathFn = require('path');
 const tildify = require('tildify');
 const Theme = require('../theme');
@@ -28,7 +28,7 @@ module.exports = ctx => {
 
     ctx.log.debug('Config loaded: %s', chalk.magenta(tildify(configPath)));
 
-    config = _.merge(ctx.config, config);
+    config = merge(ctx.config, config);
     ctx.config_path = configPath;
 
     config.root = config.root.replace(/\/*$/, '/');

lib/hexo/multi_config_path.js

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

lib/hexo/post.js

@@ -3,7 +3,8 @@
 const moment = require('moment');
 const Promise = require('bluebird');
 const pathFn = require('path');
-const _ = require('lodash');
+const assignIn = require('lodash/assignIn');
+const clone = require('lodash/clone');
 const yaml = require('js-yaml');
 const { slugize, escapeRegExp } = require('hexo-util');
 const fs = require('hexo-fs');
@@ -111,7 +112,7 @@ Post.prototype._renderScaffold = function(data) {
   let yfmSplit;
 
   return this._getScaffold(data.layout).then(scaffold => {
-    const frontMatter = prepareFrontMatter(_.clone(data));
+    const frontMatter = prepareFrontMatter(clone(data));
     yfmSplit = yfm.split(scaffold);
 
     return tag.render(yfmSplit.data, frontMatter);
@@ -129,7 +130,7 @@ Post.prototype._renderScaffold = function(data) {
 
     // Add data which are not in the front-matter
     for (const key of Object.keys(data)) {
-      if (!_.includes(preservedKeys, key) && obj[key] == null) {
+      if (!preservedKeys.includes(key) && obj[key] == null) {
         obj[key] = data[key];
       }
     }
@@ -197,7 +198,7 @@ Post.prototype.publish = function(data, replace, callback) {
     return fs.readFile(src);
   }).then(content => {
     // Create post
-    _.extend(data, yfm(content));
+    assignIn(data, yfm(content));
     data.content = data._content;
     delete data._content;
 

lib/models/post.js

@@ -4,7 +4,6 @@ const Schema = require('warehouse').Schema;
 const moment = require('moment');
 const pathFn = require('path');
 const Promise = require('bluebird');
-const _ = require('lodash');
 const Moment = require('./types/moment');
 
 function pickID(data) {
@@ -51,11 +50,11 @@ module.exports = ctx => {
   });
 
   Post.virtual('permalink').get(function() {
-    const self = _.assign({}, ctx.extend.helper.list(), ctx);
+    const self = Object.assign({}, ctx.extend.helper.list(), ctx);
     const config = ctx.config;
     let partial_url = self.url_for(this.path);
     if (config.relative_link) partial_url = `/${partial_url}`;
-    return config.url + _.replace(partial_url, config.root, '/');
+    return config.url + partial_url.replace(config.root, '/');
   });
 
   Post.virtual('full_source').get(function() {
@@ -109,7 +108,7 @@ module.exports = ctx => {
       });
     }).then(tags => {
       // Remove old tags
-      const deleted = _.difference(existed, tags.map(pickID));
+      const deleted = existed.filter(item => !tags.map(pickID).includes(item));
       return deleted;
     }).map(tag => PostTag.removeById(tag));
   });
@@ -190,7 +189,7 @@ module.exports = ctx => {
         category_id: catId
       });
     }).then(postCats => // Remove old categories
-      _.difference(existed, postCats.map(pickID))).map(cat => PostCategory.removeById(cat));
+      existed.filter(item => !postCats.map(pickID).includes(item))).map(cat => PostCategory.removeById(cat));
   });
 
   // Remove PostTag references

lib/models/post_asset.js

@@ -2,7 +2,6 @@
 
 const Schema = require('warehouse').Schema;
 const pathFn = require('path');
-const _ = require('lodash');
 
 module.exports = ctx => {
   const PostAsset = new Schema({
@@ -21,7 +20,7 @@ module.exports = ctx => {
     // PostAsset.path is file path relative to `public_dir`
     // no need to urlescape, #1562
     // strip /\.html?$/ extensions on permalink, #2134
-    return pathFn.join(_.replace(post.path, /\.html?$/, ''), this.slug);
+    return pathFn.join(post.path.replace(/\.html?$/, ''), this.slug);
   });
 
   PostAsset.virtual('source').get(function() {

lib/plugins/console/deploy.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const _ = require('lodash');
+const assignIn = require('lodash/assignIn');
+const clone = require('lodash/clone');
 const fs = require('hexo-fs');
 const chalk = require('chalk');
 const Promise = require('bluebird');
@@ -23,7 +24,7 @@ function deployConsole(args) {
   }
 
   return new Promise((resolve, reject) => {
-    const generateArgs = _.clone(args);
+    const generateArgs = clone(args);
     generateArgs.d = false;
     generateArgs.deploy = false;
 
@@ -52,7 +53,7 @@ function deployConsole(args) {
 
     self.log.info('Deploying: %s', chalk.magenta(type));
 
-    return deployers[type].call(self, _.extend({}, item, args)).then(() => {
+    return deployers[type].call(self, assignIn({}, item, args)).then(() => {
       self.log.info('Deploy done: %s', chalk.magenta(type));
     });
   }).then(() => {

lib/plugins/filter/new_post_path.js

@@ -2,7 +2,7 @@
 
 const pathFn = require('path');
 const moment = require('moment');
-const _ = require('lodash');
+const defaults = require('lodash/defaults');
 const Promise = require('bluebird');
 const util = require('hexo-util');
 const fs = require('hexo-fs');
@@ -77,7 +77,7 @@ function newPostPathFilter(data = {}, replace) {
         }
 
         target = pathFn.join(postDir, permalink.stringify(
-          _.defaults(filenameData, permalinkDefaults)));
+          defaults(filenameData, permalinkDefaults)));
       }
     }
   } else {

lib/plugins/filter/post_permalink.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const _ = require('lodash');
+const defaults = require('lodash/defaults');
 const util = require('hexo-util');
 const pathFn = require('path');
 const Permalink = util.Permalink;
@@ -44,7 +44,7 @@ function postPermalinkFilter(data) {
     Object.defineProperty(meta, key, Object.getOwnPropertyDescriptor(data, key));
   }
 
-  return permalink.stringify(_.defaults(meta, config.permalink_defaults));
+  return permalink.stringify(defaults(meta, config.permalink_defaults));
 }
 
 module.exports = postPermalinkFilter;

lib/plugins/helper/date.js

@@ -2,7 +2,7 @@
 
 const moment = require('moment-timezone');
 const isMoment = moment.isMoment;
-const isDate = require('lodash').isDate;
+const isDate = require('lodash/isDate');
 
 function getMoment(date, lang, timezone) {
   if (date == null) date = moment();

lib/plugins/helper/partial.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const pathFn = require('path');
-const _ = require('lodash');
 const chalk = require('chalk');
 
 module.exports = ctx => function partial(name, locals, options) {
@@ -22,9 +21,9 @@ module.exports = ctx => function partial(name, locals, options) {
   }
 
   if (options.only) {
-    _.assign(viewLocals, locals);
+    Object.assign(viewLocals, locals);
   } else {
-    _.assign(viewLocals, this, locals);
+    Object.assign(viewLocals, this, locals);
   }
 
   // Partial don't need layout

lib/plugins/helper/toc.js

@@ -1,7 +1,7 @@
 'use strict';
 
 let cheerio;
-const _ = require('lodash');
+const escape = require('lodash/escape');
 
 function tocHelper(str, options = {}) {
   if (!cheerio) cheerio = require('cheerio');
@@ -24,7 +24,7 @@ function tocHelper(str, options = {}) {
   headings.each(function() {
     const level = +this.name[1];
     const id = $(this).attr('id');
-    const text = _.escape($(this).text());
+    const text = escape($(this).text());
 
     lastNumber[level - 1]++;
 

lib/plugins/helper/url_for.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const url = require('url');
-const _ = require('lodash');
 
 function urlForHelper(path = '/', options) {
   if (path[0] === '#' || path.startsWith('//')) {
@@ -12,7 +11,7 @@ function urlForHelper(path = '/', options) {
   const root = config.root;
   const data = url.parse(path);
 
-  options = _.assign({
+  options = Object.assign({
     relative: config.relative_link
   }, options);
 

lib/plugins/processor/common.js

@@ -3,7 +3,6 @@
 const Pattern = require('hexo-util').Pattern;
 const moment = require('moment-timezone');
 const minimatch = require('minimatch');
-const _ = require('lodash');
 
 const DURATION_MINUTE = 1000 * 60;
 
@@ -13,7 +12,7 @@ function isTmpFile(path) {
 }
 
 function isHiddenFile(path) {
-  return /(^|\/)[_\.]/.test(path); // eslint-disable-line no-useless-escape
+  return /(^|\/)[_.]/.test(path);
 }
 
 exports.ignoreTmpAndHiddenFile = new Pattern(path => {
@@ -51,7 +50,7 @@ exports.isMatch = (path, patterns) => {
   if (!patterns) return false;
   if (!Array.isArray(patterns)) patterns = [patterns];
 
-  patterns = _.compact(patterns);
+  patterns = patterns.filter(value => value);
   if (!patterns.length) return false;
 
   for (let i = 0, len = patterns.length; i < len; i++) {

lib/plugins/processor/post.js

@@ -5,7 +5,6 @@ const Promise = require('bluebird');
 const yfm = require('hexo-front-matter');
 const pathFn = require('path');
 const fs = require('hexo-fs');
-const _ = require('lodash');
 const util = require('hexo-util');
 const slugize = util.slugize;
 const Pattern = util.Pattern;
@@ -193,7 +192,7 @@ module.exports = ctx => {
     for (let i = 0, len = posts.length; i < len; i++) {
       post = posts[i];
 
-      if (_.startsWith(file.source, post.asset_dir)) {
+      if (file.source.startsWith(post.asset_dir)) {
         return PostAsset.save({
           _id: id,
           slug: file.source.substring(post.asset_dir.length),
@@ -215,12 +214,12 @@ module.exports = ctx => {
 
       let result;
 
-      if (_.startsWith(path, postDir)) {
+      if (path.startsWith(postDir)) {
         result = {
           published: true,
           path: path.substring(postDir.length)
         };
-      } else if (_.startsWith(path, draftDir)) {
+      } else if (path.startsWith(draftDir)) {
         result = {
           published: false,
           path: path.substring(draftDir.length)