webpack 3.6.0 → 3.8.1

package/lib/dependencies/DllEntryDependency.js

@@ -1,20 +1,20 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const Dependency = require("../Dependency");
-
-class DllEntryDependency extends Dependency {
-	constructor(dependencies, name) {
-		super();
-		this.dependencies = dependencies;
-		this.name = name;
-	}
-
-	get type() {
-		return "dll entry";
-	}
-}
-
-module.exports = DllEntryDependency;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const Dependency = require("../Dependency");
+
+class DllEntryDependency extends Dependency {
+	constructor(dependencies, name) {
+		super();
+		this.dependencies = dependencies;
+		this.name = name;
+	}
+
+	get type() {
+		return "dll entry";
+	}
+}
+
+module.exports = DllEntryDependency;

package/lib/dependencies/HarmonyCompatibilityDependency.js

@@ -1,30 +1,30 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const NullDependency = require("./NullDependency");
-
-class HarmonyCompatibilityDependency extends NullDependency {
-	constructor(originModule) {
-		super();
-		this.originModule = originModule;
-	}
-
-	get type() {
-		return "harmony export header";
-	}
-}
-
-HarmonyCompatibilityDependency.Template = class HarmonyExportDependencyTemplate {
-	apply(dep, source) {
-		const usedExports = dep.originModule.usedExports;
-		if(usedExports && !Array.isArray(usedExports)) {
-			const exportName = dep.originModule.exportsArgument || "exports";
-			const content = `Object.defineProperty(${exportName}, "__esModule", { value: true });\n`;
-			source.insert(-10, content);
-		}
-	}
-};
-
-module.exports = HarmonyCompatibilityDependency;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const NullDependency = require("./NullDependency");
+
+class HarmonyCompatibilityDependency extends NullDependency {
+	constructor(originModule) {
+		super();
+		this.originModule = originModule;
+	}
+
+	get type() {
+		return "harmony export header";
+	}
+}
+
+HarmonyCompatibilityDependency.Template = class HarmonyExportDependencyTemplate {
+	apply(dep, source) {
+		const usedExports = dep.originModule.usedExports;
+		if(usedExports && !Array.isArray(usedExports)) {
+			const exportName = dep.originModule.exportsArgument || "exports";
+			const content = `Object.defineProperty(${exportName}, "__esModule", { value: true });\n`;
+			source.insert(-10, content);
+		}
+	}
+};
+
+module.exports = HarmonyCompatibilityDependency;

package/lib/dependencies/HarmonyExportDependencyParserPlugin.js

@@ -39,9 +39,11 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 		parser.plugin("export specifier", (statement, id, name, idx) => {
 			const rename = parser.scope.renames[`$${id}`];
 			let dep;
+			const harmonyNamedExports = parser.state.harmonyNamedExports = parser.state.harmonyNamedExports || new Set();
+			harmonyNamedExports.add(name);
 			if(rename === "imported var") {
 				const settings = parser.state.harmonySpecifier[`$${id}`];
-				dep = new HarmonyExportImportedSpecifierDependency(parser.state.module, settings[0], settings[1], settings[2], name);
+				dep = new HarmonyExportImportedSpecifierDependency(parser.state.module, settings[0], settings[1], settings[2], name, harmonyNamedExports, null);
 			} else {
 				const immutable = statement.declaration && isImmutableStatement(statement.declaration);
 				const hoisted = statement.declaration && isHoistedStatement(statement.declaration);
@@ -53,7 +55,17 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 			return true;
 		});
 		parser.plugin("export import specifier", (statement, source, id, name, idx) => {
-			const dep = new HarmonyExportImportedSpecifierDependency(parser.state.module, parser.state.lastHarmonyImport, HarmonyModulesHelpers.getModuleVar(parser.state, source), id, name);
+			const harmonyNamedExports = parser.state.harmonyNamedExports = parser.state.harmonyNamedExports || new Set();
+			let harmonyStarExports = null;
+			if(name) {
+				harmonyNamedExports.add(name);
+			} else {
+				harmonyStarExports = parser.state.harmonyStarExports = parser.state.harmonyStarExports || [];
+			}
+			const dep = new HarmonyExportImportedSpecifierDependency(parser.state.module, parser.state.lastHarmonyImport, HarmonyModulesHelpers.getModuleVar(parser.state, source), id, name, harmonyNamedExports, harmonyStarExports && harmonyStarExports.slice());
+			if(harmonyStarExports) {
+				harmonyStarExports.push(dep);
+			}
 			dep.loc = Object.create(statement.loc);
 			dep.loc.index = idx;
 			parser.state.current.addDependency(dep);

package/lib/dependencies/HarmonyExportExpressionDependency.js

@@ -22,13 +22,6 @@ class HarmonyExportExpressionDependency extends NullDependency {
 			exports: ["default"]
 		};
 	}
-
-	describeHarmonyExport() {
-		return {
-			exportedName: "default",
-			precedence: 1,
-		};
-	}
 }
 
 HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTemplate {

package/lib/dependencies/HarmonyExportHeaderDependency.js

@@ -1,28 +1,28 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const NullDependency = require("./NullDependency");
-
-class HarmonyExportHeaderDependency extends NullDependency {
-	constructor(range, rangeStatement) {
-		super();
-		this.range = range;
-		this.rangeStatement = rangeStatement;
-	}
-
-	get type() {
-		return "harmony export header";
-	}
-}
-
-HarmonyExportHeaderDependency.Template = class HarmonyExportDependencyTemplate {
-	apply(dep, source) {
-		const content = "";
-		const replaceUntil = dep.range ? dep.range[0] - 1 : dep.rangeStatement[1] - 1;
-		source.replace(dep.rangeStatement[0], replaceUntil, content);
-	}
-};
-
-module.exports = HarmonyExportHeaderDependency;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const NullDependency = require("./NullDependency");
+
+class HarmonyExportHeaderDependency extends NullDependency {
+	constructor(range, rangeStatement) {
+		super();
+		this.range = range;
+		this.rangeStatement = rangeStatement;
+	}
+
+	get type() {
+		return "harmony export header";
+	}
+}
+
+HarmonyExportHeaderDependency.Template = class HarmonyExportDependencyTemplate {
+	apply(dep, source) {
+		const content = "";
+		const replaceUntil = dep.range ? dep.range[0] - 1 : dep.rangeStatement[1] - 1;
+		source.replace(dep.rangeStatement[0], replaceUntil, content);
+	}
+};
+
+module.exports = HarmonyExportHeaderDependency;

package/lib/dependencies/HarmonyExportImportedSpecifierDependency.js

@@ -4,16 +4,17 @@
 */
 "use strict";
 const NullDependency = require("./NullDependency");
-const HarmonyModulesHelpers = require("./HarmonyModulesHelpers");
 
 class HarmonyExportImportedSpecifierDependency extends NullDependency {
-	constructor(originModule, importDependency, importedVar, id, name) {
+	constructor(originModule, importDependency, importedVar, id, name, activeExports, otherStarExports) {
 		super();
 		this.originModule = originModule;
 		this.importDependency = importDependency;
 		this.importedVar = importedVar;
 		this.id = id;
 		this.name = name;
+		this.activeExports = activeExports;
+		this.otherStarExports = otherStarExports;
 	}
 
 	get type() {
@@ -23,10 +24,9 @@ class HarmonyExportImportedSpecifierDependency extends NullDependency {
 	getReference() {
 		const name = this.name;
 		const used = this.originModule.isUsed(name);
-		const active = HarmonyModulesHelpers.isActive(this.originModule, this);
 		const importedModule = this.importDependency.module;
 
-		if(!importedModule || !used || !active || !this.originModule.usedExports) return null;
+		if(!importedModule || !used || !this.originModule.usedExports) return null;
 
 		const hasUsedExports = Array.isArray(this.originModule.usedExports);
 
@@ -50,21 +50,18 @@ class HarmonyExportImportedSpecifierDependency extends NullDependency {
 		}
 
 		const hasProvidedExports = Array.isArray(importedModule.providedExports);
+		const activeFromOtherStarExports = this._discoverActiveExportsFromOtherStartExports();
 
 		// export *
 		if(hasUsedExports) {
 			// reexport * with known used exports
-			const activeExports = HarmonyModulesHelpers.getActiveExports(this.originModule, this);
 			const importedNames = this.originModule.usedExports.filter(id => {
-				const notInActiveExports = activeExports.indexOf(id) < 0;
-				const notDefault = id !== "default";
-
-				if(hasProvidedExports) {
-					const inProvidedExports = importedModule.providedExports.indexOf(id) >= 0;
-					return notInActiveExports && notDefault && inProvidedExports;
-				} else {
-					return notInActiveExports && notDefault;
-				}
+				if(id === "default") return false;
+				if(this.activeExports.has(id)) return false;
+				if(activeFromOtherStarExports.has(id)) return false;
+				if(hasProvidedExports && importedModule.providedExports.indexOf(id) < 0) return false;
+
+				return true;
 			});
 
 			return {
@@ -76,7 +73,13 @@ class HarmonyExportImportedSpecifierDependency extends NullDependency {
 		if(hasProvidedExports) {
 			return {
 				module: importedModule,
-				importedNames: importedModule.providedExports.filter(id => id !== "default"),
+				importedNames: importedModule.providedExports.filter(id => {
+					if(id === "default") return false;
+					if(this.activeExports.has(id)) return false;
+					if(activeFromOtherStarExports.has(id)) return false;
+
+					return true;
+				})
 			};
 		}
 
@@ -86,6 +89,21 @@ class HarmonyExportImportedSpecifierDependency extends NullDependency {
 		};
 	}
 
+	_discoverActiveExportsFromOtherStartExports() {
+		if(!this.otherStarExports)
+			return new Set();
+		const result = new Set();
+		// try to learn impossible exports from other star exports with provided exports
+		for(const otherStarExport of this.otherStarExports) {
+			const otherImportedModule = otherStarExport.importDependency.module;
+			if(otherImportedModule && Array.isArray(otherImportedModule.providedExports)) {
+				for(const exportName of otherImportedModule.providedExports)
+					result.add(exportName);
+			}
+		}
+		return result;
+	}
+
 	getExports() {
 		if(this.name) {
 			return {
@@ -121,22 +139,6 @@ class HarmonyExportImportedSpecifierDependency extends NullDependency {
 		};
 	}
 
-	describeHarmonyExport() {
-		const importedModule = this.importDependency.module;
-		if(!this.name && importedModule && Array.isArray(importedModule.providedExports)) {
-			// for a star export and when we know which exports are provided, we can tell so
-			return {
-				exportedName: importedModule.providedExports,
-				precedence: 3
-			};
-		}
-
-		return {
-			exportedName: this.name,
-			precedence: this.name ? 2 : 3
-		};
-	}
-
 	updateHash(hash) {
 		super.updateHash(hash);
 		const hashValue = this.getHashValue(this.importDependency.module);
@@ -166,7 +168,6 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 		const name = dep.importedVar;
 		const used = dep.originModule.isUsed(dep.name);
 		const importedModule = dep.importDependency.module;
-		const active = HarmonyModulesHelpers.isActive(dep.originModule, dep);
 		const importsExportsUnknown = !importedModule || !Array.isArray(importedModule.providedExports);
 
 		const getReexportStatement = this.reexportStatementCreator(dep.originModule, importsExportsUnknown, name);
@@ -176,11 +177,6 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 			return "/* unused harmony reexport " + dep.name + " */\n";
 		}
 
-		// we want to reexport something but another exports overrides this one
-		if(!active) {
-			return "/* inactive harmony reexport " + (dep.name || "namespace") + " */\n";
-		}
-
 		// we want to reexport the default export from a non-hamory module
 		const isNotAHarmonyModule = !(importedModule && (!importedModule.meta || importedModule.meta.harmonyModule));
 		if(dep.name && dep.id === "default" && isNotAHarmonyModule) {
@@ -198,13 +194,17 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 			return "/* harmony reexport (module object) */ " + getReexportStatement(JSON.stringify(used), "");
 		}
 
+		const hasProvidedExports = importedModule && Array.isArray(importedModule.providedExports);
+
+		const activeFromOtherStarExports = dep._discoverActiveExportsFromOtherStartExports();
+
 		// we know which exports are used
 		if(Array.isArray(dep.originModule.usedExports)) {
-			const activeExports = HarmonyModulesHelpers.getActiveExports(dep.originModule, dep);
-			const items = dep.originModule.usedExports.map(function(id) {
+			const items = dep.originModule.usedExports.map(id => {
 				if(id === "default") return;
-				if(activeExports.indexOf(id) >= 0) return;
+				if(dep.activeExports.has(id)) return;
 				if(importedModule.isProvided(id) === false) return;
+				if(activeFromOtherStarExports.has(id)) return;
 				var exportUsed = dep.originModule.isUsed(id);
 				var idUsed = importedModule && importedModule.isUsed(id);
 				return [exportUsed, idUsed];
@@ -220,11 +220,11 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 		}
 
 		// not sure which exports are used, but we know which are provided
-		if(dep.originModule.usedExports && importedModule && Array.isArray(importedModule.providedExports)) {
-			const activeExports = HarmonyModulesHelpers.getActiveExports(dep.originModule, dep);
-			const items = importedModule.providedExports.map(function(id) {
+		if(dep.originModule.usedExports && importedModule && hasProvidedExports) {
+			const items = importedModule.providedExports.map(id => {
 				if(id === "default") return;
-				if(activeExports.indexOf(id) >= 0) return;
+				if(dep.activeExports.has(id)) return;
+				if(activeFromOtherStarExports.has(id)) return;
 				var exportUsed = dep.originModule.isUsed(id);
 				var idUsed = importedModule && importedModule.isUsed(id);
 				return [exportUsed, idUsed];
@@ -241,7 +241,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 
 		// not sure which exports are used and provided
 		if(dep.originModule.usedExports) {
-			const activeExports = HarmonyModulesHelpers.getActiveExports(dep.originModule, dep);
+			const activeExports = Array.from(dep.activeExports).concat(Array.from(activeFromOtherStarExports));
 			let content = "/* harmony namespace reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in " + name + ") ";
 
 			// Filter out exports which are defined by other exports

package/lib/dependencies/HarmonyExportSpecifierDependency.js

@@ -4,7 +4,6 @@
 */
 "use strict";
 const NullDependency = require("./NullDependency");
-const HarmonyModulesHelpers = require("./HarmonyModulesHelpers");
 
 class HarmonyExportSpecifierDependency extends NullDependency {
 	constructor(originModule, id, name, position, immutable) {
@@ -25,13 +24,6 @@ class HarmonyExportSpecifierDependency extends NullDependency {
 			exports: [this.name]
 		};
 	}
-
-	describeHarmonyExport() {
-		return {
-			exportedName: this.name,
-			precedence: 1
-		};
-	}
 }
 
 HarmonyExportSpecifierDependency.Template = class HarmonyExportSpecifierDependencyTemplate {
@@ -46,15 +38,10 @@ HarmonyExportSpecifierDependency.Template = class HarmonyExportSpecifierDependen
 
 	getContent(dep) {
 		const used = dep.originModule.isUsed(dep.name);
-		const active = HarmonyModulesHelpers.isActive(dep.originModule, dep);
 		if(!used) {
 			return `/* unused harmony export ${(dep.name || "namespace")} */\n`;
 		}
 
-		if(!active) {
-			return `/* inactive harmony export ${(dep.name || "namespace")} */\n`;
-		}
-
 		const exportsName = dep.originModule.exportsArgument || "exports";
 		if(dep.immutable) {
 			return `/* harmony export (immutable) */ ${exportsName}[${JSON.stringify(used)}] = ${dep.id};\n`;

package/lib/dependencies/HarmonyModulesHelpers.js

@@ -27,59 +27,6 @@ class HarmonyModulesHelpers {
 			return null;
 		return this.getModuleVar(state, request);
 	}
-
-	// checks if an harmony dependency is active in a module according to
-	// precedence rules.
-	static isActive(module, depInQuestion) {
-		const desc = depInQuestion.describeHarmonyExport();
-		if(!desc.exportedName) return true;
-		let before = true;
-		for(let idx = 0; idx < module.dependencies.length; idx++) {
-			const dep = module.dependencies[idx];
-			if(dep === depInQuestion) {
-				before = false;
-				continue;
-			}
-			if(!dep.describeHarmonyExport) continue;
-			const d = dep.describeHarmonyExport();
-			if(!d || !d.exportedName) continue;
-			if(d.exportedName === desc.exportedName) {
-				if(d.precedence < desc.precedence) {
-					return false;
-				}
-				if(d.precedence === desc.precedence && !before) {
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
-	// get a list of named exports defined in a module
-	// doesn't include * reexports.
-	static getActiveExports(module, currentDependency) {
-		const desc = currentDependency && currentDependency.describeHarmonyExport();
-		var currentIndex = currentDependency ? module.dependencies.indexOf(currentDependency) : -1;
-		return module.dependencies.map((dep, idx) => {
-			return {
-				dep: dep,
-				idx: idx
-			};
-		}).reduce((arr, data) => {
-			const dep = data.dep;
-			if(!dep.describeHarmonyExport) return arr;
-			const d = dep.describeHarmonyExport();
-			if(!d) return arr;
-			if(!desc || (d.precedence < desc.precedence) || (d.precedence === desc.precedence && data.idx < currentIndex)) {
-				var names = [].concat(d.exportedName);
-				names.forEach(function(name) {
-					if(name && arr.indexOf(name) < 0)
-						arr.push(name);
-				});
-			}
-			return arr;
-		}, []);
-	}
 }
 
 module.exports = HarmonyModulesHelpers;

package/lib/dependencies/ImportContextDependency.js

@@ -4,7 +4,6 @@
 */
 "use strict";
 const ContextDependency = require("./ContextDependency");
-const CriticalDependencyWarning = require("./CriticalDependencyWarning");
 const ContextDependencyTemplateAsRequireCall = require("./ContextDependencyTemplateAsRequireCall");
 
 class ImportContextDependency extends ContextDependency {
@@ -19,15 +18,6 @@ class ImportContextDependency extends ContextDependency {
 		return "import() context";
 	}
 
-	getWarnings() {
-		if(!this.critical) {
-			return;
-		}
-
-		return [
-			new CriticalDependencyWarning(this.critical)
-		];
-	}
 }
 
 ImportContextDependency.Template = ContextDependencyTemplateAsRequireCall;

package/lib/dependencies/ImportDependenciesBlock.js

@@ -1,17 +1,17 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const AsyncDependenciesBlock = require("../AsyncDependenciesBlock");
-const ImportDependency = require("./ImportDependency");
-
-module.exports = class ImportDependenciesBlock extends AsyncDependenciesBlock {
-	constructor(request, range, chunkName, module, loc) {
-		super(chunkName, module, loc);
-		this.range = range;
-		const dep = new ImportDependency(request, this);
-		dep.loc = loc;
-		this.addDependency(dep);
-	}
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const AsyncDependenciesBlock = require("../AsyncDependenciesBlock");
+const ImportDependency = require("./ImportDependency");
+
+module.exports = class ImportDependenciesBlock extends AsyncDependenciesBlock {
+	constructor(request, range, chunkName, module, loc) {
+		super(chunkName, module, loc);
+		this.range = range;
+		const dep = new ImportDependency(request, this);
+		dep.loc = loc;
+		this.addDependency(dep);
+	}
+};

package/lib/dependencies/ImportEagerContextDependency.js

@@ -1,22 +1,22 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const ImportContextDependency = require("./ImportContextDependency");
-const ContextDependencyTemplateAsRequireCall = require("./ContextDependencyTemplateAsRequireCall");
-
-class ImportEagerContextDependency extends ImportContextDependency {
-	constructor(request, recursive, regExp, range, valueRange, chunkName) {
-		super(request, recursive, regExp, range, valueRange, chunkName);
-		this.async = "eager";
-	}
-
-	get type() {
-		return "import() context eager";
-	}
-}
-
-ImportEagerContextDependency.Template = ContextDependencyTemplateAsRequireCall;
-
-module.exports = ImportEagerContextDependency;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const ImportContextDependency = require("./ImportContextDependency");
+const ContextDependencyTemplateAsRequireCall = require("./ContextDependencyTemplateAsRequireCall");
+
+class ImportEagerContextDependency extends ImportContextDependency {
+	constructor(request, recursive, regExp, range, valueRange, chunkName) {
+		super(request, recursive, regExp, range, valueRange, chunkName);
+		this.async = "eager";
+	}
+
+	get type() {
+		return "import() context eager";
+	}
+}
+
+ImportEagerContextDependency.Template = ContextDependencyTemplateAsRequireCall;
+
+module.exports = ImportEagerContextDependency;

package/lib/dependencies/ImportLazyContextDependency.js

@@ -1,22 +1,22 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const ImportContextDependency = require("./ImportContextDependency");
-const ContextDependencyTemplateAsRequireCall = require("./ContextDependencyTemplateAsRequireCall");
-
-class ImportLazyContextDependency extends ImportContextDependency {
-	constructor(request, recursive, regExp, range, valueRange, chunkName) {
-		super(request, recursive, regExp, range, valueRange, chunkName);
-		this.async = "lazy";
-	}
-
-	get type() {
-		return "import() context lazy";
-	}
-}
-
-ImportLazyContextDependency.Template = ContextDependencyTemplateAsRequireCall;
-
-module.exports = ImportLazyContextDependency;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const ImportContextDependency = require("./ImportContextDependency");
+const ContextDependencyTemplateAsRequireCall = require("./ContextDependencyTemplateAsRequireCall");
+
+class ImportLazyContextDependency extends ImportContextDependency {
+	constructor(request, recursive, regExp, range, valueRange, chunkName) {
+		super(request, recursive, regExp, range, valueRange, chunkName);
+		this.async = "lazy";
+	}
+
+	get type() {
+		return "import() context lazy";
+	}
+}
+
+ImportLazyContextDependency.Template = ContextDependencyTemplateAsRequireCall;
+
+module.exports = ImportLazyContextDependency;