Merge pull request webpack#3341 from Kovensky/eslint-more-rules

sokra · web-flow · commit 72eeaf12c30a · 2016-11-21T02:15:58.000+01:00
More eslint rules
diff --git a/.eslintrc b/.eslintrc
@@ -1,5 +1,8 @@
 {
 	"root": true,
+	"extends": [
+		"eslint:recommended"
+	],
 	"env": {
 		"node": true
 	},
@@ -21,6 +24,12 @@
 		"consistent-return": 0,
 		"no-inner-declarations": 1,
 		"no-loop-func": 1,
-		"space-before-function-paren": [2, "never"] 
+		"space-before-function-paren": [2, "never"],
+		"space-before-blocks": [2, "always"],
+		"space-before-keywords": [2, "always"],
+		"no-console": 0,
+		"comma-dangle": 0,
+		"no-unexpected-multiline": 2,
+		"valid-jsdoc": 2
 	}
 }
diff --git a/bin/webpack.js b/bin/webpack.js
@@ -280,7 +280,7 @@ function processOptions(options) {
 				console.error("\u001b[1m\u001b[31m" + e.message + "\u001b[39m\u001b[22m");
 			else
 				console.error(e.message);
-			process.exit(1);
+			process.exit(1); // eslint-disable-line no-process-exit
 		}
 		throw e;
 	}
diff --git a/lib/AsyncDependenciesBlock.js b/lib/AsyncDependenciesBlock.js
@@ -49,7 +49,7 @@ AsyncDependenciesBlock.prototype.sortItems = function() {
 	if(this.chunks) {
 		this.chunks.sort(function(a, b) {
 			var i = 0;
-			while(true) {
+			while(true) { // eslint-disable-line no-constant-condition
 				if(!a.modules[i] && !b.modules[i]) return 0;
 				if(!a.modules[i]) return -1;
 				if(!b.modules[i]) return 1;
diff --git a/lib/ContextReplacementPlugin.js b/lib/ContextReplacementPlugin.js
@@ -100,4 +100,4 @@ function createResolveDependenciesFromContextMap(createContextMap) {
 			callback(null, dependencies);
 		});
 	}
-};
+}
diff --git a/lib/FlagDependencyExportsPlugin.js b/lib/FlagDependencyExportsPlugin.js
@@ -71,7 +71,7 @@ FlagDependencyExportsPlugin.prototype.apply = function(compiler) {
 							module.providedExports = exports.slice();
 							changed = true;
 						}
-					};
+					}
 				}
 				if(changed) {
 					notifyDependencies();
diff --git a/lib/WebpackOptionsValidationError.js b/lib/WebpackOptionsValidationError.js
@@ -86,7 +86,7 @@ WebpackOptionsValidationError.formatValidationError = function formatValidationE
 				return dataPath + " should not be empty.";
 			else
 				return dataPath + " " + err.message;
-		default:
+		default: // eslint-disable-line no-fallthrough
 			return dataPath + " " + err.message + " (" + JSON.stringify(err, 0, 2) + ").\n" +
 				getSchemaPartText(err.parentSchema);
 	}
diff --git a/lib/dependencies/HarmonyExportImportedSpecifierDependency.js b/lib/dependencies/HarmonyExportImportedSpecifierDependency.js
@@ -82,7 +82,7 @@ HarmonyExportImportedSpecifierDependency.prototype.getExports = function() {
 		return {
 			exports: [this.name]
 		}
-	};
+	}
 	if(this.importDependency.module && Array.isArray(this.importDependency.module.providedExports)) {
 		return {
 			exports: this.importDependency.module.providedExports.filter(function(id) {

Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ function processOptions(options) {`
`280`	`280`	`console.error("\u001b[1m\u001b[31m" + e.message + "\u001b[39m\u001b[22m");`
`281`	`281`	`else`
`282`	`282`	`console.error(e.message);`
`283`		`- process.exit(1);`
	`283`	`+ process.exit(1); // eslint-disable-line no-process-exit`
`284`	`284`	`}`
`285`	`285`	`throw e;`
`286`	`286`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,4 +100,4 @@ function createResolveDependenciesFromContextMap(createContextMap) {`
`100`	`100`	`callback(null, dependencies);`
`101`	`101`	`});`
`102`	`102`	`}`
`103`		`-};`
	`103`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ FlagDependencyExportsPlugin.prototype.apply = function(compiler) {`
`71`	`71`	`module.providedExports = exports.slice();`
`72`	`72`	`changed = true;`
`73`	`73`	`}`
`74`		`- };`
	`74`	`+ }`
`75`	`75`	`}`
`76`	`76`	`if(changed) {`
`77`	`77`	`notifyDependencies();`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ WebpackOptionsValidationError.formatValidationError = function formatValidationE`
`86`	`86`	`return dataPath + " should not be empty.";`
`87`	`87`	`else`
`88`	`88`	`return dataPath + " " + err.message;`
`89`		`- default:`
	`89`	`+ default: // eslint-disable-line no-fallthrough`
`90`	`90`	`return dataPath + " " + err.message + " (" + JSON.stringify(err, 0, 2) + ").\n" +`
`91`	`91`	`getSchemaPartText(err.parentSchema);`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ HarmonyExportImportedSpecifierDependency.prototype.getExports = function() {`
`82`	`82`	`return {`
`83`	`83`	`exports: [this.name]`
`84`	`84`	`}`
`85`		`- };`
	`85`	`+ }`
`86`	`86`	`if(this.importDependency.module && Array.isArray(this.importDependency.module.providedExports)) {`
`87`	`87`	`return {`
`88`	`88`	`exports: this.importDependency.module.providedExports.filter(function(id) {`