fixes webpack#5096

sokra · sokra · commit 0b8023a10676 · 2017-08-08T08:15:18.000+02:00
diff --git a/lib/optimize/ModuleConcatenationPlugin.js b/lib/optimize/ModuleConcatenationPlugin.js
@@ -61,6 +61,12 @@ class ModuleConcatenationPlugin {
 						continue;
 					}
 
+					// Using dependency variables is not possible as this wraps the code in a function
+					if(module.variables.length > 0) {
+						setBailoutReason(module, `Module uses injected variables (${module.variables.map(v => v.name).join(", ")})`);
+						continue;
+					}
+
 					relevantModules.push(module);
 
 					// Module must not be the entry points
@@ -69,12 +75,6 @@ class ModuleConcatenationPlugin {
 						continue;
 					}
 
-					// Using dependency variables is not possible as this wraps the code in a function
-					if(module.variables.length > 0) {
-						setBailoutReason(module, "Module uses injected variables (usually caused by the ProvidePlugin)");
-						continue;
-					}
-
 					// Module must only be used by Harmony Imports
 					const nonHarmonyReasons = module.reasons.filter(reason => !(reason.dependency instanceof HarmonyImportDependency));
 					if(nonHarmonyReasons.length > 0) {
diff --git a/test/cases/scope-hoisting/issue-5096/b.js b/test/cases/scope-hoisting/issue-5096/b.js
@@ -0,0 +1,3 @@
+import { a } from './index';
+
+export const b = a();
diff --git a/test/cases/scope-hoisting/issue-5096/index.js b/test/cases/scope-hoisting/issue-5096/index.js
@@ -0,0 +1,13 @@
+import { b } from './b';
+
+export function a() {
+	return "a";
+};
+
+// Inject a variable
+if(Math.random() < -1)
+	console.log(module);
+
+it("should compile fine", function() {
+	b.should.be.eql("a");
+});

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import { a } from './index';`
	`2`	`+`
	`3`	`+export const b = a();`