Merge branch 'master' into support-version-active-lts-or-latest

hexojs · Nov 25, 2018 · 76255f3 · 76255f3
2 parents 9bc0457 + 9e5e7ae
commit 76255f3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/index.js b/index.js
@@ -2,8 +2,6 @@
 
 'use strict';
 
-var assign = require('object-assign');
-
 // when archive disabled pagination, per_page should be 0.
 var per_page;
 
@@ -15,7 +13,7 @@ if (hexo.config.archive === 1) {
   per_page = hexo.config.per_page;
 }
 
-hexo.config.archive_generator = assign({
+hexo.config.archive_generator = Object.assign({
   per_page: per_page,
   yearly: true,
   monthly: true,

diff --git a/package.json b/package.json
@@ -29,10 +29,9 @@
     "mocha": "^5.2.0"
   },
   "dependencies": {
-    "hexo-pagination": "0.1.0",
-    "object-assign": "^2.0.0"
+    "hexo-pagination": "0.1.0"
   },
   "engines": {
     "node": "^6.9 || ^8.9 || ^10.13 || >=11"
   }
-}
+}