webpack 3.3.0 → 3.5.1

package/lib/optimize/ConcatenatedModule.js

@@ -19,39 +19,74 @@ const HarmonyExportImportedSpecifierDependency = require("../dependencies/Harmon
 const HarmonyCompatibilityDependency = require("../dependencies/HarmonyCompatibilityDependency");
 const HarmonyModulesHelpers = require("../dependencies/HarmonyModulesHelpers");
 
-function getFinalName(info, exportName, moduleToInfoMap, requestShortener) {
-	const directExport = info.exportMap.get(exportName);
-	if(directExport) {
-		if(exportName === true)
-			info.needNamespaceObject = true;
-		const name = info.internalNames.get(directExport);
-		if(!name)
-			throw new Error(`The export "${directExport}" in "${info.module.readableIdentifier(requestShortener)}" has no internal name`);
-		return name;
-	}
-	const reexport = info.reexportMap.get(exportName);
-	if(reexport) {
-		const refInfo = moduleToInfoMap.get(reexport.module);
-		if(refInfo) {
-			// module is in the concatenation
-			return getFinalName(refInfo, reexport.exportName, moduleToInfoMap, requestShortener);
-		} else {
-			const dep = reexport.dependency;
-			const importedModule = reexport.module;
-			const exportName = reexport.exportName;
-			const isHarmonyModule = importedModule && (!importedModule.meta || importedModule.meta.harmonyModule);
-			const importedVar = dep.importedVar;
-			const used = importedModule.isUsed(exportName);
-			if(!used) return "/* unused reexport */undefined";
-			if(!isHarmonyModule && exportName === "default") {
-				return `${importedVar}_default.a`;
-			}
-			return `${importedVar}[${JSON.stringify(used)}]`;
+function ensureNsObjSource(info, moduleToInfoMap, requestShortener) {
+	if(!info.hasNamespaceObject) {
+		info.hasNamespaceObject = true;
+		const name = info.exportMap.get(true);
+		const nsObj = [`var ${name} = {};`];
+		for(const exportName of info.module.providedExports) {
+			const finalName = getFinalName(info, exportName, moduleToInfoMap, requestShortener, false);
+			nsObj.push(`__webpack_require__.d(${name}, ${JSON.stringify(exportName)}, function() { return ${finalName}; });`);
 		}
+		info.namespaceObjectSource = nsObj.join("\n") + "\n";
+	}
+}
+
+function getExternalImport(importedModule, importedVar, exportName, asCall) {
+	const isHarmonyModule = importedModule && (!importedModule.meta || importedModule.meta.harmonyModule);
+	if(exportName === true) return importedVar;
+	const used = importedModule.isUsed(exportName);
+	if(!used) return "/* unused reexport */undefined";
+	if(!isHarmonyModule && exportName === "default") {
+		return asCall ? `${importedVar}_default()` : `${importedVar}_default.a`;
+	}
+	// TODO use Template.toNormalComment when merging with pure-module
+	const comment = used !== exportName ? ` /* ${exportName} */` : "";
+	const reference = `${importedVar}[${JSON.stringify(used)}${comment}]`;
+	if(asCall)
+		return `Object(${reference})`;
+	return reference;
+}
+
+function getFinalName(info, exportName, moduleToInfoMap, requestShortener, asCall) {
+	switch(info.type) {
+		case "concatenated":
+			{
+				const directExport = info.exportMap.get(exportName);
+				if(directExport) {
+					if(exportName === true)
+						ensureNsObjSource(info, moduleToInfoMap, requestShortener);
+					const name = info.internalNames.get(directExport);
+					if(!name)
+						throw new Error(`The export "${directExport}" in "${info.module.readableIdentifier(requestShortener)}" has no internal name`);
+					return name;
+				}
+				const reexport = info.reexportMap.get(exportName);
+				if(reexport) {
+					const refInfo = moduleToInfoMap.get(reexport.module);
+					if(refInfo) {
+						// module is in the concatenation
+						return getFinalName(refInfo, reexport.exportName, moduleToInfoMap, requestShortener, asCall);
+					} else {
+						const dep = reexport.dependency;
+						const importedModule = reexport.module;
+						const exportName = reexport.exportName;
+						const importedVar = dep.importedVar;
+						return getExternalImport(importedModule, importedVar, exportName, asCall);
+					}
+				}
+				const problem = `Cannot get final name for export "${exportName}" in "${info.module.readableIdentifier(requestShortener)}"` +
+					` (known exports: ${Array.from(info.exportMap.keys()).filter(name => name !== true).join(" ")}, ` +
+					`known reexports: ${Array.from(info.reexportMap.keys()).join(" ")})`;
+				// TODO use Template.toNormalComment when merging with pure-module
+				return `/* ${problem} */ undefined`;
+			}
+		case "external":
+			{
+				const importedModule = info.module;
+				return getExternalImport(importedModule, info.name, exportName, asCall);
+			}
 	}
-	throw new Error(`Cannot get final name for export "${exportName}" in "${info.module.readableIdentifier(requestShortener)}"` +
-		` (known exports: ${Array.from(info.exportMap.keys()).join(" ")}, ` +
-		`known reexports: ${Array.from(info.reexportMap.keys()).join(" ")})`);
 }
 
 function getSymbolsFromScope(s, untilScope) {
@@ -134,7 +169,6 @@ class ConcatenatedModule extends Module {
 		super();
 		super.setChunks(rootModule._chunks);
 		this.rootModule = rootModule;
-		this.modules = modules;
 		this.usedExports = rootModule.usedExports;
 		this.providedExports = rootModule.providedExports;
 		this.optimizationBailout = rootModule.optimizationBailout;
@@ -150,6 +184,7 @@ class ConcatenatedModule extends Module {
 		this.moduleArgument = rootModule.moduleArgument;
 		this.exportsArgument = rootModule.exportsArgument;
 		this.strict = true;
+		this._numberOfConcatenatedModules = modules.length;
 
 		this.dependencies = [];
 		this.dependenciesWarnings = [];
@@ -159,33 +194,38 @@ class ConcatenatedModule extends Module {
 		this.warnings = [];
 		this.errors = [];
 		this.assets = {};
-		for(const m of modules) {
-			// populate dependencies
-			m.dependencies.filter(dep => !modulesSet.has(dep.module))
-				.forEach(d => this.dependencies.push(d));
-			// populate dep warning
-			m.dependenciesWarnings.forEach(depWarning => this.dependenciesWarnings.push(depWarning));
-			// populate dep errors
-			m.dependenciesErrors.forEach(depError => this.dependenciesErrors.push(depError));
-			// populate file dependencies
-			if(m.fileDependencies) m.fileDependencies.forEach(file => this.fileDependencies.push(file));
-			// populate context dependencies
-			if(m.contextDependencies) m.contextDependencies.forEach(context => this.contextDependencies.push(context));
-			// populate warnings
-			m.warnings.forEach(warning => this.warnings.push(warning));
-			// populate errors
-			m.errors.forEach(error => this.errors.push(error));
-
-			Object.assign(this.assets, m.assets);
+		this._orderedConcatenationList = this._createOrderedConcatenationList(rootModule, modulesSet);
+		for(const info of this._orderedConcatenationList) {
+			if(info.type === "concatenated") {
+				const m = info.module;
+
+				// populate dependencies
+				m.dependencies.filter(dep => !modulesSet.has(dep.module))
+					.forEach(d => this.dependencies.push(d));
+				// populate dep warning
+				m.dependenciesWarnings.forEach(depWarning => this.dependenciesWarnings.push(depWarning));
+				// populate dep errors
+				m.dependenciesErrors.forEach(depError => this.dependenciesErrors.push(depError));
+				// populate file dependencies
+				if(m.fileDependencies) m.fileDependencies.forEach(file => this.fileDependencies.push(file));
+				// populate context dependencies
+				if(m.contextDependencies) m.contextDependencies.forEach(context => this.contextDependencies.push(context));
+				// populate warnings
+				m.warnings.forEach(warning => this.warnings.push(warning));
+				// populate errors
+				m.errors.forEach(error => this.errors.push(error));
+
+				Object.assign(this.assets, m.assets);
+			}
 		}
 	}
 
 	identifier() {
-		return this.modules.map(m => m.identifier()).join(" ");
+		return this._orderedConcatenationList.map(info => info.module.identifier()).join(" ");
 	}
 
 	readableIdentifier(requestShortener) {
-		return this.rootModule.readableIdentifier(requestShortener) + ` + ${this.modules.length - 1} modules`;
+		return this.rootModule.readableIdentifier(requestShortener) + ` + ${this._numberOfConcatenatedModules - 1} modules`;
 	}
 
 	libIdent(options) {
@@ -202,69 +242,127 @@ class ConcatenatedModule extends Module {
 
 	size() {
 		// Guess size from embedded modules
-		return this.modules.reduce((sum, m) => sum + m.size(), 0);
+		return this._orderedConcatenationList.reduce((sum, info) => {
+			switch(info.type) {
+				case "concatenated":
+					return sum + info.module.size();
+				case "external":
+					return sum + 5;
+			}
+			return sum;
+		}, 0);
 	}
 
-	source(dependencyTemplates, outputOptions, requestShortener) {
-		const modulesSet = new Set();
-		this.modules.forEach(m => modulesSet.add(m));
+	_createOrderedConcatenationList(rootModule, modulesSet) {
+		const list = [];
+		const set = new Set();
+
+		function getConcatenatedImports(module) {
+			// TODO need changes when merging with the pure-module branch
+			const allDeps = module.dependencies
+				.filter(dep => dep instanceof HarmonyImportDependency && dep.module);
+
+			return allDeps.map(dep => () => dep.module);
+		}
 
+		function enterModule(getModule) {
+			const module = getModule();
+			if(set.has(module)) return;
+			set.add(module);
+			if(modulesSet.has(module)) {
+				const imports = getConcatenatedImports(module);
+				imports.forEach(enterModule);
+				list.push({
+					type: "concatenated",
+					module
+				});
+			} else {
+				list.push({
+					type: "external",
+					get module() {
+						// We need to use a getter here, because the module in the dependency
+						// could be replaced by some other process (i. e. also replaced with a
+						// concatenated module)
+						return getModule();
+					}
+				});
+			}
+		}
+
+		enterModule(() => rootModule);
+
+		return list;
+	}
+
+	source(dependencyTemplates, outputOptions, requestShortener) {
 		// Metainfo for each module
-		const modulesWithInfo = this.modules.map((m, idx) => {
-			const exportMap = new Map();
-			const reexportMap = new Map();
-			m.dependencies.forEach(dep => {
-				if(dep instanceof HarmonyExportSpecifierDependency) {
-					exportMap.set(dep.name, dep.id);
-				} else if(dep instanceof HarmonyExportExpressionDependency) {
-					exportMap.set("default", "__WEBPACK_MODULE_DEFAULT_EXPORT__");
-				} else if(dep instanceof HarmonyExportImportedSpecifierDependency) {
-					const exportName = dep.name;
-					const importName = dep.id;
-					const importModule = dep.importDependency.module;
-					const innerReexport = modulesSet.has(importModule);
-					if(exportName && importName) {
-						reexportMap.set(exportName, {
-							module: importModule,
-							exportName: importName,
-							dependency: dep
-						});
-					} else if(exportName) {
-						reexportMap.set(exportName, {
-							module: importModule,
-							exportName: true,
-							dependency: dep
-						});
-					} else if(Array.isArray(importModule.providedExports)) {
-						var activeExports = new Set(HarmonyModulesHelpers.getActiveExports(dep.originModule, dep));
-						importModule.providedExports.forEach(name => {
-							if(activeExports.has(name) || name === "default")
-								return;
-							reexportMap.set(name, {
-								module: importModule,
-								exportName: name,
-								dependency: dep
-							});
+		const modulesWithInfo = this._orderedConcatenationList.map((info, idx) => {
+			switch(info.type) {
+				case "concatenated":
+					{
+						const exportMap = new Map();
+						const reexportMap = new Map();
+						info.module.dependencies.forEach(dep => {
+							if(dep instanceof HarmonyExportSpecifierDependency) {
+								exportMap.set(dep.name, dep.id);
+							} else if(dep instanceof HarmonyExportExpressionDependency) {
+								exportMap.set("default", "__WEBPACK_MODULE_DEFAULT_EXPORT__");
+							} else if(dep instanceof HarmonyExportImportedSpecifierDependency) {
+								const exportName = dep.name;
+								const importName = dep.id;
+								const importedModule = dep.importDependency.module;
+								if(exportName && importName) {
+									reexportMap.set(exportName, {
+										module: importedModule,
+										exportName: importName,
+										dependency: dep
+									});
+								} else if(exportName) {
+									reexportMap.set(exportName, {
+										module: importedModule,
+										exportName: true,
+										dependency: dep
+									});
+								} else {
+									var activeExports = new Set(HarmonyModulesHelpers.getActiveExports(dep.originModule, dep));
+									importedModule.providedExports.forEach(name => {
+										if(activeExports.has(name) || name === "default")
+											return;
+										reexportMap.set(name, {
+											module: importedModule,
+											exportName: name,
+											dependency: dep
+										});
+									});
+								}
+							}
 						});
-					} else if(innerReexport) {
-						throw new Error(`Module "${importModule.readableIdentifier(requestShortener)}" doesn't provide static exports for "export *" in ${m.readableIdentifier(requestShortener)}`);
+						return {
+							type: "concatenated",
+							module: info.module,
+							index: idx,
+							ast: undefined,
+							source: undefined,
+							globalScope: undefined,
+							moduleScope: undefined,
+							internalNames: new Map(),
+							exportMap: exportMap,
+							reexportMap: reexportMap,
+							needCompatibilityFlag: false,
+							hasNamespaceObject: false,
+							namespaceObjectSource: null
+						};
 					}
-				}
-			});
-			return {
-				module: m,
-				index: idx,
-				ast: undefined,
-				source: undefined,
-				globalScope: undefined,
-				moduleScope: undefined,
-				internalNames: new Map(),
-				exportMap: exportMap,
-				reexportMap: reexportMap,
-				needCompatibilityFlag: false,
-				needNamespaceObject: false,
-				namespaceObjectSource: null
-			};
+				case "external":
+					return {
+						type: "external",
+						module: info.module,
+						index: idx,
+						name: undefined
+					};
+				default:
+					throw new Error(`Unsupported concatenation entry type ${info.type}`);
+			}
 		});
 
 		// Create mapping from module to info
@@ -306,127 +404,192 @@ class ConcatenatedModule extends Module {
 		// Generate source code and analyse scopes
 		// Prepare a ReplaceSource for the final source
 		modulesWithInfo.forEach(info => {
-			const m = info.module;
-			const source = m.source(innerDependencyTemplates, outputOptions, requestShortener);
-			const code = source.source();
-			const ast = acorn.parse(code, {
-				ranges: true,
-				locations: true,
-				ecmaVersion: Parser.ECMA_VERSION,
-				sourceType: "module"
-			});
-			const scopeManager = escope.analyze(ast, {
-				ecmaVersion: 6,
-				sourceType: "module",
-				optimistic: true,
-				ignoreEval: true,
-				impliedStrict: true
-			});
-			const globalScope = scopeManager.acquire(ast);
-			const moduleScope = globalScope.childScopes[0];
-			const resultSource = new ReplaceSource(source);
-			info.ast = ast;
-			info.source = resultSource;
-			info.globalScope = globalScope;
-			info.moduleScope = moduleScope;
+			if(info.type === "concatenated") {
+				const m = info.module;
+				const source = m.source(innerDependencyTemplates, outputOptions, requestShortener);
+				const code = source.source();
+				let ast;
+				try {
+					ast = acorn.parse(code, {
+						ranges: true,
+						locations: true,
+						ecmaVersion: Parser.ECMA_VERSION,
+						sourceType: "module"
+					});
+				} catch(err) {
+					if(err.loc && typeof err.loc === "object" && typeof err.loc.line === "number") {
+						const lineNumber = err.loc.line;
+						const lines = code.split("\n");
+						err.message += "\n| " + lines.slice(Math.max(0, lineNumber - 3), lineNumber + 2).join("\n| ");
+					}
+					throw err;
+				}
+				const scopeManager = escope.analyze(ast, {
+					ecmaVersion: 6,
+					sourceType: "module",
+					optimistic: true,
+					ignoreEval: true,
+					impliedStrict: true
+				});
+				const globalScope = scopeManager.acquire(ast);
+				const moduleScope = globalScope.childScopes[0];
+				const resultSource = new ReplaceSource(source);
+				info.ast = ast;
+				info.source = resultSource;
+				info.globalScope = globalScope;
+				info.moduleScope = moduleScope;
+			}
 		});
 
 		// List of all used names to avoid conflicts
-		const allUsedNames = new Set(["__WEBPACK_MODULE_DEFAULT_EXPORT__", "defaultExport", "Object"]);
+		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",
+			"implements", "import", "in", "instanceof", "int", "interface", "let", "long", "native", "new",
+			"null", "package", "private", "protected", "public", "return", "short", "static", "super",
+			"switch", "synchronized", "this", "throw", "throws", "transient", "true", "try", "typeof",
+			"var", "void", "volatile", "while", "with", "yield",
+
+			"Array", "Date", "eval", "function", "hasOwnProperty", "Infinity", "isFinite", "isNaN",
+			"isPrototypeOf", "length", "Math", "NaN", "name", "Number", "Object", "prototype", "String",
+			"toString", "undefined", "valueOf",
+
+			"alert", "all", "anchor", "anchors", "area", "assign", "blur", "button", "checkbox",
+			"clearInterval", "clearTimeout", "clientInformation", "close", "closed", "confirm", "constructor",
+			"crypto", "decodeURI", "decodeURIComponent", "defaultStatus", "document", "element", "elements",
+			"embed", "embeds", "encodeURI", "encodeURIComponent", "escape", "event", "fileUpload", "focus",
+			"form", "forms", "frame", "innerHeight", "innerWidth", "layer", "layers", "link", "location",
+			"mimeTypes", "navigate", "navigator", "frames", "frameRate", "hidden", "history", "image",
+			"images", "offscreenBuffering", "open", "opener", "option", "outerHeight", "outerWidth",
+			"packages", "pageXOffset", "pageYOffset", "parent", "parseFloat", "parseInt", "password", "pkcs11",
+			"plugin", "prompt", "propertyIsEnum", "radio", "reset", "screenX", "screenY", "scroll", "secure",
+			"select", "self", "setInterval", "setTimeout", "status", "submit", "taint", "text", "textarea",
+			"top", "unescape", "untaint", "window",
+
+			"onblur", "onclick", "onerror", "onfocus", "onkeydown", "onkeypress", "onkeyup", "onmouseover",
+			"onload", "onmouseup", "onmousedown", "onsubmit"
+		]);
 
 		// get all global names
 		modulesWithInfo.forEach(info => {
-			info.globalScope.through.forEach(reference => {
-				const name = reference.identifier.name;
-				if(/^__WEBPACK_MODULE_REFERENCE__\d+_(\d+|ns)__$/.test(name)) {
-					for(const s of getSymbolsFromScope(reference.from, info.moduleScope)) {
-						allUsedNames.add(s);
+			if(info.globalScope) {
+				info.globalScope.through.forEach(reference => {
+					const name = reference.identifier.name;
+					if(/^__WEBPACK_MODULE_REFERENCE__\d+_([\da-f]+|ns)(_call)?__$/.test(name)) {
+						for(const s of getSymbolsFromScope(reference.from, info.moduleScope)) {
+							allUsedNames.add(s);
+						}
+					} else {
+						allUsedNames.add(name);
 					}
-				} else {
-					allUsedNames.add(name);
-				}
-			});
+				});
+			}
 		});
 
+		// generate names for symbols
 		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 => {
-				const name = variable.name;
-				if(allUsedNames.has(name)) {
-					const references = getAllReferences(variable);
-					const symbolsInReferences = references.map(ref => getSymbolsFromScope(ref.from, info.moduleScope)).reduce(reduceSet, new Set());
-					const newName = this.findNewName(name, allUsedNames, symbolsInReferences, info.module.readableIdentifier(requestShortener));
-					allUsedNames.add(newName);
-					info.internalNames.set(name, newName);
-					const source = info.source;
-					const allIdentifiers = new Set(references.map(r => r.identifier).concat(variable.identifiers));
-					for(const identifier of allIdentifiers) {
-						const r = identifier.range;
-						const path = getPathInAst(info.ast, identifier);
-						if(path && path.length > 1 && path[1].type === "Property" && path[1].shorthand) {
-							source.insert(r[1], `: ${newName}`);
-						} else {
-							source.replace(r[0], r[1] - 1, newName);
-						}
+			switch(info.type) {
+				case "concatenated":
+					{
+						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 => {
+							const name = variable.name;
+							if(allUsedNames.has(name)) {
+								const references = getAllReferences(variable);
+								const symbolsInReferences = references.map(ref => getSymbolsFromScope(ref.from, info.moduleScope)).reduce(reduceSet, new Set());
+								const newName = this.findNewName(name, allUsedNames, symbolsInReferences, info.module.readableIdentifier(requestShortener));
+								allUsedNames.add(newName);
+								info.internalNames.set(name, newName);
+								const source = info.source;
+								const allIdentifiers = new Set(references.map(r => r.identifier).concat(variable.identifiers));
+								for(const identifier of allIdentifiers) {
+									const r = identifier.range;
+									const path = getPathInAst(info.ast, identifier);
+									if(path && path.length > 1 && path[1].type === "Property" && path[1].shorthand) {
+										source.insert(r[1], `: ${newName}`);
+									} else {
+										source.replace(r[0], r[1] - 1, newName);
+									}
+								}
+							} else {
+								allUsedNames.add(name);
+								info.internalNames.set(name, name);
+							}
+						});
+						break;
 					}
-				} else {
-					allUsedNames.add(name);
-					info.internalNames.set(name, name);
-				}
-			});
+				case "external":
+					{
+						const externalName = this.findNewName("", allUsedNames, null, info.module.readableIdentifier(requestShortener));
+						allUsedNames.add(externalName);
+						info.name = externalName;
+						break;
+					}
+			}
 		});
 
+		// Find and replace referenced to modules
 		modulesWithInfo.forEach(info => {
-			info.globalScope.through.forEach(reference => {
-				const name = reference.identifier.name;
-				const match = /^__WEBPACK_MODULE_REFERENCE__(\d+)_(\d+|ns)__$/.exec(name);
-				if(match) {
-					const referencedModule = modulesWithInfo[+match[1]];
-					let exportName;
-					if(match[2] === "ns") {
-						exportName = true;
-					} else {
-						const exportIdx = +match[2];
-						exportName = referencedModule.module.providedExports[exportIdx];
+			if(info.type === "concatenated") {
+				info.globalScope.through.forEach(reference => {
+					const name = reference.identifier.name;
+					const match = /^__WEBPACK_MODULE_REFERENCE__(\d+)_([\da-f]+|ns)(_call)?__$/.exec(name);
+					if(match) {
+						const referencedModule = modulesWithInfo[+match[1]];
+						let exportName;
+						if(match[2] === "ns") {
+							exportName = true;
+						} else {
+							const exportData = match[2];
+							exportName = new Buffer(exportData, "hex").toString("utf-8"); // eslint-disable-line node/no-deprecated-api
+						}
+						const asCall = !!match[3];
+						const finalName = getFinalName(referencedModule, exportName, moduleToInfoMap, requestShortener, asCall);
+						const r = reference.identifier.range;
+						const source = info.source;
+						source.replace(r[0], r[1] - 1, finalName);
 					}
-					const finalName = getFinalName(referencedModule, exportName, moduleToInfoMap, requestShortener);
-					const r = reference.identifier.range;
-					const source = info.source;
-					source.replace(r[0], r[1] - 1, finalName);
-				}
-			});
+				});
+			}
 		});
 
 		const result = new ConcatSource();
+
+		// add harmony compatibility flag (must be first because of possible circular dependencies)
 		if(moduleToInfoMap.get(this.rootModule).needCompatibilityFlag) {
-			result.add(`Object.defineProperty(${this.rootModule.exportsArgument || "exports"}, "__esModule", { value: true });\n`);
-		}
-		let generated = true;
-		const ensureNsObjSource = 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) {
-			generated = false;
-			modulesWithInfo.forEach(ensureNsObjSource);
+			result.add(`Object.defineProperty(${this.exportsArgument || "exports"}, "__esModule", { value: true });\n`);
 		}
+
+		// define required namespace objects (must be before evaluation modules)
 		modulesWithInfo.forEach(info => {
-			result.add(`\n// CONCATENATED MODULE: ${info.module.readableIdentifier(requestShortener)}\n`);
 			if(info.namespaceObjectSource) {
 				result.add(info.namespaceObjectSource);
 			}
-			result.add(info.source);
+		});
+
+		// evaluate modules in order
+		modulesWithInfo.forEach(info => {
+			switch(info.type) {
+				case "concatenated":
+					result.add(`\n// CONCATENATED MODULE: ${info.module.readableIdentifier(requestShortener)}\n`);
+					result.add(info.source);
+					break;
+				case "external":
+					result.add(`\n// EXTERNAL MODULE: ${info.module.readableIdentifier(requestShortener)}\n`);
+					result.add(`var ${info.name} = __webpack_require__(${JSON.stringify(info.module.id)});\n`);
+					if(info.module.meta && !info.module.meta.harmonyModule) {
+						result.add(`var ${info.name}_default = /*#__PURE__*/__webpack_require__.n(${info.name});\n`);
+					}
+					break;
+				default:
+					throw new Error(`Unsupported concatenation entry type ${info.type}`);
+			}
 		});
 
 		return result;
@@ -436,25 +599,37 @@ class ConcatenatedModule extends Module {
 		let name = oldName;
 
 		if(name === "__WEBPACK_MODULE_DEFAULT_EXPORT__")
-			name = "defaultExport";
+			name = "";
 
 		// Remove uncool stuff
-		extraInfo = extraInfo.replace(/(\/index)?\.([a-zA-Z0-9]{1,4})$/, "");
+		extraInfo = extraInfo.replace(/\.+\/|(\/index)?\.([a-zA-Z0-9]{1,4})($|\s|\?)|\s*\+\s*\d+\s*modules/g, "");
 
 		const splittedInfo = extraInfo.split("/");
 		while(splittedInfo.length) {
-			name = splittedInfo.pop() + "_" + name;
+			name = splittedInfo.pop() + (name ? "_" + name : "");
 			const nameIdent = Template.toIdentifier(name);
 			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;
+		let nameWithNumber = Template.toIdentifier(`${name}_${i}`);
+		while(usedNamed1.has(nameWithNumber) || (usedNamed2 && usedNamed2.has(nameWithNumber))) {
+			i++;
+			nameWithNumber = Template.toIdentifier(`${name}_${i}`);
+		}
+		return nameWithNumber;
 	}
 
 	updateHash(hash) {
-		for(const m of this.modules) {
-			m.updateHash(hash);
+		for(const info of this._orderedConcatenationList) {
+			switch(info.type) {
+				case "concatenated":
+					info.module.updateHash(hash);
+					break;
+				case "external":
+					hash.update(`${info.module.id}`);
+					break;
+			}
 		}
 		super.updateHash(hash);
 	}
@@ -474,16 +649,14 @@ class HarmonyImportSpecifierDependencyConcatenatedTemplate {
 			this.originalTemplate.apply(dep, source, outputOptions, requestShortener, dependencyTemplates);
 			return;
 		}
-		if(!Array.isArray(module.providedExports))
-			throw new Error(`Module ${module.resource} has no static exports ${module.providedExports}`);
 		let content;
 		if(dep.id === null) {
 			content = `__WEBPACK_MODULE_REFERENCE__${info.index}_ns__`;
 		} else if(dep.namespaceObjectAsContext) {
 			content = `__WEBPACK_MODULE_REFERENCE__${info.index}_ns__[${JSON.stringify(dep.id)}]`;
 		} else {
-			const exportIdx = (module.providedExports).indexOf(dep.id);
-			content = exportIdx === -1 ? "undefined" : `__WEBPACK_MODULE_REFERENCE__${info.index}_${exportIdx}__`;
+			const exportData = new Buffer(dep.id, "utf-8").toString("hex"); // eslint-disable-line node/no-deprecated-api
+			content = `__WEBPACK_MODULE_REFERENCE__${info.index}_${exportData}${dep.call ? "_call" : ""}__`;
 		}
 		if(dep.shorthand) {
 			content = dep.name + ": " + content;
@@ -529,19 +702,20 @@ class HarmonyExportExpressionDependencyConcatenatedTemplate {
 	}
 
 	apply(dep, source, outputOptions, requestShortener, dependencyTemplates) {
+		let content = "/* harmony default export */ var __WEBPACK_MODULE_DEFAULT_EXPORT__ = ";
 		if(dep.originModule === this.rootModule) {
-			this.originalTemplate.apply(dep, source, outputOptions, requestShortener, dependencyTemplates);
-		} else {
-			const content = "/* harmony default export */ var __WEBPACK_MODULE_DEFAULT_EXPORT__ = ";
-
-			if(dep.range) {
-				source.replace(dep.rangeStatement[0], dep.range[0] - 1, content + "(");
-				source.replace(dep.range[1], dep.rangeStatement[1] - 1, ");");
-				return;
-			}
+			const used = dep.originModule.isUsed("default");
+			const exportsName = dep.originModule.exportsArgument || "exports";
+			if(used) content += `${exportsName}[${JSON.stringify(used)}] = `;
+		}
 
-			source.replace(dep.rangeStatement[0], dep.rangeStatement[1] - 1, content);
+		if(dep.range) {
+			source.replace(dep.rangeStatement[0], dep.range[0] - 1, content + "(");
+			source.replace(dep.range[1], dep.rangeStatement[1] - 1, ");");
+			return;
 		}
+
+		source.replace(dep.rangeStatement[0], dep.rangeStatement[1] - 1, content);
 	}
 }
 
@@ -597,8 +771,8 @@ class HarmonyExportImportedSpecifierDependencyConcatenatedTemplate {
 					if(def.id === true) {
 						finalName = `__WEBPACK_MODULE_REFERENCE__${info.index}_ns__`;
 					} else {
-						const exportIdx = def.module.providedExports.indexOf(def.id);
-						finalName = exportIdx < 0 ? "undefined" : `__WEBPACK_MODULE_REFERENCE__${info.index}_${exportIdx}__`;
+						const exportData = new Buffer(def.id, "utf-8").toString("hex"); // eslint-disable-line node/no-deprecated-api
+						finalName = `__WEBPACK_MODULE_REFERENCE__${info.index}_${exportData}__`;
 					}
 					const exportsName = this.rootModule.exportsArgument || "exports";
 					const content = `/* concated harmony reexport */__webpack_require__.d(${exportsName}, ${JSON.stringify(used)}, function() { return ${finalName}; });\n`;