Replace utils-merge with object-assign

hexojs · Feb 11, 2015 · 9931b55 · 9931b55
1 parent 534d344
commit 9931b55
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -13,12 +13,10 @@ $ npm install hexo-generator-category --save
 ## Options
 
 ``` yaml
-category_dir: categories
 category_generator:
   per_page: 10
 ```
 
-- **category_dir**: Category directory
 - **per_page**: Posts displayed per page. (0 = disable pagination)
 
 ## License

diff --git a/index.js b/index.js
@@ -1,6 +1,8 @@
-var merge = require('utils-merge');
+'use strict';
 
-hexo.config.category_generator = merge({
+var assign = require('object-assign');
+
+hexo.config.category_generator = assign({
   per_page: hexo.config.per_page
 }, hexo.config.category_generator);
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hexo-generator-category",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Category generator for Hexo.",
   "main": "index",
   "scripts": {
@@ -36,6 +36,6 @@
   },
   "dependencies": {
     "hexo-pagination": "0.0.2",
-    "utils-merge": "^1.0.0"
+    "object-assign": "^2.0.0"
   }
 }