webpack 4.16.1 → 4.16.5

package/lib/dependencies/ContextDependencyTemplateAsId.js

@@ -20,6 +20,7 @@ class ContextDependencyTemplateAsId {
 					}
 				}
 				source.replace(dep.valueRange[1], dep.range[1] - 1, ")");
+				// TODO webpack 5 remove `prepend` it's no longer used
 				source.replace(
 					dep.range[0],
 					dep.valueRange[0] - 1,

package/lib/dependencies/ContextDependencyTemplateAsRequireCall.js

@@ -20,6 +20,7 @@ class ContextDependencyTemplateAsRequireCall {
 					}
 				}
 				source.replace(dep.valueRange[1], dep.range[1] - 1, ")");
+				// TODO webpack 5 remove `prepend` it's no longer used
 				source.replace(
 					dep.range[0],
 					dep.valueRange[0] - 1,

package/lib/node/NodeTargetPlugin.js

@@ -7,6 +7,7 @@
 const ExternalsPlugin = require("../ExternalsPlugin");
 
 const builtins =
+	// eslint-disable-next-line node/no-unsupported-features/node-builtins
 	require("module").builtinModules || Object.keys(process.binding("natives"));
 
 class NodeTargetPlugin {

package/lib/optimize/ConcatenatedModule.js

@@ -21,6 +21,7 @@ const createHash = require("../util/createHash");
 
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../Compilation")} Compilation */
+/** @typedef {import("../util/createHash").Hash} Hash */
 
 /**
  * @typedef {Object} ConcatenationEntry
@@ -1180,6 +1181,10 @@ class ConcatenatedModule extends Module {
 		return nameWithNumber;
 	}
 
+	/**
+	 * @param {Hash} hash the hash used to track dependencies
+	 * @returns {void}
+	 */
 	updateHash(hash) {
 		for (const info of this._orderedConcatenationList) {
 			switch (info.type) {

package/lib/util/SortableSet.js

@@ -3,6 +3,7 @@
 /**
  * A subset of Set that offers sorting functionality
  * @template T item type in set
+ * @extends {Set<T>}
  */
 class SortableSet extends Set {
 	/**

package/lib/util/StackedSetMap.js

@@ -128,8 +128,17 @@ class StackedSetMap {
 }
 
 // TODO remove in webpack 5
-StackedSetMap.prototype.push = util.deprecate(function(item) {
-	this.add(item);
-}, "This is no longer an Array: Use add instead.");
+StackedSetMap.prototype.push = util.deprecate(
+	/**
+	 * @deprecated
+	 * @this {StackedSetMap}
+	 * @param {any} item Item to add
+	 * @returns {void}
+	 */
+	function(item) {
+		this.add(item);
+	},
+	"This is no longer an Array: Use add instead."
+);
 
 module.exports = StackedSetMap;

package/lib/wasm/WebAssemblyGenerator.js

@@ -21,6 +21,10 @@ const WebAssemblyExportImportedDependency = require("../dependencies/WebAssembly
 
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("./WebAssemblyUtils").UsedWasmDependency} UsedWasmDependency */
+/** @typedef {import("../NormalModule")} NormalModule */
+/** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
+/** @typedef {import("webpack-sources").Source} Source */
+/** @typedef {import("../Dependency").DependencyTemplate} DependencyTemplate */
 
 /**
  * @typedef {(ArrayBuffer) => ArrayBuffer} ArrayBufferTransform
@@ -43,9 +47,12 @@ const preprocess = ab => {
  * @returns {Function} composed transform
  */
 const compose = (...fns) => {
-	return fns.reduce((prevFn, nextFn) => {
-		return value => nextFn(prevFn(value));
-	}, value => value);
+	return fns.reduce(
+		(prevFn, nextFn) => {
+			return value => nextFn(prevFn(value));
+		},
+		value => value
+	);
 };
 
 // TODO replace with @callback
@@ -366,7 +373,14 @@ class WebAssemblyGenerator extends Generator {
 		this.options = options;
 	}
 
-	generate(module) {
+	/**
+	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {Map<Function, DependencyTemplate>} dependencyTemplates mapping from dependencies to templates
+	 * @param {RuntimeTemplate} runtimeTemplate the runtime template
+	 * @param {string} type which kind of code should be generated
+	 * @returns {Source} generated code
+	 */
+	generate(module, dependencyTemplates, runtimeTemplate, type) {
 		let bin = module.originalSource().source();
 		bin = preprocess(bin);
 
@@ -398,7 +412,10 @@ class WebAssemblyGenerator extends Generator {
 		const externalExports = new Set(
 			module.dependencies
 				.filter(d => d instanceof WebAssemblyExportImportedDependency)
-				.map(d => d.exportName)
+				.map(d => {
+					const wasmDep = /** @type {WebAssemblyExportImportedDependency} */ (d);
+					return wasmDep.exportName;
+				})
 		);
 
 		/** @type {t.Instruction[]} */

package/lib/wasm/WebAssemblyJavascriptGenerator.js

@@ -10,8 +10,20 @@ const { RawSource } = require("webpack-sources");
 const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
 const WebAssemblyExportImportedDependency = require("../dependencies/WebAssemblyExportImportedDependency");
 
+/** @typedef {import("../NormalModule")} NormalModule */
+/** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
+/** @typedef {import("webpack-sources").Source} Source */
+/** @typedef {import("../Dependency").DependencyTemplate} DependencyTemplate */
+
 class WebAssemblyJavascriptGenerator extends Generator {
-	generate(module, dependencyTemplates, runtimeTemplate) {
+	/**
+	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {Map<Function, DependencyTemplate>} dependencyTemplates mapping from dependencies to templates
+	 * @param {RuntimeTemplate} runtimeTemplate the runtime template
+	 * @param {string} type which kind of code should be generated
+	 * @returns {Source} generated code
+	 */
+	generate(module, dependencyTemplates, runtimeTemplate, type) {
 		const initIdentifer = Array.isArray(module.usedExports)
 			? Template.numberToIdentifer(module.usedExports.length)
 			: "__webpack_init__";
@@ -21,6 +33,7 @@ class WebAssemblyJavascriptGenerator extends Generator {
 		const initParams = [];
 		let index = 0;
 		for (const dep of module.dependencies) {
+			const depAsAny = /** @type {any} */ (dep);
 			if (dep.module) {
 				let importData = importedModules.get(dep.module);
 				if (importData === undefined) {
@@ -29,7 +42,8 @@ class WebAssemblyJavascriptGenerator extends Generator {
 						(importData = {
 							importVar: `m${index}`,
 							index,
-							request: dep.userRequest,
+							request:
+								"userRequest" in depAsAny ? depAsAny.userRequest : undefined,
 							names: new Set(),
 							reexports: []
 						})

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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "4.16.1",
+  "version": "4.16.5",
   "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",
@@ -43,10 +43,10 @@
     "coveralls": "^2.11.2",
     "css-loader": "^0.28.3",
     "es6-promise-polyfill": "^1.1.1",
-    "eslint": "^5.1.0",
+    "eslint": "^5.2.0",
     "eslint-config-prettier": "^2.9.0",
-    "eslint-plugin-jest": "^21.17.0",
-    "eslint-plugin-node": "^6.0.1",
+    "eslint-plugin-jest": "^21.18.0",
+    "eslint-plugin-node": "^7.0.1",
     "eslint-plugin-prettier": "^2.6.2",
     "express": "~4.13.1",
     "file-loader": "^1.1.6",
@@ -56,14 +56,14 @@
     "istanbul": "^0.4.5",
     "jade": "^1.11.0",
     "jade-loader": "~0.8.0",
-    "jest": "^23.3.0",
+    "jest": "^23.4.1",
     "jest-silent-reporter": "^0.0.5",
     "json-loader": "^0.5.7",
     "less": "^2.5.1",
     "less-loader": "^4.0.3",
     "lint-staged": "^7.2.0",
     "lodash": "^4.17.4",
-    "prettier": "^1.13.7",
+    "prettier": "^1.14.0",
     "pug": "^2.0.3",
     "pug-loader": "^2.4.0",
     "raw-loader": "~0.5.0",
@@ -82,14 +82,6 @@
     "worker-loader": "^1.1.1",
     "xxhashjs": "^0.2.1"
   },
-  "resolutions": {
-    "**/jest-message-util/micromatch": "^2.3.11",
-    "**/jest-cli/micromatch": "^2.3.11",
-    "**/jest-runtime/micromatch": "^2.3.11",
-    "**/jest-haste-map/micromatch": "^2.3.11",
-    "**/jest-haste-map/sane/micromatch": "^2.3.11",
-    "**/jest-config/babel-jest/babel-plugin-istanbul/test-exclude/micromatch": "^2.3.11"
-  },
   "engines": {
     "node": ">=6.11.5"
   },
@@ -128,10 +120,10 @@
     "pretest": "yarn lint",
     "prelint": "yarn setup",
     "lint": "yarn code-lint && yarn schema-lint && yarn type-lint",
-    "code-lint": "eslint --cache setup lib bin hot buildin benchmark \"test/*.js\" \"test/**/webpack.config.js\" \"examples/**/webpack.config.js\" \"schemas/**/*.js\"",
+    "code-lint": "eslint --cache setup lib bin hot buildin benchmark tooling \"test/*.js\" \"test/**/webpack.config.js\" \"examples/**/webpack.config.js\" \"schemas/**/*.js\"",
     "type-lint": "tsc --pretty",
     "fix": "yarn code-lint --fix",
-    "pretty": "prettier --write \"setup/**/*.js\" \"lib/**/*.js\" \"bin/*.js\" \"hot/*.js\" \"buildin/*.js\" \"benchmark/**/*.js\" \"test/*.js\" \"test/**/webpack.config.js\" \"examples/**/webpack.config.js\" \"schemas/**/*.js\" \"declarations.d.ts\" \"tsconfig.json\"",
+    "pretty": "prettier --write \"setup/**/*.js\" \"lib/**/*.js\" \"bin/*.js\" \"hot/*.js\" \"buildin/*.js\" \"benchmark/**/*.js\" \"tooling/*.js\" \"test/*.js\" \"test/**/webpack.config.js\" \"examples/**/webpack.config.js\" \"schemas/**/*.js\" \"declarations.d.ts\" \"tsconfig.json\"",
     "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",