Merge pull request #11620 from webpack/bugfix/11617

sokra · web-flow · commit 3e42105df793 · 2020-10-10T02:29:14.000+02:00
skip connections copied to concatenated module
diff --git a/lib/optimize/ConcatenatedModule.js b/lib/optimize/ConcatenatedModule.js
@@ -795,6 +795,7 @@ class ConcatenatedModule extends Module {
 						return false;
 					return (
 						connection &&
+						connection.resolvedOriginModule === module &&
 						connection.module &&
 						connection.isTargetActive(runtime)
 					);
diff --git a/test/cases/scope-hoisting/import-order-11617/a.js b/test/cases/scope-hoisting/import-order-11617/a.js
@@ -0,0 +1,6 @@
+import "./b";
+import "./c";
+
+import { track } from "./tracker";
+
+track("a");
diff --git a/test/cases/scope-hoisting/import-order-11617/b.js b/test/cases/scope-hoisting/import-order-11617/b.js
@@ -0,0 +1,5 @@
+import "./x";
+
+import { track } from "./tracker";
+
+track("b");
diff --git a/test/cases/scope-hoisting/import-order-11617/c.js b/test/cases/scope-hoisting/import-order-11617/c.js
@@ -0,0 +1,3 @@
+var track = require("./tracker").track;
+
+track("c");
diff --git a/test/cases/scope-hoisting/import-order-11617/index.js b/test/cases/scope-hoisting/import-order-11617/index.js
@@ -0,0 +1,8 @@
+import "./x";
+import "./y";
+import "./a";
+import { log } from "./tracker";
+
+it("should evaluate import in the correct order", function () {
+	expect(log).toEqual(["b", "c", "a"]);
+});
diff --git a/test/cases/scope-hoisting/import-order-11617/tracker.js b/test/cases/scope-hoisting/import-order-11617/tracker.js
@@ -0,0 +1,5 @@
+export var log = [];
+
+export function track(name) {
+	log.push(name);
+}
diff --git a/test/cases/scope-hoisting/import-order-11617/x.js b/test/cases/scope-hoisting/import-order-11617/x.js
@@ -0,0 +1 @@
+console.log.bind(console);
diff --git a/test/cases/scope-hoisting/import-order-11617/y.js b/test/cases/scope-hoisting/import-order-11617/y.js
@@ -0,0 +1 @@
+console.log.bind(console);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+var track = require("./tracker").track;`
	`2`	`+`
	`3`	`+track("c");`