change node.Buffer in a way that is backward-compatible

sokra · sokra · commit 7da31b299025 · 2015-01-21T20:25:25.000+01:00
webpack#709
diff --git a/lib/WebpackOptionsDefaulter.js b/lib/WebpackOptionsDefaulter.js
@@ -42,7 +42,8 @@ function WebpackOptionsDefaulter() {
 	this.set("node.console", false);
 	this.set("node.process", true);
 	this.set("node.global", true);
-	this.set("node.Buffer", true);
+	// TODO: add this in next major version
+	// this.set("node.Buffer", true);
 	this.set("node.setImmediate", true);
 	this.set("node.__filename", "mock");
 	this.set("node.__dirname", "mock");
@@ -135,4 +136,4 @@ WebpackOptionsDefaulter.prototype.process = function(options) {
 		["*-webpack-node-loader", "*-node-loader", "*-loader", "*"],
 		["*-webpack-node-webkit-loader", "*-webpack-node-loader", "*-node-loader", "*-loader", "*-web-loader", "*"],
 		["*-loader", "*"]);
-};
+};
diff --git a/lib/node/NodeSourcePlugin.js b/lib/node/NodeSourcePlugin.js
@@ -42,8 +42,13 @@ NodeSourcePlugin.prototype.apply = function(compiler) {
 			return ModuleParserHelpers.addParsedVariable(this, "console", "require(" + JSON.stringify(getPathToModule("console", consoleType)) + ")");
 		});
 	}
-	if(this.options.Buffer) {
-		var bufferType = this.options.Buffer;
+	var bufferType = this.options.Buffer
+	if(typeof bufferType === "undefined") {
+		bufferType = this.options.buffer;
+		if(typeof bufferType === "undefined")
+			bufferType = true;
+	}
+	if(bufferType) {
 		compiler.parser.plugin("expression Buffer", function(expr) {
 			return ModuleParserHelpers.addParsedVariable(this, "Buffer", "require(" + JSON.stringify(getPathToModule("buffer", bufferType)) + ").Buffer");
 		});
@@ -70,4 +75,4 @@ NodeSourcePlugin.prototype.apply = function(compiler) {
 			);
 		}
 	});
-};
+};
diff --git a/test/configCases/target/buffer-backward/index.js b/test/configCases/target/buffer-backward/index.js
@@ -0,0 +1,13 @@
+require("should");
+
+it("should provide a global Buffer shim", function () {
+	(typeof Buffer).should.be.eql("undefined");
+});
+
+it("should fail on the buffer module", function () {
+	(function(argument) {
+		try {
+			require("buffer");
+		} catch(e) { throw e; }
+	}).should.throw();
+});
diff --git a/test/configCases/target/buffer-backward/warnings.js b/test/configCases/target/buffer-backward/warnings.js
@@ -0,0 +1,3 @@
+module.exports = [
+	[/Cannot resolve module 'buffer'/],
+];
diff --git a/test/configCases/target/buffer-backward/webpack.config.js b/test/configCases/target/buffer-backward/webpack.config.js
@@ -0,0 +1,6 @@
+module.exports = {
+	target: "web",
+	node: {
+		buffer: false
+	}
+};
diff --git a/test/configCases/target/buffer-backward2/index.js b/test/configCases/target/buffer-backward2/index.js
@@ -0,0 +1,9 @@
+require("should");
+
+it("should provide a global Buffer shim", function () {
+	Buffer.should.be.a.Function;
+});
+
+it("should provide the buffer module", function () {
+	require("buffer").should.be.an.Object;
+});
diff --git a/test/configCases/target/buffer-backward2/webpack.config.js b/test/configCases/target/buffer-backward2/webpack.config.js
@@ -0,0 +1,6 @@
+module.exports = {
+	target: "web",
+	node: {
+		buffer: true
+	}
+};
diff --git a/test/configCases/target/buffer/index.js b/test/configCases/target/buffer/index.js
@@ -0,0 +1,13 @@
+require("should");
+
+it("should provide a global Buffer shim", function () {
+	Buffer.should.be.an.Function;
+});
+
+it("should fail on the buffer module", function () {
+	(function(argument) {
+		try {
+			require("buffer");
+		} catch(e) { throw e; }
+	}).should.throw();
+});
diff --git a/test/configCases/target/buffer/warnings.js b/test/configCases/target/buffer/warnings.js
@@ -0,0 +1,3 @@
+module.exports = [
+	[/Cannot resolve module 'buffer'/],
+];
diff --git a/test/configCases/target/buffer/webpack.config.js b/test/configCases/target/buffer/webpack.config.js
@@ -0,0 +1,7 @@
+module.exports = {
+	target: "web",
+	node: {
+		Buffer: true,
+		buffer: false
+	}
+};

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module.exports = [`
	`2`	`+ [/Cannot resolve module 'buffer'/],`
	`3`	`+];`