webpack 3.6.0 → 3.8.1

package/lib/optimize/ConcatenatedModule.js

@@ -17,7 +17,6 @@ const HarmonyExportSpecifierDependency = require("../dependencies/HarmonyExportS
 const HarmonyExportExpressionDependency = require("../dependencies/HarmonyExportExpressionDependency");
 const HarmonyExportImportedSpecifierDependency = require("../dependencies/HarmonyExportImportedSpecifierDependency");
 const HarmonyCompatibilityDependency = require("../dependencies/HarmonyCompatibilityDependency");
-const HarmonyModulesHelpers = require("../dependencies/HarmonyModulesHelpers");
 
 function ensureNsObjSource(info, moduleToInfoMap, requestShortener) {
 	if(!info.hasNamespaceObject) {
@@ -308,35 +307,42 @@ class ConcatenatedModule extends Module {
 						const reexportMap = new Map();
 						info.module.dependencies.forEach(dep => {
 							if(dep instanceof HarmonyExportSpecifierDependency) {
-								exportMap.set(dep.name, dep.id);
+								if(!exportMap.has(dep.name))
+									exportMap.set(dep.name, dep.id);
 							} else if(dep instanceof HarmonyExportExpressionDependency) {
-								exportMap.set("default", "__WEBPACK_MODULE_DEFAULT_EXPORT__");
+								if(!exportMap.has("default"))
+									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
-									});
+									if(!reexportMap.has(exportName)) {
+										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, {
+									if(!reexportMap.has(exportName)) {
+										reexportMap.set(exportName, {
 											module: importedModule,
-											exportName: name,
+											exportName: true,
 											dependency: dep
 										});
+									}
+								} else if(importedModule) {
+									importedModule.providedExports.forEach(name => {
+										if(dep.activeExports.has(name) || name === "default")
+											return;
+										if(!reexportMap.has(name)) {
+											reexportMap.set(name, {
+												module: importedModule,
+												exportName: name,
+												dependency: dep
+											});
+										}
 									});
 								}
 							}
@@ -741,8 +747,6 @@ class HarmonyExportImportedSpecifierDependencyConcatenatedTemplate {
 	}
 
 	getExports(dep) {
-		const active = HarmonyModulesHelpers.isActive(dep.originModule, dep);
-		if(!active) return [];
 		const importModule = dep.importDependency.module;
 		if(dep.id) {
 			// export { named } from "module"
@@ -761,8 +765,7 @@ class HarmonyExportImportedSpecifierDependencyConcatenatedTemplate {
 			}];
 		}
 		// export * from "module"
-		const activeExports = new Set(HarmonyModulesHelpers.getActiveExports(dep.originModule, dep));
-		return importModule.providedExports.filter(exp => exp !== "default" && !activeExports.has(exp)).map(exp => {
+		return importModule.providedExports.filter(exp => exp !== "default" && !dep.activeExports.has(exp)).map(exp => {
 			return {
 				name: exp,
 				id: exp,

package/lib/optimize/DedupePlugin.js

@@ -1,15 +1,15 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-class DedupePlugin {
-	apply(compiler) {
-		compiler.plugin("compilation", (compilation) => {
-			compilation.warnings.push(new Error("DedupePlugin: This plugin was removed from webpack. Remove it from your configuration."));
-		});
-	}
-}
-
-module.exports = DedupePlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+class DedupePlugin {
+	apply(compiler) {
+		compiler.plugin("compilation", (compilation) => {
+			compilation.warnings.push(new Error("DedupePlugin: This plugin was removed from webpack. Remove it from your configuration."));
+		});
+	}
+}
+
+module.exports = DedupePlugin;

package/lib/optimize/FlagIncludedChunksPlugin.js

@@ -1,35 +1,35 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-class FlagIncludedChunksPlugin {
-
-	apply(compiler) {
-		compiler.plugin("compilation", (compilation) => {
-			compilation.plugin("optimize-chunk-ids", (chunks) => {
-				chunks.forEach((chunkA) => {
-					chunks.forEach((chunkB) => {
-						// as we iterate the same iterables twice
-						// skip if we find ourselves
-						if(chunkA === chunkB) return;
-
-						// instead of swapping A and B just bail
-						// as we loop twice the current A will be B and B then A
-						if(chunkA.getNumberOfModules() < chunkB.getNumberOfModules()) return;
-
-						if(chunkB.getNumberOfModules() === 0) return;
-
-						// is chunkB in chunkA?
-						for(const m of chunkB.modulesIterable) {
-							if(!chunkA.containsModule(m)) return;
-						}
-						chunkA.ids.push(chunkB.id);
-					});
-				});
-			});
-		});
-	}
-}
-module.exports = FlagIncludedChunksPlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+class FlagIncludedChunksPlugin {
+
+	apply(compiler) {
+		compiler.plugin("compilation", (compilation) => {
+			compilation.plugin("optimize-chunk-ids", (chunks) => {
+				chunks.forEach((chunkA) => {
+					chunks.forEach((chunkB) => {
+						// as we iterate the same iterables twice
+						// skip if we find ourselves
+						if(chunkA === chunkB) return;
+
+						// instead of swapping A and B just bail
+						// as we loop twice the current A will be B and B then A
+						if(chunkA.getNumberOfModules() < chunkB.getNumberOfModules()) return;
+
+						if(chunkB.getNumberOfModules() === 0) return;
+
+						// is chunkB in chunkA?
+						for(const m of chunkB.modulesIterable) {
+							if(!chunkA.containsModule(m)) return;
+						}
+						chunkA.ids.push(chunkB.id);
+					});
+				});
+			});
+		});
+	}
+}
+module.exports = FlagIncludedChunksPlugin;

package/lib/optimize/LimitChunkCountPlugin.js

@@ -1,59 +1,59 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-class LimitChunkCountPlugin {
-	constructor(options) {
-		if(options !== undefined && typeof options !== "object" || Array.isArray(options)) {
-			throw new Error("Argument should be an options object.\nFor more info on options, see https://webpack.js.org/plugins/");
-		}
-		this.options = options || {};
-	}
-	apply(compiler) {
-		const options = this.options;
-		compiler.plugin("compilation", (compilation) => {
-			compilation.plugin("optimize-chunks-advanced", (chunks) => {
-				const maxChunks = options.maxChunks;
-				if(!maxChunks) return;
-				if(maxChunks < 1) return;
-				if(chunks.length <= maxChunks) return;
-
-				if(chunks.length > maxChunks) {
-					const sortedExtendedPairCombinations = chunks.reduce((combinations, a, idx) => {
-						// create combination pairs
-						for(let i = 0; i < idx; i++) {
-							const b = chunks[i];
-							combinations.push([b, a]);
-						}
-						return combinations;
-					}, []).map((pair) => {
-						// extend combination pairs with size and integrated size
-						const a = pair[0].size(options);
-						const b = pair[1].size(options);
-						const ab = pair[0].integratedSize(pair[1], options);
-						return [a + b - ab, ab, pair[0], pair[1], a, b];
-					}).filter((extendedPair) => {
-						// filter pairs that do not have an integratedSize
-						// meaning they can NOT be integrated!
-						return extendedPair[1] !== false;
-					}).sort((a, b) => { // sadly javascript does an inplace sort here
-						// sort them by size
-						const diff = b[0] - a[0];
-						if(diff !== 0) return diff;
-						return a[1] - b[1];
-					});
-
-					const pair = sortedExtendedPairCombinations[0];
-
-					if(pair && pair[2].integrate(pair[3], "limit")) {
-						chunks.splice(chunks.indexOf(pair[3]), 1);
-						return true;
-					}
-				}
-			});
-		});
-	}
-}
-module.exports = LimitChunkCountPlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+class LimitChunkCountPlugin {
+	constructor(options) {
+		if(options !== undefined && typeof options !== "object" || Array.isArray(options)) {
+			throw new Error("Argument should be an options object.\nFor more info on options, see https://webpack.js.org/plugins/");
+		}
+		this.options = options || {};
+	}
+	apply(compiler) {
+		const options = this.options;
+		compiler.plugin("compilation", (compilation) => {
+			compilation.plugin("optimize-chunks-advanced", (chunks) => {
+				const maxChunks = options.maxChunks;
+				if(!maxChunks) return;
+				if(maxChunks < 1) return;
+				if(chunks.length <= maxChunks) return;
+
+				if(chunks.length > maxChunks) {
+					const sortedExtendedPairCombinations = chunks.reduce((combinations, a, idx) => {
+						// create combination pairs
+						for(let i = 0; i < idx; i++) {
+							const b = chunks[i];
+							combinations.push([b, a]);
+						}
+						return combinations;
+					}, []).map((pair) => {
+						// extend combination pairs with size and integrated size
+						const a = pair[0].size(options);
+						const b = pair[1].size(options);
+						const ab = pair[0].integratedSize(pair[1], options);
+						return [a + b - ab, ab, pair[0], pair[1], a, b];
+					}).filter((extendedPair) => {
+						// filter pairs that do not have an integratedSize
+						// meaning they can NOT be integrated!
+						return extendedPair[1] !== false;
+					}).sort((a, b) => { // sadly javascript does an inplace sort here
+						// sort them by size
+						const diff = b[0] - a[0];
+						if(diff !== 0) return diff;
+						return a[1] - b[1];
+					});
+
+					const pair = sortedExtendedPairCombinations[0];
+
+					if(pair && pair[2].integrate(pair[3], "limit")) {
+						chunks.splice(chunks.indexOf(pair[3]), 1);
+						return true;
+					}
+				}
+			});
+		});
+	}
+}
+module.exports = LimitChunkCountPlugin;

package/lib/optimize/MinChunkSizePlugin.js

@@ -1,65 +1,65 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-class MinChunkSizePlugin {
-	constructor(options) {
-		if(typeof options !== "object" || Array.isArray(options)) {
-			throw new Error("Argument should be an options object.\nFor more info on options, see https://webpack.js.org/plugins/");
-		}
-		this.options = options;
-	}
-
-	apply(compiler) {
-		const options = this.options;
-		const minChunkSize = options.minChunkSize;
-		compiler.plugin("compilation", (compilation) => {
-			compilation.plugin("optimize-chunks-advanced", (chunks) => {
-				const equalOptions = {
-					chunkOverhead: 1,
-					entryChunkMultiplicator: 1
-				};
-
-				const sortedSizeFilteredExtendedPairCombinations = chunks.reduce((combinations, a, idx) => {
-					// create combination pairs
-					for(let i = 0; i < idx; i++) {
-						const b = chunks[i];
-						combinations.push([b, a]);
-					}
-					return combinations;
-				}, []).filter((pair) => {
-					// check if one of the chunks sizes is smaller than the minChunkSize
-					const p0SmallerThanMinChunkSize = pair[0].size(equalOptions) < minChunkSize;
-					const p1SmallerThanMinChunkSize = pair[1].size(equalOptions) < minChunkSize;
-					return p0SmallerThanMinChunkSize || p1SmallerThanMinChunkSize;
-				}).map((pair) => {
-					// extend combination pairs with size and integrated size
-					const a = pair[0].size(options);
-					const b = pair[1].size(options);
-					const ab = pair[0].integratedSize(pair[1], options);
-					return [a + b - ab, ab, pair[0], pair[1]];
-				}).filter((pair) => {
-					// filter pairs that do not have an integratedSize
-					// meaning they can NOT be integrated!
-					return pair[1] !== false;
-				}).sort((a, b) => { // sadly javascript does an inplace sort here
-					// sort by size
-					const diff = b[0] - a[0];
-					if(diff !== 0) return diff;
-					return a[1] - b[1];
-				});
-
-				if(sortedSizeFilteredExtendedPairCombinations.length === 0) return;
-
-				const pair = sortedSizeFilteredExtendedPairCombinations[0];
-
-				pair[2].integrate(pair[3], "min-size");
-				chunks.splice(chunks.indexOf(pair[3]), 1);
-				return true;
-			});
-		});
-	}
-}
-module.exports = MinChunkSizePlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+class MinChunkSizePlugin {
+	constructor(options) {
+		if(typeof options !== "object" || Array.isArray(options)) {
+			throw new Error("Argument should be an options object.\nFor more info on options, see https://webpack.js.org/plugins/");
+		}
+		this.options = options;
+	}
+
+	apply(compiler) {
+		const options = this.options;
+		const minChunkSize = options.minChunkSize;
+		compiler.plugin("compilation", (compilation) => {
+			compilation.plugin("optimize-chunks-advanced", (chunks) => {
+				const equalOptions = {
+					chunkOverhead: 1,
+					entryChunkMultiplicator: 1
+				};
+
+				const sortedSizeFilteredExtendedPairCombinations = chunks.reduce((combinations, a, idx) => {
+					// create combination pairs
+					for(let i = 0; i < idx; i++) {
+						const b = chunks[i];
+						combinations.push([b, a]);
+					}
+					return combinations;
+				}, []).filter((pair) => {
+					// check if one of the chunks sizes is smaller than the minChunkSize
+					const p0SmallerThanMinChunkSize = pair[0].size(equalOptions) < minChunkSize;
+					const p1SmallerThanMinChunkSize = pair[1].size(equalOptions) < minChunkSize;
+					return p0SmallerThanMinChunkSize || p1SmallerThanMinChunkSize;
+				}).map((pair) => {
+					// extend combination pairs with size and integrated size
+					const a = pair[0].size(options);
+					const b = pair[1].size(options);
+					const ab = pair[0].integratedSize(pair[1], options);
+					return [a + b - ab, ab, pair[0], pair[1]];
+				}).filter((pair) => {
+					// filter pairs that do not have an integratedSize
+					// meaning they can NOT be integrated!
+					return pair[1] !== false;
+				}).sort((a, b) => { // sadly javascript does an inplace sort here
+					// sort by size
+					const diff = b[0] - a[0];
+					if(diff !== 0) return diff;
+					return a[1] - b[1];
+				});
+
+				if(sortedSizeFilteredExtendedPairCombinations.length === 0) return;
+
+				const pair = sortedSizeFilteredExtendedPairCombinations[0];
+
+				pair[2].integrate(pair[3], "min-size");
+				chunks.splice(chunks.indexOf(pair[3]), 1);
+				return true;
+			});
+		});
+	}
+}
+module.exports = MinChunkSizePlugin;

package/lib/optimize/RemoveEmptyChunksPlugin.js

@@ -1,21 +1,21 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-class RemoveEmptyChunksPlugin {
-
-	apply(compiler) {
-		compiler.plugin("compilation", (compilation) => {
-			compilation.plugin(["optimize-chunks-basic", "optimize-extracted-chunks-basic"], (chunks) => {
-				chunks.filter((chunk) => chunk.isEmpty() && !chunk.hasRuntime() && !chunk.hasEntryModule())
-					.forEach((chunk) => {
-						chunk.remove("empty");
-						chunks.splice(chunks.indexOf(chunk), 1);
-					});
-			});
-		});
-	}
-}
-module.exports = RemoveEmptyChunksPlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+class RemoveEmptyChunksPlugin {
+
+	apply(compiler) {
+		compiler.plugin("compilation", (compilation) => {
+			compilation.plugin(["optimize-chunks-basic", "optimize-extracted-chunks-basic"], (chunks) => {
+				chunks.filter((chunk) => chunk.isEmpty() && !chunk.hasRuntime() && !chunk.hasEntryModule())
+					.forEach((chunk) => {
+						chunk.remove("empty");
+						chunks.splice(chunks.indexOf(chunk), 1);
+					});
+			});
+		});
+	}
+}
+module.exports = RemoveEmptyChunksPlugin;

package/lib/optimize/UglifyJsPlugin.js

@@ -1,9 +1,9 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const UglifyJsPlugin = require("uglifyjs-webpack-plugin");
-
-module.exports = UglifyJsPlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const UglifyJsPlugin = require("uglifyjs-webpack-plugin");
+
+module.exports = UglifyJsPlugin;

package/lib/performance/AssetsOverSizeLimitWarning.js

@@ -1,23 +1,23 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Sean Larkin @thelarkinn
-*/
-"use strict";
-
-const WebpackError = require("../WebpackError");
-const SizeFormatHelpers = require("../SizeFormatHelpers");
-
-module.exports = class AssetsOverSizeLimitWarning extends WebpackError {
-	constructor(assetsOverSizeLimit, assetLimit) {
-		super();
-
-		this.name = "AssetsOverSizeLimitWarning";
-		this.assets = assetsOverSizeLimit;
-		const assetLists = this.assets.map(asset => `\n  ${asset.name} (${SizeFormatHelpers.formatSize(asset.size)})`).join("");
-		this.message = `asset size limit: The following asset(s) exceed the recommended size limit (${SizeFormatHelpers.formatSize(assetLimit)}).
-This can impact web performance.
-Assets: ${assetLists}`;
-
-		Error.captureStackTrace(this, this.constructor);
-	}
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Sean Larkin @thelarkinn
+*/
+"use strict";
+
+const WebpackError = require("../WebpackError");
+const SizeFormatHelpers = require("../SizeFormatHelpers");
+
+module.exports = class AssetsOverSizeLimitWarning extends WebpackError {
+	constructor(assetsOverSizeLimit, assetLimit) {
+		super();
+
+		this.name = "AssetsOverSizeLimitWarning";
+		this.assets = assetsOverSizeLimit;
+		const assetLists = this.assets.map(asset => `\n  ${asset.name} (${SizeFormatHelpers.formatSize(asset.size)})`).join("");
+		this.message = `asset size limit: The following asset(s) exceed the recommended size limit (${SizeFormatHelpers.formatSize(assetLimit)}).
+This can impact web performance.
+Assets: ${assetLists}`;
+
+		Error.captureStackTrace(this, this.constructor);
+	}
+};

package/lib/performance/EntrypointsOverSizeLimitWarning.js

@@ -1,28 +1,28 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Sean Larkin @thelarkinn
-*/
-"use strict";
-
-const WebpackError = require("../WebpackError");
-const SizeFormatHelpers = require("../SizeFormatHelpers");
-
-module.exports = class EntrypointsOverSizeLimitWarning extends WebpackError {
-	constructor(entrypoints, entrypointLimit) {
-		super();
-
-		this.name = "EntrypointsOverSizeLimitWarning";
-		this.entrypoints = entrypoints;
-		const entrypointList = this.entrypoints.map(entrypoint => `\n  ${
-			entrypoint.name
-		} (${
-			SizeFormatHelpers.formatSize(entrypoint.size)
-		})\n${
-			entrypoint.files.map(asset => `      ${asset}`).join("\n")
-		}`).join("");
-		this.message = `entrypoint size limit: The following entrypoint(s) combined asset size exceeds the recommended limit (${SizeFormatHelpers.formatSize(entrypointLimit)}). This can impact web performance.
-Entrypoints:${entrypointList}\n`;
-
-		Error.captureStackTrace(this, this.constructor);
-	}
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Sean Larkin @thelarkinn
+*/
+"use strict";
+
+const WebpackError = require("../WebpackError");
+const SizeFormatHelpers = require("../SizeFormatHelpers");
+
+module.exports = class EntrypointsOverSizeLimitWarning extends WebpackError {
+	constructor(entrypoints, entrypointLimit) {
+		super();
+
+		this.name = "EntrypointsOverSizeLimitWarning";
+		this.entrypoints = entrypoints;
+		const entrypointList = this.entrypoints.map(entrypoint => `\n  ${
+			entrypoint.name
+		} (${
+			SizeFormatHelpers.formatSize(entrypoint.size)
+		})\n${
+			entrypoint.files.map(asset => `      ${asset}`).join("\n")
+		}`).join("");
+		this.message = `entrypoint size limit: The following entrypoint(s) combined asset size exceeds the recommended limit (${SizeFormatHelpers.formatSize(entrypointLimit)}). This can impact web performance.
+Entrypoints:${entrypointList}\n`;
+
+		Error.captureStackTrace(this, this.constructor);
+	}
+};

package/lib/performance/NoAsyncChunksWarning.js

@@ -1,20 +1,20 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Sean Larkin @thelarkinn
-*/
-"use strict";
-
-const WebpackError = require("../WebpackError");
-
-module.exports = class NoAsyncChunksWarning extends WebpackError {
-	constructor() {
-		super();
-
-		this.name = "NoAsyncChunksWarning";
-		this.message = "webpack performance recommendations: \n" +
-			"You can limit the size of your bundles by using import() or require.ensure to lazy load some parts of your application.\n" +
-			"For more info visit https://webpack.js.org/guides/code-splitting/";
-
-		Error.captureStackTrace(this, this.constructor);
-	}
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Sean Larkin @thelarkinn
+*/
+"use strict";
+
+const WebpackError = require("../WebpackError");
+
+module.exports = class NoAsyncChunksWarning extends WebpackError {
+	constructor() {
+		super();
+
+		this.name = "NoAsyncChunksWarning";
+		this.message = "webpack performance recommendations: \n" +
+			"You can limit the size of your bundles by using import() or require.ensure to lazy load some parts of your application.\n" +
+			"For more info visit https://webpack.js.org/guides/code-splitting/";
+
+		Error.captureStackTrace(this, this.constructor);
+	}
+};