Merge pull request webpack#3986 from webpack/bugfix/revert_use_of_buffer_dot_from

sokra · web-flow · commit 260e41314b04 · 2017-01-17T19:27:57.000+01:00
fix(node): rollback changes of Buffer.from to new Buffer()
diff --git a/.travis.yml b/.travis.yml
@@ -22,7 +22,7 @@ matrix:
       node_js: "6"
       env: NO_WATCH_TESTS=1 JOB_PART=test
     - os: linux
-      node_js: "4"
+      node_js: "4.3"
       env: NO_WATCH_TESTS=1 JOB_PART=test
     - os: osx
       node_js: "7"
diff --git a/bin/webpack.js b/bin/webpack.js
@@ -5,6 +5,7 @@
 	Author Tobias Koppers @sokra
 */
 var path = require("path");
+
 // Local version replace global one
 try {
 	var localWebpack = require.resolve(path.join(process.cwd(), "node_modules", "webpack", "bin", "webpack.js"));
diff --git a/lib/Compiler.js b/lib/Compiler.js
@@ -320,8 +320,11 @@ Compiler.prototype.emitAssets = function(compilation, callback) {
 					return callback();
 				}
 				var content = source.source();
-				if(!Buffer.isBuffer(content))
-					content = Buffer.from(content, "utf8");
+
+				if(!Buffer.isBuffer(content)) {
+					content = new Buffer(content, "utf8"); //eslint-disable-line
+				}
+
 				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," + Buffer.from(JSON.stringify(sourceMap)).toString("base64"));
+		var footer = self.sourceMapComment.replace(/\[url\]/g, "data:application/json;charset=utf-8;base64," + new Buffer(JSON.stringify(sourceMap), "utf8").toString("base64")); //eslint-disable-line
 		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 = Buffer.from(JSON.stringify(manifest, null, 2), "utf8");
+			var content = new Buffer(JSON.stringify(manifest, null, 2), "utf8"); //eslint-disable-line
 			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," +
-								Buffer.from(JSON.stringify(sourceMap)).toString("base64");
+								new Buffer(JSON.stringify(sourceMap), "utf8").toString("base64"); //eslint-disable-line
 						})
 					);
 				}
diff --git a/package.json b/package.json
@@ -65,7 +65,7 @@
     "worker-loader": "~0.7.0"
   },
   "engines": {
-    "node": ">=4.7.0 <5.0.0 || >=5.10"
+    "node": ">=4.3.0 <5.0.0 || >=5.10"
   },
   "repository": {
     "type": "git",
diff --git a/yarn.lock b/yarn.lock

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," + Buffer.from(JSON.stringify(sourceMap)).toString("base64"));`
	`61`	`+ var footer = self.sourceMapComment.replace(/\[url\]/g, "data:application/json;charset=utf-8;base64," + new Buffer(JSON.stringify(sourceMap), "utf8").toString("base64")); //eslint-disable-line`
`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`		`- Buffer.from(JSON.stringify(sourceMap)).toString("base64");`
	`158`	`+ new Buffer(JSON.stringify(sourceMap), "utf8").toString("base64"); //eslint-disable-line`
`159`	`159`	`})`
`160`	`160`	`);`
`161`	`161`	`}`