Merge branch 'master' into dependabot/npm_and_yarn/nunjucks-tw-3.1.6

hexojs · Dec 18, 2018 · c414a3b · c414a3b
2 parents 33f6ac7 + 61c5640
commit c414a3b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 16 deletions.
diff --git a/.jscsrc b/.jscsrc
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,6 @@ node_js:
 
 script:
   - npm run eslint
-  - npm run jscs
   - npm run test-cov
 
 after_script:

diff --git a/index.js b/index.js
@@ -1,10 +1,9 @@
 /* global hexo */
 'use strict';
 
-var assign = require('object-assign');
 var pathFn = require('path');
 
-var config = hexo.config.sitemap = assign({
+var config = hexo.config.sitemap = Object.assign({
   path: 'sitemap.xml'
 }, hexo.config.sitemap);
 

diff --git a/package.json b/package.json
@@ -5,7 +5,6 @@
   "main": "index",
   "scripts": {
     "eslint": "eslint .",
-    "jscs": "jscs .",
     "test": "mocha test/index.js",
     "test-cov": "istanbul cover --print both _mocha -- test/index.js"
   },
@@ -26,18 +25,15 @@
   "license": "MIT",
   "dependencies": {
     "minimatch": "^3.0.0",
-    "nunjucks": "^3.1.6",
-    "object-assign": "^4.0.1"
+    "nunjucks": "^3.1.6"
   },
   "devDependencies": {
     "chai": "^4.2.0",
     "cheerio": "^0.22.0",
-    "eslint": "^2.13.1",
-    "eslint-config-hexo": "^1.0.2",
+    "eslint": "^5.10.0",
+    "eslint-config-hexo": "^3.0.0",
     "hexo": "^3.0.0",
     "istanbul": "^0.4.2",
-    "jscs": "^3.0.7",
-    "jscs-preset-hexo": "^1.0.1",
     "mocha": "^5.2.0"
   }
 }
diff --git a/test/index.js b/test/index.js
@@ -12,8 +12,8 @@ describe('Sitemap generator', function() {
   var Post = hexo.model('Post');
   var generator = require('../lib/generator').bind(hexo);
   var sitemapTmpl = require('../lib/template')(hexo.config);
-  var posts;
-  var locals;
+  var posts,
+    locals;
 
   before(function() {
     return hexo.init().then(function() {