webpack 4.15.0 → 4.16.2

package/lib/wasm/WebAssemblyUtils.js

@@ -1,59 +1,59 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const Template = require("../Template");
-const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
-
-/** @typedef {import("../Module")} Module */
-
-/** @typedef {Object} UsedWasmDependency
- * @property {WebAssemblyImportDependency} dependency the dependency
- * @property {string} name the export name
- * @property {string} module the module name
- */
-
-const MANGLED_MODULE = "a";
-
-/**
- * @param {Module} module the module
- * @param {boolean} mangle mangle module and export names
- * @returns {UsedWasmDependency[]} used dependencies and (mangled) name
- */
-const getUsedDependencies = (module, mangle) => {
-	/** @type {UsedWasmDependency[]} */
-	const array = [];
-	let importIndex = 0;
-	for (const dep of module.dependencies) {
-		if (dep instanceof WebAssemblyImportDependency) {
-			if (dep.description.type === "GlobalType" || dep.module === null) {
-				continue;
-			}
-
-			const exportName = dep.name;
-			// TODO add the following 3 lines when removing of ModuleExport is possible
-			// const importedModule = dep.module;
-			// const usedName = importedModule && importedModule.isUsed(exportName);
-			// if (usedName !== false) {
-			if (mangle) {
-				array.push({
-					dependency: dep,
-					name: Template.numberToIdentifer(importIndex++),
-					module: MANGLED_MODULE
-				});
-			} else {
-				array.push({
-					dependency: dep,
-					name: exportName,
-					module: dep.request
-				});
-			}
-		}
-	}
-	return array;
-};
-
-exports.getUsedDependencies = getUsedDependencies;
-exports.MANGLED_MODULE = MANGLED_MODULE;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const Template = require("../Template");
+const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
+
+/** @typedef {import("../Module")} Module */
+
+/** @typedef {Object} UsedWasmDependency
+ * @property {WebAssemblyImportDependency} dependency the dependency
+ * @property {string} name the export name
+ * @property {string} module the module name
+ */
+
+const MANGLED_MODULE = "a";
+
+/**
+ * @param {Module} module the module
+ * @param {boolean} mangle mangle module and export names
+ * @returns {UsedWasmDependency[]} used dependencies and (mangled) name
+ */
+const getUsedDependencies = (module, mangle) => {
+	/** @type {UsedWasmDependency[]} */
+	const array = [];
+	let importIndex = 0;
+	for (const dep of module.dependencies) {
+		if (dep instanceof WebAssemblyImportDependency) {
+			if (dep.description.type === "GlobalType" || dep.module === null) {
+				continue;
+			}
+
+			const exportName = dep.name;
+			// TODO add the following 3 lines when removing of ModuleExport is possible
+			// const importedModule = dep.module;
+			// const usedName = importedModule && importedModule.isUsed(exportName);
+			// if (usedName !== false) {
+			if (mangle) {
+				array.push({
+					dependency: dep,
+					name: Template.numberToIdentifer(importIndex++),
+					module: MANGLED_MODULE
+				});
+			} else {
+				array.push({
+					dependency: dep,
+					name: exportName,
+					module: dep.request
+				});
+			}
+		}
+	}
+	return array;
+};
+
+exports.getUsedDependencies = getUsedDependencies;
+exports.MANGLED_MODULE = MANGLED_MODULE;

package/lib/web/FetchCompileWasmTemplatePlugin.js

@@ -1,37 +1,37 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const WasmMainTemplatePlugin = require("../wasm/WasmMainTemplatePlugin");
-
-class FetchCompileWasmTemplatePlugin {
-	constructor(options) {
-		this.options = options || {};
-	}
-
-	apply(compiler) {
-		compiler.hooks.thisCompilation.tap(
-			"FetchCompileWasmTemplatePlugin",
-			compilation => {
-				const mainTemplate = compilation.mainTemplate;
-				const generateLoadBinaryCode = path =>
-					`fetch(${mainTemplate.requireFn}.p + ${path})`;
-
-				const plugin = new WasmMainTemplatePlugin(
-					Object.assign(
-						{
-							generateLoadBinaryCode,
-							supportsStreaming: true
-						},
-						this.options
-					)
-				);
-				plugin.apply(mainTemplate);
-			}
-		);
-	}
-}
-
-module.exports = FetchCompileWasmTemplatePlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const WasmMainTemplatePlugin = require("../wasm/WasmMainTemplatePlugin");
+
+class FetchCompileWasmTemplatePlugin {
+	constructor(options) {
+		this.options = options || {};
+	}
+
+	apply(compiler) {
+		compiler.hooks.thisCompilation.tap(
+			"FetchCompileWasmTemplatePlugin",
+			compilation => {
+				const mainTemplate = compilation.mainTemplate;
+				const generateLoadBinaryCode = path =>
+					`fetch(${mainTemplate.requireFn}.p + ${path})`;
+
+				const plugin = new WasmMainTemplatePlugin(
+					Object.assign(
+						{
+							generateLoadBinaryCode,
+							supportsStreaming: true
+						},
+						this.options
+					)
+				);
+				plugin.apply(mainTemplate);
+			}
+		);
+	}
+}
+
+module.exports = FetchCompileWasmTemplatePlugin;

package/lib/web/JsonpExportMainTemplatePlugin.js

@@ -1,47 +1,47 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const { ConcatSource } = require("webpack-sources");
-
-class JsonpExportMainTemplatePlugin {
-	constructor(name) {
-		this.name = name;
-	}
-
-	apply(compilation) {
-		const { mainTemplate, chunkTemplate } = compilation;
-
-		const onRenderWithEntry = (source, chunk, hash) => {
-			const name = mainTemplate.getAssetPath(this.name || "", {
-				hash,
-				chunk
-			});
-			return new ConcatSource(`${name}(`, source, ");");
-		};
-
-		for (const template of [mainTemplate, chunkTemplate]) {
-			template.hooks.renderWithEntry.tap(
-				"JsonpExportMainTemplatePlugin",
-				onRenderWithEntry
-			);
-		}
-
-		mainTemplate.hooks.globalHashPaths.tap(
-			"JsonpExportMainTemplatePlugin",
-			paths => {
-				if (this.name) paths.push(this.name);
-				return paths;
-			}
-		);
-
-		mainTemplate.hooks.hash.tap("JsonpExportMainTemplatePlugin", hash => {
-			hash.update("jsonp export");
-			hash.update(`${this.name}`);
-		});
-	}
-}
-
-module.exports = JsonpExportMainTemplatePlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const { ConcatSource } = require("webpack-sources");
+
+class JsonpExportMainTemplatePlugin {
+	constructor(name) {
+		this.name = name;
+	}
+
+	apply(compilation) {
+		const { mainTemplate, chunkTemplate } = compilation;
+
+		const onRenderWithEntry = (source, chunk, hash) => {
+			const name = mainTemplate.getAssetPath(this.name || "", {
+				hash,
+				chunk
+			});
+			return new ConcatSource(`${name}(`, source, ");");
+		};
+
+		for (const template of [mainTemplate, chunkTemplate]) {
+			template.hooks.renderWithEntry.tap(
+				"JsonpExportMainTemplatePlugin",
+				onRenderWithEntry
+			);
+		}
+
+		mainTemplate.hooks.globalHashPaths.tap(
+			"JsonpExportMainTemplatePlugin",
+			paths => {
+				if (this.name) paths.push(this.name);
+				return paths;
+			}
+		);
+
+		mainTemplate.hooks.hash.tap("JsonpExportMainTemplatePlugin", hash => {
+			hash.update("jsonp export");
+			hash.update(`${this.name}`);
+		});
+	}
+}
+
+module.exports = JsonpExportMainTemplatePlugin;

package/lib/web/JsonpHotUpdateChunkTemplatePlugin.js

@@ -1,39 +1,39 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const { ConcatSource } = require("webpack-sources");
-
-class JsonpHotUpdateChunkTemplatePlugin {
-	apply(hotUpdateChunkTemplate) {
-		hotUpdateChunkTemplate.hooks.render.tap(
-			"JsonpHotUpdateChunkTemplatePlugin",
-			(modulesSource, modules, removedModules, hash, id) => {
-				const source = new ConcatSource();
-				source.add(
-					`${
-						hotUpdateChunkTemplate.outputOptions.hotUpdateFunction
-					}(${JSON.stringify(id)},`
-				);
-				source.add(modulesSource);
-				source.add(")");
-				return source;
-			}
-		);
-		hotUpdateChunkTemplate.hooks.hash.tap(
-			"JsonpHotUpdateChunkTemplatePlugin",
-			hash => {
-				hash.update("JsonpHotUpdateChunkTemplatePlugin");
-				hash.update("3");
-				hash.update(
-					`${hotUpdateChunkTemplate.outputOptions.hotUpdateFunction}`
-				);
-				hash.update(`${hotUpdateChunkTemplate.outputOptions.library}`);
-			}
-		);
-	}
-}
-
-module.exports = JsonpHotUpdateChunkTemplatePlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const { ConcatSource } = require("webpack-sources");
+
+class JsonpHotUpdateChunkTemplatePlugin {
+	apply(hotUpdateChunkTemplate) {
+		hotUpdateChunkTemplate.hooks.render.tap(
+			"JsonpHotUpdateChunkTemplatePlugin",
+			(modulesSource, modules, removedModules, hash, id) => {
+				const source = new ConcatSource();
+				source.add(
+					`${
+						hotUpdateChunkTemplate.outputOptions.hotUpdateFunction
+					}(${JSON.stringify(id)},`
+				);
+				source.add(modulesSource);
+				source.add(")");
+				return source;
+			}
+		);
+		hotUpdateChunkTemplate.hooks.hash.tap(
+			"JsonpHotUpdateChunkTemplatePlugin",
+			hash => {
+				hash.update("JsonpHotUpdateChunkTemplatePlugin");
+				hash.update("3");
+				hash.update(
+					`${hotUpdateChunkTemplate.outputOptions.hotUpdateFunction}`
+				);
+				hash.update(`${hotUpdateChunkTemplate.outputOptions.library}`);
+			}
+		);
+	}
+}
+
+module.exports = JsonpHotUpdateChunkTemplatePlugin;

package/lib/web/JsonpMainTemplate.runtime.js

@@ -1,65 +1,65 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-/*globals hotAddUpdateChunk parentHotUpdateCallback document XMLHttpRequest $require$ $hotChunkFilename$ $hotMainFilename$ $crossOriginLoading$ */
-module.exports = function() {
-	// eslint-disable-next-line no-unused-vars
-	function webpackHotUpdateCallback(chunkId, moreModules) {
-		hotAddUpdateChunk(chunkId, moreModules);
-		if (parentHotUpdateCallback) parentHotUpdateCallback(chunkId, moreModules);
-	} //$semicolon
-
-	// eslint-disable-next-line no-unused-vars
-	function hotDownloadUpdateChunk(chunkId) {
-		var head = document.getElementsByTagName("head")[0];
-		var script = document.createElement("script");
-		script.charset = "utf-8";
-		script.src = $require$.p + $hotChunkFilename$;
-		$crossOriginLoading$;
-		head.appendChild(script);
-	}
-
-	// eslint-disable-next-line no-unused-vars
-	function hotDownloadManifest(requestTimeout) {
-		requestTimeout = requestTimeout || 10000;
-		return new Promise(function(resolve, reject) {
-			if (typeof XMLHttpRequest === "undefined") {
-				return reject(new Error("No browser support"));
-			}
-			try {
-				var request = new XMLHttpRequest();
-				var requestPath = $require$.p + $hotMainFilename$;
-				request.open("GET", requestPath, true);
-				request.timeout = requestTimeout;
-				request.send(null);
-			} catch (err) {
-				return reject(err);
-			}
-			request.onreadystatechange = function() {
-				if (request.readyState !== 4) return;
-				if (request.status === 0) {
-					// timeout
-					reject(
-						new Error("Manifest request to " + requestPath + " timed out.")
-					);
-				} else if (request.status === 404) {
-					// no update available
-					resolve();
-				} else if (request.status !== 200 && request.status !== 304) {
-					// other failure
-					reject(new Error("Manifest request to " + requestPath + " failed."));
-				} else {
-					// success
-					try {
-						var update = JSON.parse(request.responseText);
-					} catch (e) {
-						reject(e);
-						return;
-					}
-					resolve(update);
-				}
-			};
-		});
-	}
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+/*globals hotAddUpdateChunk parentHotUpdateCallback document XMLHttpRequest $require$ $hotChunkFilename$ $hotMainFilename$ $crossOriginLoading$ */
+module.exports = function() {
+	// eslint-disable-next-line no-unused-vars
+	function webpackHotUpdateCallback(chunkId, moreModules) {
+		hotAddUpdateChunk(chunkId, moreModules);
+		if (parentHotUpdateCallback) parentHotUpdateCallback(chunkId, moreModules);
+	} //$semicolon
+
+	// eslint-disable-next-line no-unused-vars
+	function hotDownloadUpdateChunk(chunkId) {
+		var head = document.getElementsByTagName("head")[0];
+		var script = document.createElement("script");
+		script.charset = "utf-8";
+		script.src = $require$.p + $hotChunkFilename$;
+		$crossOriginLoading$;
+		head.appendChild(script);
+	}
+
+	// eslint-disable-next-line no-unused-vars
+	function hotDownloadManifest(requestTimeout) {
+		requestTimeout = requestTimeout || 10000;
+		return new Promise(function(resolve, reject) {
+			if (typeof XMLHttpRequest === "undefined") {
+				return reject(new Error("No browser support"));
+			}
+			try {
+				var request = new XMLHttpRequest();
+				var requestPath = $require$.p + $hotMainFilename$;
+				request.open("GET", requestPath, true);
+				request.timeout = requestTimeout;
+				request.send(null);
+			} catch (err) {
+				return reject(err);
+			}
+			request.onreadystatechange = function() {
+				if (request.readyState !== 4) return;
+				if (request.status === 0) {
+					// timeout
+					reject(
+						new Error("Manifest request to " + requestPath + " timed out.")
+					);
+				} else if (request.status === 404) {
+					// no update available
+					resolve();
+				} else if (request.status !== 200 && request.status !== 304) {
+					// other failure
+					reject(new Error("Manifest request to " + requestPath + " failed."));
+				} else {
+					// success
+					try {
+						var update = JSON.parse(request.responseText);
+					} catch (e) {
+						reject(e);
+						return;
+					}
+					resolve(update);
+				}
+			};
+		});
+	}
+};

package/lib/web/JsonpMainTemplatePlugin.js

@@ -556,7 +556,7 @@ class JsonpMainTemplatePlugin {
 					}
 				);
 				const runtimeSource = Template.getFunctionContent(
-					require("./JsonpMainTemplate.runtime.js")
+					require("./JsonpMainTemplate.runtime")
 				)
 					.replace(/\/\/\$semicolon/g, ";")
 					.replace(/\$require\$/g, mainTemplate.requireFn)

package/lib/web/JsonpTemplatePlugin.js

@@ -1,23 +1,23 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const JsonpMainTemplatePlugin = require("./JsonpMainTemplatePlugin");
-const JsonpChunkTemplatePlugin = require("./JsonpChunkTemplatePlugin");
-const JsonpHotUpdateChunkTemplatePlugin = require("./JsonpHotUpdateChunkTemplatePlugin");
-
-class JsonpTemplatePlugin {
-	apply(compiler) {
-		compiler.hooks.thisCompilation.tap("JsonpTemplatePlugin", compilation => {
-			new JsonpMainTemplatePlugin().apply(compilation.mainTemplate);
-			new JsonpChunkTemplatePlugin().apply(compilation.chunkTemplate);
-			new JsonpHotUpdateChunkTemplatePlugin().apply(
-				compilation.hotUpdateChunkTemplate
-			);
-		});
-	}
-}
-
-module.exports = JsonpTemplatePlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const JsonpMainTemplatePlugin = require("./JsonpMainTemplatePlugin");
+const JsonpChunkTemplatePlugin = require("./JsonpChunkTemplatePlugin");
+const JsonpHotUpdateChunkTemplatePlugin = require("./JsonpHotUpdateChunkTemplatePlugin");
+
+class JsonpTemplatePlugin {
+	apply(compiler) {
+		compiler.hooks.thisCompilation.tap("JsonpTemplatePlugin", compilation => {
+			new JsonpMainTemplatePlugin().apply(compilation.mainTemplate);
+			new JsonpChunkTemplatePlugin().apply(compilation.chunkTemplate);
+			new JsonpHotUpdateChunkTemplatePlugin().apply(
+				compilation.hotUpdateChunkTemplate
+			);
+		});
+	}
+}
+
+module.exports = JsonpTemplatePlugin;

package/lib/web/WebEnvironmentPlugin.js

@@ -1,18 +1,18 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-class WebEnvironmentPlugin {
-	constructor(inputFileSystem, outputFileSystem) {
-		this.inputFileSystem = inputFileSystem;
-		this.outputFileSystem = outputFileSystem;
-	}
-
-	apply(compiler) {
-		compiler.outputFileSystem = this.outputFileSystem;
-	}
-}
-
-module.exports = WebEnvironmentPlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+class WebEnvironmentPlugin {
+	constructor(inputFileSystem, outputFileSystem) {
+		this.inputFileSystem = inputFileSystem;
+		this.outputFileSystem = outputFileSystem;
+	}
+
+	apply(compiler) {
+		compiler.outputFileSystem = this.outputFileSystem;
+	}
+}
+
+module.exports = WebEnvironmentPlugin;

package/lib/webpack.js

@@ -69,6 +69,7 @@ webpack.WebpackOptionsApply = WebpackOptionsApply;
 webpack.Compiler = Compiler;
 webpack.MultiCompiler = MultiCompiler;
 webpack.NodeEnvironmentPlugin = NodeEnvironmentPlugin;
+// @ts-ignore Global @this directive is not supported
 webpack.validate = validateSchema.bind(this, webpackOptionsSchema);
 webpack.validateSchema = validateSchema;
 webpack.WebpackOptionsValidationError = WebpackOptionsValidationError;
@@ -137,6 +138,10 @@ exportPlugins((exports.optimize = {}), {
 	ModuleConcatenationPlugin: () =>
 		require("./optimize/ModuleConcatenationPlugin"),
 	OccurrenceOrderPlugin: () => require("./optimize/OccurrenceOrderPlugin"),
+	OccurrenceModuleOrderPlugin: () =>
+		require("./optimize/OccurrenceModuleOrderPlugin"),
+	OccurrenceChunkOrderPlugin: () =>
+		require("./optimize/OccurrenceChunkOrderPlugin"),
 	RuntimeChunkPlugin: () => require("./optimize/RuntimeChunkPlugin"),
 	SideEffectsFlagPlugin: () => require("./optimize/SideEffectsFlagPlugin"),
 	SplitChunksPlugin: () => require("./optimize/SplitChunksPlugin")