Merge pull request #4927 from webpack/bugfix/require-ensure-var-inject

fix variable injection in require.ensure
webpack · May 25, 2017 · 5ec15f8 · 5ec15f8
2 parents 0dd0830 + da08b89
commit 5ec15f8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/lib/dependencies/RequireEnsureDependenciesBlock.js b/lib/dependencies/RequireEnsureDependenciesBlock.js
@@ -11,14 +11,8 @@ module.exports = class RequireEnsureDependenciesBlock extends AsyncDependenciesB
 		super(chunkName, module, loc);
 		this.expr = expr;
 		const successBodyRange = successExpression && successExpression.body && successExpression.body.range;
-		const errorBodyRange = errorExpression && errorExpression.body && errorExpression.body.range;
-		this.range = null;
 		if(successBodyRange) {
-			if(errorBodyRange) {
-				this.range = [successBodyRange[0] + 1, errorBodyRange[1] - 1];
-			} else {
-				this.range = [successBodyRange[0] + 1, successBodyRange[1] - 1];
-			}
+			this.range = [successBodyRange[0] + 1, successBodyRange[1] - 1];
 		}
 		this.chunkNameRange = chunkNameRange;
 		const dep = new RequireEnsureDependency(this);

diff --git a/test/cases/chunks/var-inject-error-handler/empty.js b/test/cases/chunks/var-inject-error-handler/empty.js
diff --git a/test/cases/chunks/var-inject-error-handler/index.js b/test/cases/chunks/var-inject-error-handler/index.js
@@ -0,0 +1,7 @@
+it("should handle var injection in require.ensure with error callback", function(done) {
+	require.ensure([], function(require) {
+		require("./empty");
+		var x = module.x;
+		done();
+	}, function(error) {}, "chunk-with-var-inject");
+});