webpack 4.20.2 → 4.23.1

package/lib/Watching.js

@@ -50,7 +50,6 @@ class Watching {
 				this.compiler.emitAssets(compilation, err => {
 					if (err) return this._done(err);
 					if (this.invalid) return this._done();
-
 					this.compiler.emitRecords(err => {
 						if (err) return this._done(err);
 
@@ -95,7 +94,6 @@ class Watching {
 			this.handler(err, stats);
 			return;
 		}
-
 		this.compiler.hooks.done.callAsync(stats, () => {
 			this.handler(null, stats);
 			if (!this.closed) {
@@ -124,7 +122,8 @@ class Watching {
 				contextModified,
 				missingModified,
 				fileTimestamps,
-				contextTimestamps
+				contextTimestamps,
+				removedFiles
 			) => {
 				this.pausedWatcher = this.watcher;
 				this.watcher = null;
@@ -133,6 +132,7 @@ class Watching {
 				}
 				this.compiler.fileTimestamps = fileTimestamps;
 				this.compiler.contextTimestamps = contextTimestamps;
+				this.compiler.removedFiles = removedFiles;
 				this._invalidate();
 			},
 			(fileName, changeTime) => {
@@ -170,6 +170,7 @@ class Watching {
 		const finalCallback = () => {
 			this.compiler.hooks.watchClose.call();
 			this.compiler.running = false;
+			this.compiler.watchMode = false;
 			if (callback !== undefined) callback();
 		};
 

package/lib/dependencies/WebAssemblyExportImportedDependency.js

@@ -8,12 +8,14 @@ const DependencyReference = require("./DependencyReference");
 const ModuleDependency = require("./ModuleDependency");
 
 class WebAssemblyExportImportedDependency extends ModuleDependency {
-	constructor(exportName, request, name) {
+	constructor(exportName, request, name, valueType) {
 		super(request);
 		/** @type {string} */
 		this.exportName = exportName;
 		/** @type {string} */
 		this.name = name;
+		/** @type {string} */
+		this.valueType = valueType;
 	}
 
 	getReference() {

package/lib/node/NodeWatchFileSystem.js

@@ -44,24 +44,34 @@ class NodeWatchFileSystem {
 		if (callbackUndelayed) {
 			this.watcher.once("change", callbackUndelayed);
 		}
-
+		const cachedFiles = files;
+		const cachedDirs = dirs;
 		this.watcher.once("aggregated", (changes, removals) => {
 			changes = changes.concat(removals);
 			if (this.inputFileSystem && this.inputFileSystem.purge) {
 				this.inputFileSystem.purge(changes);
 			}
 			const times = objectToMap(this.watcher.getTimes());
+			files = new Set(files);
+			dirs = new Set(dirs);
+			missing = new Set(missing);
+			removals = new Set(removals.filter(file => files.has(file)));
 			callback(
 				null,
-				changes.filter(file => files.includes(file)).sort(),
-				changes.filter(file => dirs.includes(file)).sort(),
-				changes.filter(file => missing.includes(file)).sort(),
+				changes.filter(file => files.has(file)).sort(),
+				changes.filter(file => dirs.has(file)).sort(),
+				changes.filter(file => missing.has(file)).sort(),
+				times,
 				times,
-				times
+				removals
 			);
 		});
 
-		this.watcher.watch(files.concat(missing), dirs.concat(missing), startTime);
+		this.watcher.watch(
+			cachedFiles.concat(missing),
+			cachedDirs.concat(missing),
+			startTime
+		);
 
 		if (oldWatcher) {
 			oldWatcher.close();

package/lib/optimize/LimitChunkCountPlugin.js

@@ -30,11 +30,13 @@ class LimitChunkCountPlugin {
 					if (maxChunks < 1) return;
 					if (chunks.length <= maxChunks) return;
 
-					const sortedExtendedPairCombinations = chunks
+					const orderedChunks = chunks.slice().sort((a, b) => a.compareTo(b));
+
+					const sortedExtendedPairCombinations = orderedChunks
 						.reduce((combinations, a, idx) => {
 							// create combination pairs
 							for (let i = 0; i < idx; i++) {
-								const b = chunks[i];
+								const b = orderedChunks[i];
 								combinations.push([b, a]);
 							}
 							return combinations;
@@ -54,9 +56,13 @@ class LimitChunkCountPlugin {
 						.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 diff1 = b[0] - a[0];
+							if (diff1 !== 0) return diff1;
+							const diff2 = a[1] - b[1];
+							if (diff2 !== 0) return diff2;
+							const diff3 = a[2].compareTo(b[2]);
+							if (diff3 !== 0) return diff3;
+							return a[3].compareTo(b[3]);
 						});
 
 					const pair = sortedExtendedPairCombinations[0];

package/lib/optimize/OccurrenceModuleOrderPlugin.js

@@ -46,7 +46,11 @@ class OccurrenceOrderModuleIdsPlugin {
 							if (!r.module) {
 								return sum;
 							}
-							return sum + initialChunkChunkMap.get(r.module);
+							const count = initialChunkChunkMap.get(r.module);
+							if (!count) {
+								return sum;
+							}
+							return sum + count;
 						};
 						const countOccurs = (sum, r) => {
 							if (!r.module) {

package/lib/wasm/WasmFinalizeExportsPlugin.js

@@ -30,6 +30,8 @@ class WasmFinalizeExportsPlugin {
 										reason.dependency
 									);
 
+									if (!ref) continue;
+
 									const importedNames = ref.importedNames;
 
 									if (Array.isArray(importedNames)) {

package/lib/wasm/WebAssemblyJavascriptGenerator.js

@@ -78,10 +78,11 @@ class WebAssemblyJavascriptGenerator extends Generator {
 					importData.names.add(dep.name);
 					const usedName = module.isUsed(dep.exportName);
 					if (usedName) {
+						const exportProp = `${module.exportsArgument}[${JSON.stringify(
+							usedName
+						)}]`;
 						const defineStatement = Template.asString([
-							`${module.exportsArgument}[${JSON.stringify(
-								usedName
-							)}] = ${runtimeTemplate.exportFromImport({
+							`${exportProp} = ${runtimeTemplate.exportFromImport({
 								module: dep.module,
 								request: dep.request,
 								importVar: importData.importVar,
@@ -90,7 +91,11 @@ class WebAssemblyJavascriptGenerator extends Generator {
 								asiSafe: true,
 								isCall: false,
 								callContext: null
-							})};`
+							})};`,
+							`if(WebAssembly.Global) ${exportProp} = ` +
+								`new WebAssembly.Global({ value: ${JSON.stringify(
+									dep.valueType
+								)} }, ${exportProp});`
 						]);
 						importData.reexports.push(defineStatement);
 						needExportsCopy = true;

package/lib/wasm/WebAssemblyParser.js

@@ -108,7 +108,8 @@ class WebAssemblyParser extends Tapable {
 						const dep = new WebAssemblyExportImportedDependency(
 							node.name,
 							refNode.module,
-							refNode.name
+							refNode.name,
+							refNode.descr.valtype
 						);
 
 						state.module.addDependency(dep);

package/lib/web/JsonpMainTemplate.runtime.js

@@ -16,7 +16,7 @@ module.exports = function() {
 		var script = document.createElement("script");
 		script.charset = "utf-8";
 		script.src = $require$.p + $hotChunkFilename$;
-		$crossOriginLoading$;
+		if ($crossOriginLoading$) script.crossOrigin = $crossOriginLoading$;
 		head.appendChild(script);
 	}
 

package/lib/web/JsonpMainTemplatePlugin.js

@@ -562,9 +562,7 @@ class JsonpMainTemplatePlugin {
 					.replace(/\$require\$/g, mainTemplate.requireFn)
 					.replace(
 						/\$crossOriginLoading\$/g,
-						crossOriginLoading
-							? `script.crossOrigin = ${JSON.stringify(crossOriginLoading)}`
-							: ""
+						crossOriginLoading ? JSON.stringify(crossOriginLoading) : "null"
 					)
 					.replace(/\$hotMainFilename\$/g, currentHotUpdateMainFilename)
 					.replace(/\$hotChunkFilename\$/g, currentHotUpdateChunkFilename)

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "webpack",
-  "version": "4.20.2",
+  "version": "4.23.1",
   "author": "Tobias Koppers @sokra",
   "description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",
   "dependencies": {
-    "@webassemblyjs/ast": "1.7.8",
-    "@webassemblyjs/helper-module-context": "1.7.8",
-    "@webassemblyjs/wasm-edit": "1.7.8",
-    "@webassemblyjs/wasm-parser": "1.7.8",
+    "@webassemblyjs/ast": "1.7.10",
+    "@webassemblyjs/helper-module-context": "1.7.10",
+    "@webassemblyjs/wasm-edit": "1.7.10",
+    "@webassemblyjs/wasm-parser": "1.7.10",
     "acorn": "^5.6.2",
     "acorn-dynamic-import": "^3.0.0",
     "ajv": "^6.1.0",
@@ -39,7 +39,7 @@
     "codacy-coverage": "^2.0.1",
     "coffee-loader": "^0.9.0",
     "coffeescript": "^1.10.0",
-    "coveralls": "^2.11.2",
+    "coveralls": "^3.0.2",
     "css-loader": "^0.28.3",
     "es6-promise-polyfill": "^1.1.1",
     "eslint": "^5.2.0",
@@ -55,8 +55,7 @@
     "istanbul": "^0.4.5",
     "jade": "^1.11.0",
     "jade-loader": "~0.8.0",
-    "jest": "^23.4.1",
-    "jest-silent-reporter": "^0.0.5",
+    "jest": "24.0.0-alpha.1",
     "json-loader": "^0.5.7",
     "json-schema-to-typescript": "^6.0.1",
     "less": "^2.5.1",
@@ -97,6 +96,7 @@
     "lib/",
     "bin/",
     "buildin/",
+    "declarations/",
     "hot/",
     "web_modules/",
     "schemas/",
@@ -109,11 +109,11 @@
     "test:integration": "node --max-old-space-size=4096 --trace-deprecation node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.test.js\"",
     "test:basic": "node --max-old-space-size=4096 --trace-deprecation node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/{TestCasesNormal,StatsTestCases,ConfigTestCases}.test.js\"",
     "test:unit": "node --max-old-space-size=4096 --trace-deprecation node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.unittest.js\"",
-    "travis:integration": "yarn cover:init && yarn cover:integration \"test/(?!TestCases)\" --ci $JEST && mv coverage/coverage-final.json coverage/coverage-final-1.json && yarn cover:integration \"test/TestCasesD\" --ci $JEST && mv coverage/coverage-final.json coverage/coverage-final-2.json && yarn cover:integration \"test/TestCases(?!D)\" --ci $JEST && mv coverage/coverage-final.json coverage/coverage-final-3.json",
+    "travis:integration": "yarn cover:init && yarn cover:integration --ci $JEST",
     "travis:basic": "yarn test:basic --ci $JEST",
     "travis:lint-unit": "yarn lint && yarn cover:init && yarn cover:unit --ci $JEST",
     "travis:benchmark": "yarn benchmark --ci",
-    "appveyor:integration": "yarn cover:init && yarn cover:integration \"test/(?!TestCases)\" --ci %JEST% && move coverage\\coverage-final.json coverage\\coverage-final-1.json&& yarn cover:integration \"test/TestCasesD\" --ci %JEST% && move coverage\\coverage-final.json coverage\\coverage-final-2.json && yarn cover:integration \"test/TestCases(?!D)\" --ci %JEST% && move coverage\\coverage-final.json coverage\\coverage-final-3.json",
+    "appveyor:integration": "yarn cover:init && yarn cover:integration --ci %JEST%",
     "appveyor:unit": "yarn cover:init && yarn cover:unit --ci %JEST%",
     "appveyor:benchmark": "yarn benchmark --ci",
     "build:examples": "cd examples && node buildAll.js",
@@ -125,7 +125,7 @@
     "special-lint": "node tooling/inherit-types && node tooling/format-schemas && node tooling/compile-to-definitions",
     "special-lint-fix": "node tooling/inherit-types --write --override && node tooling/format-schemas --write && node tooling/compile-to-definitions --write",
     "fix": "yarn code-lint --fix && yarn special-lint-fix",
-    "pretty": "prettier --loglevel warn --write \"*.{ts,js,json}\" \"{setup,lib,bin,hot,buildin,benchmark,tooling,schemas}/**/*.{js,json}\" \"test/*.js\" \"test/{configCases,watchCases,statsCases,hotCases}/**/webpack.config.js\" \"examples/**/webpack.config.js\"",
+    "pretty": "prettier --loglevel warn --write \"*.{ts,js,json,yml,yaml}\" \"{setup,lib,bin,hot,buildin,benchmark,tooling,schemas}/**/*.{js,json}\" \"test/*.js\" \"test/{configCases,watchCases,statsCases,hotCases}/**/webpack.config.js\" \"examples/**/webpack.config.js\"",
     "schema-lint": "node --max-old-space-size=4096 node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.lint.js\" --no-verbose",
     "benchmark": "node --max-old-space-size=4096 --trace-deprecation node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.benchmark.js\" --runInBand",
     "cover": "yarn cover:init && yarn cover:all && yarn cover:report",
@@ -147,7 +147,9 @@
   },
   "jest": {
     "forceExit": true,
-    "setupTestFrameworkScriptFile": "<rootDir>/test/setupTestFramework.js",
+    "setupFilesAfterEnv": [
+      "<rootDir>/test/setupTestFramework.js"
+    ],
     "testMatch": [
       "<rootDir>/test/*.test.js",
       "<rootDir>/test/*.unittest.js"

package/schemas/WebpackOptions.json

@@ -979,6 +979,7 @@
             "commonjs2",
             "commonjs-module",
             "amd",
+            "amd-require",
             "umd",
             "umd2",
             "jsonp"

package/schemas/ajv.absolutePath.js

@@ -1,55 +1,55 @@
-"use strict";
-
-const errorMessage = (schema, data, message) => ({
-	keyword: "absolutePath",
-	params: { absolutePath: data },
-	message: message,
-	parentSchema: schema
-});
-
-const getErrorFor = (shouldBeAbsolute, data, schema) => {
-	const message = shouldBeAbsolute
-		? `The provided value ${JSON.stringify(data)} is not an absolute path!`
-		: `A relative path is expected. However, the provided value ${JSON.stringify(
-				data
-		  )} is an absolute path!`;
-
-	return errorMessage(schema, data, message);
-};
-
-module.exports = ajv =>
-	ajv.addKeyword("absolutePath", {
-		errors: true,
-		type: "string",
-		compile(expected, schema) {
-			function callback(data) {
-				let passes = true;
-				const isExclamationMarkPresent = data.includes("!");
-				const isCorrectAbsoluteOrRelativePath =
-					expected === /^(?:[A-Za-z]:\\|\/)/.test(data);
-
-				if (isExclamationMarkPresent) {
-					callback.errors = [
-						errorMessage(
-							schema,
-							data,
-							`The provided value ${JSON.stringify(
-								data
-							)} contans exclamation mark (!) which is not allowed because it's reserved for loader syntax.`
-						)
-					];
-					passes = false;
-				}
-
-				if (!isCorrectAbsoluteOrRelativePath) {
-					callback.errors = [getErrorFor(expected, data, schema)];
-					passes = false;
-				}
-
-				return passes;
-			}
-			callback.errors = [];
-
-			return callback;
-		}
-	});
+"use strict";
+
+const errorMessage = (schema, data, message) => ({
+	keyword: "absolutePath",
+	params: { absolutePath: data },
+	message: message,
+	parentSchema: schema
+});
+
+const getErrorFor = (shouldBeAbsolute, data, schema) => {
+	const message = shouldBeAbsolute
+		? `The provided value ${JSON.stringify(data)} is not an absolute path!`
+		: `A relative path is expected. However, the provided value ${JSON.stringify(
+				data
+		  )} is an absolute path!`;
+
+	return errorMessage(schema, data, message);
+};
+
+module.exports = ajv =>
+	ajv.addKeyword("absolutePath", {
+		errors: true,
+		type: "string",
+		compile(expected, schema) {
+			function callback(data) {
+				let passes = true;
+				const isExclamationMarkPresent = data.includes("!");
+				const isCorrectAbsoluteOrRelativePath =
+					expected === /^(?:[A-Za-z]:\\|\/)/.test(data);
+
+				if (isExclamationMarkPresent) {
+					callback.errors = [
+						errorMessage(
+							schema,
+							data,
+							`The provided value ${JSON.stringify(
+								data
+							)} contains exclamation mark (!) which is not allowed because it's reserved for loader syntax.`
+						)
+					];
+					passes = false;
+				}
+
+				if (!isCorrectAbsoluteOrRelativePath) {
+					callback.errors = [getErrorFor(expected, data, schema)];
+					passes = false;
+				}
+
+				return passes;
+			}
+			callback.errors = [];
+
+			return callback;
+		}
+	});

package/schemas/plugins/DllReferencePlugin.json

@@ -88,6 +88,7 @@
         "commonjs2",
         "commonjs-module",
         "amd",
+        "amd-require",
         "umd",
         "umd2",
         "jsonp"