generate correct namespace objects

sokra · sokra · commit 9b58b7a70518 · 2017-06-07T12:56:53.000+02:00
fixes webpack#5020
diff --git a/lib/optimize/ConcatenatedModule.js b/lib/optimize/ConcatenatedModule.js
@@ -197,7 +197,8 @@ class ConcatenatedModule extends Module {
 				exportMap: exportMap,
 				reexportMap: reexportMap,
 				needCompatibilityFlag: false,
-				needNamespaceObject: false
+				needNamespaceObject: false,
+				namespaceObjectSource: null
 			};
 		});
 
@@ -282,6 +283,7 @@ class ConcatenatedModule extends Module {
 
 		modulesWithInfo.forEach(info => {
 			const namespaceObjectName = this.findNewName("namespaceObject", allUsedNames, null, info.module.readableIdentifier(requestShortener));
+			allUsedNames.add(namespaceObjectName);
 			info.internalNames.set(namespaceObjectName, namespaceObjectName);
 			info.exportMap.set(true, namespaceObjectName);
 			info.moduleScope.variables.forEach(variable => {
@@ -332,16 +334,26 @@ class ConcatenatedModule extends Module {
 		if(moduleToInfoMap.get(this.rootModule).needCompatibilityFlag) {
 			result.add(`Object.defineProperty(${this.rootModule.exportsArgument || "exports"}, "__esModule", { value: true });\n`);
 		}
+		let generated;
+		do {
+			generated = false;
+			modulesWithInfo.forEach(info => {
+				if(info.needNamespaceObject && !info.namespaceObjectSource) {
+					const name = info.exportMap.get(true);
+					const nsObj = [`var ${name} = {};`];
+					for(const exportName of info.module.providedExports) {
+						const finalName = getFinalName(info, exportName, moduleToInfoMap, requestShortener);
+						nsObj.push(`__webpack_require__.d(${name}, ${JSON.stringify(exportName)}, function() { return ${finalName}; });`);
+					}
+					info.namespaceObjectSource = nsObj.join("\n") + "\n";
+					generated = true;
+				}
+			});
+		} while(generated);
 		modulesWithInfo.forEach(info => {
 			result.add(`\n// CONCATENATED MODULE: ${info.module.readableIdentifier(requestShortener)}\n`);
-			if(info.needNamespaceObject) {
-				const name = info.exportMap.get(true);
-				const nsObj = [`var ${name} = {};`];
-				for(const exportName of info.module.providedExports) {
-					const finalName = getFinalName(info, exportName, moduleToInfoMap, requestShortener);
-					nsObj.push(`__webpack_require__.d(${name}, ${JSON.stringify(exportName)}, function() { return ${finalName}; });`);
-				}
-				result.add(nsObj.join("\n") + "\n");
+			if(info.namespaceObjectSource) {
+				result.add(info.namespaceObjectSource);
 			}
 			result.add(info.source);
 		});
diff --git a/test/cases/scope-hoisting/issue-5020-minimal/index.js b/test/cases/scope-hoisting/issue-5020-minimal/index.js
@@ -0,0 +1,11 @@
+var testData = require("./src/index.js");
+
+it("should export the correct values", function() {
+	testData.should.be.eql({
+		icon: {
+			svg: {
+				default: 1
+			}
+		}
+	});
+})
diff --git a/test/cases/scope-hoisting/issue-5020-minimal/src/icon/index.js b/test/cases/scope-hoisting/issue-5020-minimal/src/icon/index.js
@@ -0,0 +1,5 @@
+import * as svg from "./svg";
+
+export {
+    svg
+};
diff --git a/test/cases/scope-hoisting/issue-5020-minimal/src/icon/svg/index.js b/test/cases/scope-hoisting/issue-5020-minimal/src/icon/svg/index.js
@@ -0,0 +1 @@
+export default 1;
diff --git a/test/cases/scope-hoisting/issue-5020-minimal/src/icon/svg/svg1.js b/test/cases/scope-hoisting/issue-5020-minimal/src/icon/svg/svg1.js
@@ -0,0 +1 @@
+export const svg1 = 1;
diff --git a/test/cases/scope-hoisting/issue-5020-minimal/src/index.js b/test/cases/scope-hoisting/issue-5020-minimal/src/index.js
@@ -0,0 +1,5 @@
+import * as icon from "./icon";
+
+export {
+    icon
+}
diff --git a/test/cases/scope-hoisting/issue-5020/index.js b/test/cases/scope-hoisting/issue-5020/index.js
@@ -0,0 +1,26 @@
+var testData = require("./src/index.js");
+
+it("should export the correct values", function() {
+	testData.should.be.eql({
+		svg5: {
+			svg: {
+				clinical1: {
+					svg1: 1
+				},
+				clinical2: {
+					svg2: 2
+				}
+			}
+		},
+		svg6: {
+			svg: {
+				test: {
+					svg1: 10
+				},
+				clinical2: {
+					svg2: 20
+				}
+			}
+		}
+	});
+})
diff --git a/test/cases/scope-hoisting/issue-5020/src/icon/index.js b/test/cases/scope-hoisting/issue-5020/src/icon/index.js
@@ -0,0 +1,5 @@
+import * as svg from "./svg";
+
+export {
+    svg
+};
diff --git a/test/cases/scope-hoisting/issue-5020/src/icon/svg/index.js b/test/cases/scope-hoisting/issue-5020/src/icon/svg/index.js
@@ -0,0 +1,14 @@
+import { svg1 } from "./svg1";
+import { svg2 } from "./svg2";
+
+const clinical1 = {
+    svg1
+};
+const clinical2 = {
+    svg2
+};
+
+export {
+    clinical1,
+    clinical2
+};
diff --git a/test/cases/scope-hoisting/issue-5020/src/icon/svg/svg1.js b/test/cases/scope-hoisting/issue-5020/src/icon/svg/svg1.js
@@ -0,0 +1 @@
+export const svg1 = 1;
diff --git a/test/cases/scope-hoisting/issue-5020/src/icon/svg/svg2.js b/test/cases/scope-hoisting/issue-5020/src/icon/svg/svg2.js
@@ -0,0 +1 @@
+export const svg2 = 2;
diff --git a/test/cases/scope-hoisting/issue-5020/src/icon1/index.js b/test/cases/scope-hoisting/issue-5020/src/icon1/index.js
@@ -0,0 +1,5 @@
+import * as svg from "./svg";
+
+export {
+    svg
+};
diff --git a/test/cases/scope-hoisting/issue-5020/src/icon1/svg/index.js b/test/cases/scope-hoisting/issue-5020/src/icon1/svg/index.js
@@ -0,0 +1,14 @@
+import { svg1 } from "./svg1";
+import { svg2 } from "./svg2";
+
+const test = {
+    svg1
+};
+const clinical2 = {
+    svg2
+};
+
+export {
+    test,
+    clinical2
+};
diff --git a/test/cases/scope-hoisting/issue-5020/src/icon1/svg/svg1.js b/test/cases/scope-hoisting/issue-5020/src/icon1/svg/svg1.js
@@ -0,0 +1 @@
+export const svg1 = 10;
diff --git a/test/cases/scope-hoisting/issue-5020/src/icon1/svg/svg2.js b/test/cases/scope-hoisting/issue-5020/src/icon1/svg/svg2.js
@@ -0,0 +1 @@
+export const svg2 = 20;
diff --git a/test/cases/scope-hoisting/issue-5020/src/index.js b/test/cases/scope-hoisting/issue-5020/src/index.js
@@ -0,0 +1,7 @@
+import * as svg5 from "./icon";
+import * as svg6 from "./icon1";
+
+export {
+    svg5,
+    svg6
+}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +import * as svg from "./svg";
++
 +export {
 +    svg
 +};