webpack 4.15.0 → 4.16.2

package/lib/dependencies/HarmonyExportDependencyParserPlugin.js

@@ -1,139 +1,139 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const HarmonyExportExpressionDependency = require("./HarmonyExportExpressionDependency");
-const HarmonyImportSideEffectDependency = require("./HarmonyImportSideEffectDependency");
-const HarmonyExportHeaderDependency = require("./HarmonyExportHeaderDependency");
-const HarmonyExportSpecifierDependency = require("./HarmonyExportSpecifierDependency");
-const HarmonyExportImportedSpecifierDependency = require("./HarmonyExportImportedSpecifierDependency");
-const ConstDependency = require("./ConstDependency");
-
-module.exports = class HarmonyExportDependencyParserPlugin {
-	constructor(moduleOptions) {
-		this.strictExportPresence = moduleOptions.strictExportPresence;
-	}
-
-	apply(parser) {
-		parser.hooks.export.tap(
-			"HarmonyExportDependencyParserPlugin",
-			statement => {
-				const dep = new HarmonyExportHeaderDependency(
-					statement.declaration && statement.declaration.range,
-					statement.range
-				);
-				dep.loc = Object.create(statement.loc);
-				dep.loc.index = -1;
-				parser.state.current.addDependency(dep);
-				return true;
-			}
-		);
-		parser.hooks.exportImport.tap(
-			"HarmonyExportDependencyParserPlugin",
-			(statement, source) => {
-				parser.state.lastHarmonyImportOrder =
-					(parser.state.lastHarmonyImportOrder || 0) + 1;
-				const clearDep = new ConstDependency("", statement.range);
-				clearDep.loc = Object.create(statement.loc);
-				clearDep.loc.index = -1;
-				parser.state.current.addDependency(clearDep);
-				const sideEffectDep = new HarmonyImportSideEffectDependency(
-					source,
-					parser.state.module,
-					parser.state.lastHarmonyImportOrder,
-					parser.state.harmonyParserScope
-				);
-				sideEffectDep.loc = Object.create(statement.loc);
-				sideEffectDep.loc.index = -1;
-				parser.state.current.addDependency(sideEffectDep);
-				return true;
-			}
-		);
-		parser.hooks.exportExpression.tap(
-			"HarmonyExportDependencyParserPlugin",
-			(statement, expr) => {
-				const dep = new HarmonyExportExpressionDependency(
-					parser.state.module,
-					expr.range,
-					statement.range
-				);
-				dep.loc = Object.create(statement.loc);
-				dep.loc.index = -1;
-				parser.state.current.addDependency(dep);
-				return true;
-			}
-		);
-		parser.hooks.exportDeclaration.tap(
-			"HarmonyExportDependencyParserPlugin",
-			statement => {}
-		);
-		parser.hooks.exportSpecifier.tap(
-			"HarmonyExportDependencyParserPlugin",
-			(statement, id, name, idx) => {
-				const rename = parser.scope.renames.get(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.get(id);
-					dep = new HarmonyExportImportedSpecifierDependency(
-						settings.source,
-						parser.state.module,
-						settings.sourceOrder,
-						parser.state.harmonyParserScope,
-						settings.id,
-						name,
-						harmonyNamedExports,
-						null,
-						this.strictExportPresence
-					);
-				} else {
-					dep = new HarmonyExportSpecifierDependency(
-						parser.state.module,
-						id,
-						name
-					);
-				}
-				dep.loc = Object.create(statement.loc);
-				dep.loc.index = idx;
-				parser.state.current.addDependency(dep);
-				return true;
-			}
-		);
-		parser.hooks.exportImportSpecifier.tap(
-			"HarmonyExportDependencyParserPlugin",
-			(statement, source, id, name, idx) => {
-				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(
-					source,
-					parser.state.module,
-					parser.state.lastHarmonyImportOrder,
-					parser.state.harmonyParserScope,
-					id,
-					name,
-					harmonyNamedExports,
-					harmonyStarExports && harmonyStarExports.slice(),
-					this.strictExportPresence
-				);
-				if (harmonyStarExports) {
-					harmonyStarExports.push(dep);
-				}
-				dep.loc = Object.create(statement.loc);
-				dep.loc.index = idx;
-				parser.state.current.addDependency(dep);
-				return true;
-			}
-		);
-	}
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const HarmonyExportExpressionDependency = require("./HarmonyExportExpressionDependency");
+const HarmonyImportSideEffectDependency = require("./HarmonyImportSideEffectDependency");
+const HarmonyExportHeaderDependency = require("./HarmonyExportHeaderDependency");
+const HarmonyExportSpecifierDependency = require("./HarmonyExportSpecifierDependency");
+const HarmonyExportImportedSpecifierDependency = require("./HarmonyExportImportedSpecifierDependency");
+const ConstDependency = require("./ConstDependency");
+
+module.exports = class HarmonyExportDependencyParserPlugin {
+	constructor(moduleOptions) {
+		this.strictExportPresence = moduleOptions.strictExportPresence;
+	}
+
+	apply(parser) {
+		parser.hooks.export.tap(
+			"HarmonyExportDependencyParserPlugin",
+			statement => {
+				const dep = new HarmonyExportHeaderDependency(
+					statement.declaration && statement.declaration.range,
+					statement.range
+				);
+				dep.loc = Object.create(statement.loc);
+				dep.loc.index = -1;
+				parser.state.current.addDependency(dep);
+				return true;
+			}
+		);
+		parser.hooks.exportImport.tap(
+			"HarmonyExportDependencyParserPlugin",
+			(statement, source) => {
+				parser.state.lastHarmonyImportOrder =
+					(parser.state.lastHarmonyImportOrder || 0) + 1;
+				const clearDep = new ConstDependency("", statement.range);
+				clearDep.loc = Object.create(statement.loc);
+				clearDep.loc.index = -1;
+				parser.state.current.addDependency(clearDep);
+				const sideEffectDep = new HarmonyImportSideEffectDependency(
+					source,
+					parser.state.module,
+					parser.state.lastHarmonyImportOrder,
+					parser.state.harmonyParserScope
+				);
+				sideEffectDep.loc = Object.create(statement.loc);
+				sideEffectDep.loc.index = -1;
+				parser.state.current.addDependency(sideEffectDep);
+				return true;
+			}
+		);
+		parser.hooks.exportExpression.tap(
+			"HarmonyExportDependencyParserPlugin",
+			(statement, expr) => {
+				const dep = new HarmonyExportExpressionDependency(
+					parser.state.module,
+					expr.range,
+					statement.range
+				);
+				dep.loc = Object.create(statement.loc);
+				dep.loc.index = -1;
+				parser.state.current.addDependency(dep);
+				return true;
+			}
+		);
+		parser.hooks.exportDeclaration.tap(
+			"HarmonyExportDependencyParserPlugin",
+			statement => {}
+		);
+		parser.hooks.exportSpecifier.tap(
+			"HarmonyExportDependencyParserPlugin",
+			(statement, id, name, idx) => {
+				const rename = parser.scope.renames.get(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.get(id);
+					dep = new HarmonyExportImportedSpecifierDependency(
+						settings.source,
+						parser.state.module,
+						settings.sourceOrder,
+						parser.state.harmonyParserScope,
+						settings.id,
+						name,
+						harmonyNamedExports,
+						null,
+						this.strictExportPresence
+					);
+				} else {
+					dep = new HarmonyExportSpecifierDependency(
+						parser.state.module,
+						id,
+						name
+					);
+				}
+				dep.loc = Object.create(statement.loc);
+				dep.loc.index = idx;
+				parser.state.current.addDependency(dep);
+				return true;
+			}
+		);
+		parser.hooks.exportImportSpecifier.tap(
+			"HarmonyExportDependencyParserPlugin",
+			(statement, source, id, name, idx) => {
+				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(
+					source,
+					parser.state.module,
+					parser.state.lastHarmonyImportOrder,
+					parser.state.harmonyParserScope,
+					id,
+					name,
+					harmonyNamedExports,
+					harmonyStarExports && harmonyStarExports.slice(),
+					this.strictExportPresence
+				);
+				if (harmonyStarExports) {
+					harmonyStarExports.push(dep);
+				}
+				dep.loc = Object.create(statement.loc);
+				dep.loc.index = idx;
+				parser.state.current.addDependency(dep);
+				return true;
+			}
+		);
+	}
+};

package/lib/dependencies/HarmonyExportHeaderDependency.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 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

@@ -244,7 +244,8 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 				return new DependencyReference(
 					mode.module,
 					Array.from(mode.map.values()),
-					false
+					false,
+					this.sourceOrder
 				);
 
 			case "dynamic-reexport":

package/lib/dependencies/HarmonyImportDependency.js

@@ -1,109 +1,109 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const DependencyReference = require("./DependencyReference");
-const ModuleDependency = require("./ModuleDependency");
-const Template = require("../Template");
-
-class HarmonyImportDependency extends ModuleDependency {
-	constructor(request, originModule, sourceOrder, parserScope) {
-		super(request);
-		this.redirectedModule = undefined;
-		this.originModule = originModule;
-		this.sourceOrder = sourceOrder;
-		this.parserScope = parserScope;
-	}
-
-	get _module() {
-		return this.redirectedModule || this.module;
-	}
-
-	getReference() {
-		if (!this._module) return null;
-		return new DependencyReference(
-			this._module,
-			false,
-			this.weak,
-			this.sourceOrder
-		);
-	}
-
-	getImportVar() {
-		let importVarMap = this.parserScope.importVarMap;
-		if (!importVarMap) this.parserScope.importVarMap = importVarMap = new Map();
-		let importVar = importVarMap.get(this._module);
-		if (importVar) return importVar;
-		importVar = `${Template.toIdentifier(
-			`${this.userRequest}`
-		)}__WEBPACK_IMPORTED_MODULE_${importVarMap.size}__`;
-		importVarMap.set(this._module, importVar);
-		return importVar;
-	}
-
-	getImportStatement(update, runtime) {
-		return runtime.importStatement({
-			update,
-			module: this._module,
-			importVar: this.getImportVar(),
-			request: this.request,
-			originModule: this.originModule
-		});
-	}
-
-	updateHash(hash) {
-		super.updateHash(hash);
-		const importedModule = this._module;
-		hash.update(
-			(importedModule &&
-				(!importedModule.buildMeta || importedModule.buildMeta.exportsType)) +
-				""
-		);
-		hash.update((importedModule && importedModule.id) + "");
-	}
-
-	disconnect() {
-		super.disconnect();
-		this.redirectedModule = undefined;
-	}
-}
-
-module.exports = HarmonyImportDependency;
-
-const importEmittedMap = new WeakMap();
-
-HarmonyImportDependency.Template = class HarmonyImportDependencyTemplate {
-	apply(dep, source, runtime) {
-		// no-op
-	}
-
-	getHarmonyInitOrder(dep) {
-		return dep.sourceOrder;
-	}
-
-	static isImportEmitted(dep, source) {
-		let sourceInfo = importEmittedMap.get(source);
-		if (!sourceInfo) return false;
-		const key = dep._module || dep.request;
-		return key && sourceInfo.emittedImports.get(key);
-	}
-
-	harmonyInit(dep, source, runtime, dependencyTemplates) {
-		let sourceInfo = importEmittedMap.get(source);
-		if (!sourceInfo) {
-			importEmittedMap.set(
-				source,
-				(sourceInfo = {
-					emittedImports: new Map()
-				})
-			);
-		}
-		const key = dep._module || dep.request;
-		if (key && sourceInfo.emittedImports.get(key)) return;
-		sourceInfo.emittedImports.set(key, true);
-		const content = dep.getImportStatement(false, runtime);
-		source.insert(-1, content);
-	}
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const DependencyReference = require("./DependencyReference");
+const ModuleDependency = require("./ModuleDependency");
+const Template = require("../Template");
+
+class HarmonyImportDependency extends ModuleDependency {
+	constructor(request, originModule, sourceOrder, parserScope) {
+		super(request);
+		this.redirectedModule = undefined;
+		this.originModule = originModule;
+		this.sourceOrder = sourceOrder;
+		this.parserScope = parserScope;
+	}
+
+	get _module() {
+		return this.redirectedModule || this.module;
+	}
+
+	getReference() {
+		if (!this._module) return null;
+		return new DependencyReference(
+			this._module,
+			false,
+			this.weak,
+			this.sourceOrder
+		);
+	}
+
+	getImportVar() {
+		let importVarMap = this.parserScope.importVarMap;
+		if (!importVarMap) this.parserScope.importVarMap = importVarMap = new Map();
+		let importVar = importVarMap.get(this._module);
+		if (importVar) return importVar;
+		importVar = `${Template.toIdentifier(
+			`${this.userRequest}`
+		)}__WEBPACK_IMPORTED_MODULE_${importVarMap.size}__`;
+		importVarMap.set(this._module, importVar);
+		return importVar;
+	}
+
+	getImportStatement(update, runtime) {
+		return runtime.importStatement({
+			update,
+			module: this._module,
+			importVar: this.getImportVar(),
+			request: this.request,
+			originModule: this.originModule
+		});
+	}
+
+	updateHash(hash) {
+		super.updateHash(hash);
+		const importedModule = this._module;
+		hash.update(
+			(importedModule &&
+				(!importedModule.buildMeta || importedModule.buildMeta.exportsType)) +
+				""
+		);
+		hash.update((importedModule && importedModule.id) + "");
+	}
+
+	disconnect() {
+		super.disconnect();
+		this.redirectedModule = undefined;
+	}
+}
+
+module.exports = HarmonyImportDependency;
+
+const importEmittedMap = new WeakMap();
+
+HarmonyImportDependency.Template = class HarmonyImportDependencyTemplate {
+	apply(dep, source, runtime) {
+		// no-op
+	}
+
+	getHarmonyInitOrder(dep) {
+		return dep.sourceOrder;
+	}
+
+	static isImportEmitted(dep, source) {
+		let sourceInfo = importEmittedMap.get(source);
+		if (!sourceInfo) return false;
+		const key = dep._module || dep.request;
+		return key && sourceInfo.emittedImports.get(key);
+	}
+
+	harmonyInit(dep, source, runtime, dependencyTemplates) {
+		let sourceInfo = importEmittedMap.get(source);
+		if (!sourceInfo) {
+			importEmittedMap.set(
+				source,
+				(sourceInfo = {
+					emittedImports: new Map()
+				})
+			);
+		}
+		const key = dep._module || dep.request;
+		if (key && sourceInfo.emittedImports.get(key)) return;
+		sourceInfo.emittedImports.set(key, true);
+		const content = dep.getImportStatement(false, runtime);
+		source.insert(-1, content);
+	}
+};