Merge pull request webpack#3386 from chuckdumont/webpack-1

sokra · web-flow · commit 50c0220972ec · 2016-12-06T07:02:53.000+01:00
Fix lost context when invoking require()
diff --git a/lib/dependencies/DepBlockHelpers.js b/lib/dependencies/DepBlockHelpers.js
@@ -25,11 +25,11 @@ DepBlockHelpers.getLoadDepBlockWrapper = function(depBlock, outputOptions, reque
 				"if(--__WEBPACK_REMAINING_CHUNKS__ < 1) (",
 
 				"(__webpack_require__));" +
-				"};" +
+				"}.bind(this);" +
 				chunks.map(function(chunk) {
 					return "__webpack_require__.e(" + chunk.id + ", __WEBPACK_CALLBACK__);";
 				}).join("") +
-				"}())"
+				"}).call(this)"
 			];
 		}
 	}
diff --git a/test/configCases/async-commons-chunk/require-context/a.js b/test/configCases/async-commons-chunk/require-context/a.js
@@ -0,0 +1 @@
+module.exports = "a";
diff --git a/test/configCases/async-commons-chunk/require-context/b.js b/test/configCases/async-commons-chunk/require-context/b.js
@@ -0,0 +1 @@
+module.exports = "b";
diff --git a/test/configCases/async-commons-chunk/require-context/index.js b/test/configCases/async-commons-chunk/require-context/index.js
@@ -0,0 +1,11 @@
+it("should maintain require context", function(done) {
+	var context = {foo: "bar"};
+	(function(){
+		require(["./a", "./b"], function(a, b) {
+			this.foo.should.eql("bar");
+			done();
+		}.bind(this));
+	}).call(context);
+	// Call require again so that CommonsChunkPlugin will create separate chunks for a and b
+	require(["./a"], function(a) {});
+});
diff --git a/test/configCases/async-commons-chunk/require-context/webpack.config.js b/test/configCases/async-commons-chunk/require-context/webpack.config.js
@@ -0,0 +1,9 @@
+var webpack = require("../../../../");
+
+module.exports = {
+	plugins: [
+		new webpack.optimize.CommonsChunkPlugin({
+			async: true
+		})
+	]
+};

Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,11 @@ DepBlockHelpers.getLoadDepBlockWrapper = function(depBlock, outputOptions, reque`
`25`	`25`	`"if(--__WEBPACK_REMAINING_CHUNKS__ < 1) (",`
`26`	`26`
`27`	`27`	`"(__webpack_require__));" +`
`28`		`- "};" +`
	`28`	`+ "}.bind(this);" +`
`29`	`29`	`chunks.map(function(chunk) {`
`30`	`30`	`return "__webpack_require__.e(" + chunk.id + ", __WEBPACK_CALLBACK__);";`
`31`	`31`	`}).join("") +`
`32`		`- "}())"`
	`32`	`+ "}).call(this)"`
`33`	`33`	`];`
`34`	`34`	`}`
`35`	`35`	`}`