Update ESLint config

.eslintrc.json

@@ -1,25 +1,17 @@
 {
+	"parserOptions": {
+		"sourceType": "script",
+		"impliedStrict": false
+	},
 	"env": {
-		"browser": false,
 		"es6": true,
 		"node": true
 	},
 	"extends": [
 		"standard"
 	],
-	"parserOptions": {
-		"sourceType": "script",
-		"ecmaVersion": 2017
-	},
 	"root": true,
 	"rules": {
-		"arrow-spacing": [
-			"error",
-			{
-				"after": true,
-				"before": true
-			}
-		],
 		"comma-dangle": [
 			"error",
 			{
@@ -37,37 +29,22 @@
 				"before": false
 			}
 		],
-		"eol-last": [
-			"error",
-			"always"
-		],
-		"eqeqeq": [
-			"error",
-			"smart"
-		],
 		"indent": [
 			"error",
 			"tab",
 			{
 				"SwitchCase": 1
 			}
 		],
-		"keyword-spacing": [
-			"error",
-			{
-				"after": true,
-				"before": true
-			}
-		],
-		"no-console": [
-			"error"
-		],
 		"no-tabs": [
 			"off"
 		],
 		"no-var": [
 			"error"
 		],
+		"prefer-arrow-callback": [
+			"error"
+		],
 		"prefer-const": [
 			"error"
 		],
@@ -86,26 +63,19 @@
 				"omitLastInOneLineBlock": false
 			}
 		],
-		"space-before-blocks": [
-			"error",
-			"always"
-		],
-		"space-infix-ops": [
-			"error"
-		],
-		"spaced-comment": [
-			"error",
-			"always"
-		],
 		"strict": [
 			"error",
 			"safe"
-		],
-		"valid-jsdoc": [
-			"error",
-			{
-				"requireReturn": false
-			}
 		]
-	}
+	},
+	"overrides": [
+		{
+			"files": [
+				"test/**/*"
+			],
+			"env": {
+				"mocha": true
+			}
+		}
+	]
 }

lib/ci-reporter.js

@@ -106,7 +106,7 @@ function checkstyle (errors) {
 
 function getErrorsByFile (errors) {
 	const result = {};
-	errors.forEach(function (error) {
+	errors.forEach((error) => {
 		if (result[error.fileName]) {
 			result[error.fileName].push(error);
 		} else {

lib/eslint-error.js

@@ -101,7 +101,7 @@ function docUrl (rule, error) {
 		return `https://${locale === 'zh_CN' ? 'cn.' : ''}eslint.org/docs/rules/${rule}`;
 	}
 	if (baseUrl) {
-		if (typeof baseUrl == 'function') {
+		if (typeof baseUrl === 'function') {
 			try {
 				return baseUrl(rule, error);
 			} catch (ex) {

lib/get-errors.js

@@ -56,7 +56,7 @@ function getErrors (file, options) {
 
 	}) : Promise.resolve()).then(blames => {
 		// blame信息写入error对象
-		errors.forEach(function (error) {
+		errors.forEach((error) => {
 			if (!error.fileName) {
 				error.fileName = file.path;
 			}

lib/get-options.js

@@ -58,7 +58,7 @@ module.exports = function (options) {
 						expires = new Date(expires);
 					}
 				}
-				if (typeof expires == 'number') {
+				if (typeof expires === 'number') {
 					if (expires <= 0 || isNaN(expires)) {
 						throw new TypeError('`options.expires` must be greater than 0.');
 					}

lib/js-browser-reporter.js

@@ -13,7 +13,7 @@ function jsBrowserReporter (errors) {
 	var isGecko = !!window.netscape;
 
 	var throwError = isGecko ? function (message, stack, err) {
-		stack = stack.map(function (uri) {
+		stack = stack.map((uri) => {
 			return '@' + uri;
 		});
 		if (!err.severity || err.severity === 'error') {
@@ -22,14 +22,14 @@ function jsBrowserReporter (errors) {
 			error.fileName = err.fileName;
 			error.lineNumber = err.lineNumber;
 			error.stack = stack.join('\n');
-			setTimeout(function () {
+			setTimeout(() => {
 				throw error;
 			}, 0);
 		} else {
 			consoleError(message, stack, err);
 		}
 	} : function (message, stack, err) {
-		stack = stack.map(function (uri) {
+		stack = stack.map((uri) => {
 			return '    at ' + uri;
 		});
 		consoleError(message, stack, err);
@@ -43,7 +43,7 @@ function jsBrowserReporter (errors) {
 	}
 
 	// 将文件路径与模块路径拼接为完整的url
-	errors.forEach(function (err) {
+	errors.forEach((err) => {
 		var message = err.message + ' (' + [
 			err.plugin,
 			err.rule,

lib/lint-error.js

@@ -67,7 +67,7 @@ class LintError extends Error {
 		if (this.doc) {
 			stack.push(this.doc);
 		}
-		stack = stack.map(function (uri) {
+		stack = stack.map((uri) => {
 			return '    at ' + uri;
 		});
 		stack.unshift(message);

lib/stylint-error.js

@@ -25,7 +25,7 @@ class StyLintError extends LintError {
 			// 报错插件
 			plugin: 'StyLint',
 		};
-		message.replace(/^(.+?):\s*(.+?)$/gm, function (s, key, value) {
+		message.replace(/^(.+?):\s*(.+?)$/gm, (s, key, value) => {
 			if (/^(?:error|warn(?:ing)?|info)$/i.test(key)) {
 				key = key.toLowerCase();
 				error.severity = STYLLINT_SEVERITY_MAP[key] || key;

test/api.test.js

@@ -392,7 +392,7 @@ describe('API', () => {
 				'    01:01 \u{2714} testcase message.',
 			]);
 			if (padStart) {
-				/* eslint no-extend-native: "off"*/
+				/* eslint no-extend-native: "off" */
 				String.prototype.padStart = padStart;
 			}
 			if (VSCODE_PID) {

test/ci.test.js

@@ -6,7 +6,7 @@ const path = require('path');
 const os = require('os');
 const env = process.env;
 
-describe('CI', function () {
+describe('CI', () => {
 	const mkdtemp = fs.mkdtemp.bind(fs, path.join(os.tmpdir(), 'gulp-reporter-ci-'));
 	let tempDir;
 

test/postcss.test.js

@@ -7,7 +7,7 @@ const postcss = require('gulp-html-postcss');
 const stylelint = require('stylelint');
 const sandbox = require('./sandbox');
 
-describe('PostCSS', function () {
+describe('PostCSS', () => {
 	it('PostCSSError', () => {
 		const PostCSSError = proxyquire('../lib/postcss-error', {
 			'./lint-error': proxyquire('../lib/lint-error', {

test/stylint.test.js

@@ -6,7 +6,7 @@ const reporter = require('../');
 const sandbox = require('./sandbox');
 const StyLintError = require('../lib/stylint-error');
 
-describe('stylint', function () {
+describe('stylint', () => {
 	it('StyLintError', () => {
 		const error = new StyLintError('mock: value');
 		assert.equal(error.mock, 'value');