chore(eslint): added eslint-node-plugin (webpack#3652)

TheLarkInn · web-flow · commit 7327ee608a04 · 2016-12-30T17:13:49.000-06:00
diff --git a/.eslintrc b/.eslintrc
@@ -1,11 +1,9 @@
 {
 	"root": true,
-	"extends": [
-		"eslint:recommended"
-	],
+	"plugins": ["node"],
+	"extends": ["eslint:recommended", "plugin:node/recommended"],
 	"env": {
-		"node": true,
-		"es6": true
+		"node": true
 	},
 	"rules": {
 		"quotes": ["error", "double"],
@@ -45,3 +43,4 @@
 		"valid-jsdoc": "error"
 	}
 }
+
diff --git a/bin/convert-argv.js b/bin/convert-argv.js
@@ -466,12 +466,6 @@ module.exports = function(yargs, argv, convertOptions) {
 			options.plugins.push(new ProvidePlugin(name, value));
 		});
 
-		ifBooleanArg("labeled-modules", function() {
-			ensureArray(options, "plugins");
-			var LabeledModulesPlugin = require("../lib/dependencies/LabeledModulesPlugin");
-			options.plugins.push(new LabeledModulesPlugin());
-		});
-
 		ifArg("plugin", function(value) {
 			ensureArray(options, "plugins");
 			options.plugins.push(loadPlugin(value));
diff --git a/bin/webpack.js b/bin/webpack.js
@@ -326,7 +326,6 @@ function processOptions(options) {
 			console.error(err.stack || err);
 			if(err.details) console.error(err.details);
 			process.exit(1); // eslint-disable-line
-			return;
 		}
 		if(outputOptions.json) {
 			process.stdout.write(JSON.stringify(stats.toJson(outputOptions), null, 2) + "\n");
diff --git a/hot/.eslintrc b/hot/.eslintrc
@@ -1,7 +1,9 @@
 {
 	"env": {
-		"node": true,
-		"es6": false,
-		"browser": true
+		"node": true
+	},
+	"rules": {
+		"node/exports-style": ["off"]
 	}
+
 }
diff --git a/lib/Compiler.js b/lib/Compiler.js
@@ -321,7 +321,7 @@ Compiler.prototype.emitAssets = function(compilation, callback) {
 				}
 				var content = source.source();
 				if(!Buffer.isBuffer(content))
-					content = new Buffer(content, "utf-8");
+					content = Buffer.from(content, "utf8");
 				source.existsAt = targetPath;
 				source.emitted = true;
 				this.outputFileSystem.writeFile(targetPath, content, callback);
diff --git a/lib/EvalSourceMapDevToolModuleTemplatePlugin.js b/lib/EvalSourceMapDevToolModuleTemplatePlugin.js
@@ -58,7 +58,7 @@ EvalSourceMapDevToolModuleTemplatePlugin.prototype.apply = function(moduleTempla
 		}
 		sourceMap.sourceRoot = options.sourceRoot || "";
 		sourceMap.file = module.id + ".js";
-		var footer = self.sourceMapComment.replace(/\[url\]/g, "data:application/json;charset=utf-8;base64," + new Buffer(JSON.stringify(sourceMap)).toString("base64"));
+		var footer = self.sourceMapComment.replace(/\[url\]/g, "data:application/json;charset=utf-8;base64," + Buffer.from(JSON.stringify(sourceMap)).toString("base64"));
 		source.__EvalSourceMapDevToolData = new RawSource("eval(" + JSON.stringify(content + footer) + ");");
 		return source.__EvalSourceMapDevToolData;
 	});
diff --git a/lib/LibManifestPlugin.js b/lib/LibManifestPlugin.js
@@ -43,7 +43,7 @@ LibManifestPlugin.prototype.apply = function(compiler) {
 					return obj;
 				}.bind(this), {})
 			};
-			var content = new Buffer(JSON.stringify(manifest, null, 2), "utf-8");
+			var content = Buffer.from(JSON.stringify(manifest, null, 2), "utf8");
 			compiler.outputFileSystem.mkdirp(path.dirname(targetPath), function(err) {
 				if(err) return callback(err);
 				compiler.outputFileSystem.writeFile(targetPath, content, callback);
diff --git a/lib/SourceMapDevToolPlugin.js b/lib/SourceMapDevToolPlugin.js
@@ -155,7 +155,7 @@ SourceMapDevToolPlugin.prototype.apply = function(compiler) {
 						})
 						.replace(/\[url\]/g, function() {
 							return "data:application/json;charset=utf-8;base64," +
-								new Buffer(JSON.stringify(sourceMap)).toString("base64");
+								Buffer.from(JSON.stringify(sourceMap)).toString("base64");
 						})
 					);
 				}
diff --git a/package.json b/package.json
@@ -37,6 +37,7 @@
     "css-loader": "~0.25.0",
     "es6-promise-polyfill": "^1.1.1",
     "eslint": "3.12.2",
+    "eslint-plugin-node": "^3.0.5",
     "express": "~4.13.1",
     "extract-text-webpack-plugin": "^2.0.0-beta",
     "file-loader": "~0.9.0",

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,9 @@`
`1`	`1`	`{`
`2`	`2`	`"root": true,`
`3`		`- "extends": [`
`4`		`- "eslint:recommended"`
`5`		`- ],`
	`3`	`+ "plugins": ["node"],`
	`4`	`+ "extends": ["eslint:recommended", "plugin:node/recommended"],`
`6`	`5`	`"env": {`
`7`		`- "node": true,`
`8`		`- "es6": true`
	`6`	`+ "node": true`
`9`	`7`	`},`
`10`	`8`	`"rules": {`
`11`	`9`	`"quotes": ["error", "double"],`
`@@ -45,3 +43,4 @@`
`45`	`43`	`"valid-jsdoc": "error"`
`46`	`44`	`}`
`47`	`45`	`}`
	`46`	`+`
Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,6 @@ function processOptions(options) {`
`326`	`326`	`console.error(err.stack \|\| err);`
`327`	`327`	`if(err.details) console.error(err.details);`
`328`	`328`	`process.exit(1); // eslint-disable-line`
`329`		`- return;`
`330`	`329`	`}`
`331`	`330`	`if(outputOptions.json) {`
`332`	`331`	`process.stdout.write(JSON.stringify(stats.toJson(outputOptions), null, 2) + "\n");`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,9 @@`
`1`	`1`	`{`
`2`	`2`	`"env": {`
`3`		`- "node": true,`
`4`		`- "es6": false,`
`5`		`- "browser": true`
	`3`	`+ "node": true`
	`4`	`+ },`
	`5`	`+ "rules": {`
	`6`	`+ "node/exports-style": ["off"]`
`6`	`7`	`}`
	`8`	`+`
`7`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,7 @@ Compiler.prototype.emitAssets = function(compilation, callback) {`
`321`	`321`	`}`
`322`	`322`	`var content = source.source();`
`323`	`323`	`if(!Buffer.isBuffer(content))`
`324`		`- content = new Buffer(content, "utf-8");`
	`324`	`+ content = Buffer.from(content, "utf8");`
`325`	`325`	`source.existsAt = targetPath;`
`326`	`326`	`source.emitted = true;`
`327`	`327`	`this.outputFileSystem.writeFile(targetPath, content, callback);`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ EvalSourceMapDevToolModuleTemplatePlugin.prototype.apply = function(moduleTempla`
`58`	`58`	`}`
`59`	`59`	`sourceMap.sourceRoot = options.sourceRoot \|\| "";`
`60`	`60`	`sourceMap.file = module.id + ".js";`
`61`		`- var footer = self.sourceMapComment.replace(/\[url\]/g, "data:application/json;charset=utf-8;base64," + new Buffer(JSON.stringify(sourceMap)).toString("base64"));`
	`61`	`+ var footer = self.sourceMapComment.replace(/\[url\]/g, "data:application/json;charset=utf-8;base64," + Buffer.from(JSON.stringify(sourceMap)).toString("base64"));`
`62`	`62`	`source.__EvalSourceMapDevToolData = new RawSource("eval(" + JSON.stringify(content + footer) + ");");`
`63`	`63`	`return source.__EvalSourceMapDevToolData;`
`64`	`64`	`});`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ SourceMapDevToolPlugin.prototype.apply = function(compiler) {`
`155`	`155`	`})`
`156`	`156`	`.replace(/\[url\]/g, function() {`
`157`	`157`	`return "data:application/json;charset=utf-8;base64," +`
`158`		`- new Buffer(JSON.stringify(sourceMap)).toString("base64");`
	`158`	`+ Buffer.from(JSON.stringify(sourceMap)).toString("base64");`
`159`	`159`	`})`
`160`	`160`	`);`
`161`	`161`	`}`