Merge 59c7e37 into e423773

hexojs · Dec 6, 2019 · 384480f · 384480f
2 parents e423773 + 59c7e37
commit 384480f
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 10 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,7 +1,4 @@
 {
   "extends": "hexo",
-  "root": true,
-  "parserOptions": {
-    "ecmaVersion": 2018
-  }
+  "root": true
 }
diff --git a/lib/plugins/filter/after_render/meta_generator.js b/lib/plugins/filter/after_render/meta_generator.js
@@ -7,7 +7,7 @@ function hexoMetaGeneratorInject(data) {
 
   const hexoGeneratorTag = `<meta name="generator" content="Hexo ${this.version}">`;
 
-  return data.replace(/<head>(?!<\/head>).+?<\/head>/s, (str) => str.replace('</head>', `${hexoGeneratorTag}</head>`));
+  return data.replace(/<head>(?!<\/head>).+?<\/head>/s, str => str.replace('</head>', `${hexoGeneratorTag}</head>`));
 }
 
 module.exports = hexoMetaGeneratorInject;
diff --git a/lib/plugins/helper/date.js b/lib/plugins/helper/date.js
@@ -3,7 +3,7 @@
 const moment = require('moment-timezone');
 const { isMoment } = moment;
 
-const isDate = (value) => {
+const isDate = value => {
   if (typeof value === 'object') {
     if (value instanceof Date) return !isNaN(value.getTime());
   }

diff --git a/package.json b/package.json
@@ -72,7 +72,7 @@
     "chai": "^4.1.2",
     "chai-as-promised": "^7.1.1",
     "eslint": "^6.0.1",
-    "eslint-config-hexo": "^3.0.0",
+    "eslint-config-hexo": "^4.0.0",
     "hexo-renderer-marked": "^2.0.0",
     "husky": "^3.0.0",
     "lint-staged": "^9.1.0",

diff --git a/test/.eslintrc b/test/.eslintrc
@@ -1,8 +1,5 @@
 {
   "extends": "hexo/test",
-  "env": {
-    "es6": true
-  },
   "globals": {
     "should": true
   }