fix conflict handling

sokra · sokra · commit 8835751cb39c · 2017-08-07T15:43:17.000+02:00
remove unused code
diff --git a/lib/optimize/ConcatenatedModule.js b/lib/optimize/ConcatenatedModule.js
@@ -313,33 +313,30 @@ class ConcatenatedModule extends Module {
 							} else if(dep instanceof HarmonyExportImportedSpecifierDependency) {
 								const exportName = dep.name;
 								const importName = dep.id;
-								const importModule = dep.importDependency.module;
-								const innerReexport = modulesSet.has(importModule);
+								const importedModule = dep.importDependency.module;
 								if(exportName && importName) {
 									reexportMap.set(exportName, {
-										module: importModule,
+										module: importedModule,
 										exportName: importName,
 										dependency: dep
 									});
 								} else if(exportName) {
 									reexportMap.set(exportName, {
-										module: importModule,
+										module: importedModule,
 										exportName: true,
 										dependency: dep
 									});
-								} else if(Array.isArray(importModule.providedExports)) {
+								} else {
 									var activeExports = new Set(HarmonyModulesHelpers.getActiveExports(dep.originModule, dep));
-									importModule.providedExports.forEach(name => {
+									importedModule.providedExports.forEach(name => {
 										if(activeExports.has(name) || name === "default")
 											return;
 										reexportMap.set(name, {
-											module: importModule,
+											module: importedModule,
 											exportName: name,
 											dependency: dep
 										});
 									});
-								} else if(innerReexport) {
-									throw new Error(`Module "${importModule.readableIdentifier(requestShortener)}" doesn't provide static exports for "export *" in ${info.module.readableIdentifier(requestShortener)}`);
 								}
 							}
 						});
@@ -449,6 +446,8 @@ class ConcatenatedModule extends Module {
 
 		// List of all used names to avoid conflicts
 		const allUsedNames = new Set([
+			"__WEBPACK_MODULE_DEFAULT_EXPORT__", // avoid using this internal name
+
 			"abstract", "arguments", "await", "boolean", "break", "byte", "case", "catch", "char", "class",
 			"const", "continue", "debugger", "default", "delete", "do", "double", "else", "enum", "eval",
 			"export", "extends", "false", "final", "finally", "float", "for", "function", "goto", "if",
@@ -606,7 +605,7 @@ class ConcatenatedModule extends Module {
 			name = "";
 
 		// Remove uncool stuff
-		extraInfo = extraInfo.replace(/(\/index)?\.([a-zA-Z0-9]{1,4})$/, "");
+		extraInfo = extraInfo.replace(/\.+\/|(\/index)?\.([a-zA-Z0-9]{1,4})$/g, "");
 
 		const splittedInfo = extraInfo.split("/");
 		while(splittedInfo.length) {
@@ -615,8 +614,12 @@ class ConcatenatedModule extends Module {
 			if(!usedNamed1.has(nameIdent) && (!usedNamed2 || !usedNamed2.has(nameIdent))) return nameIdent;
 		}
 
-		while(usedNamed1.has(name = name + "_") || (usedNamed2 && usedNamed2.has(name))) { /* do nothing */ }
-		return name;
+		let i = 0, nameWithNumber;
+		do {
+			i++;
+			nameWithNumber = Template.toIdentifier(`${name}_${i}`);
+		} while(usedNamed1.has(nameWithNumber) || (usedNamed2 && usedNamed2.has(nameWithNumber)));
+		return nameWithNumber;
 	}
 
 	updateHash(hash) {
diff --git a/test/cases/scope-hoisting/name-conflicts/index.js b/test/cases/scope-hoisting/name-conflicts/index.js
@@ -0,0 +1,15 @@
+import value1 from "./module?(";
+import value2 from "./module?)";
+import value3 from "./module?[";
+import value4 from "./module?]";
+import value5 from "./module?{";
+import value6 from "./module?}";
+
+it("should not break on name conflicts", function() {
+	value1.should.be.eql("a");
+	value2.should.be.eql("a");
+	value3.should.be.eql("a");
+	value4.should.be.eql("a");
+	value5.should.be.eql("a");
+	value6.should.be.eql("a");
+});
diff --git a/test/cases/scope-hoisting/name-conflicts/module.js b/test/cases/scope-hoisting/name-conflicts/module.js
@@ -0,0 +1 @@
+export default "a";
