webpack 4.16.0 → 4.16.4

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.0",
+  "version": "4.16.4",
   "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",
@@ -16,7 +16,7 @@
     "ajv-keywords": "^3.1.0",
     "chrome-trace-event": "^1.0.0",
     "enhanced-resolve": "^4.1.0",
-    "eslint-scope": "^3.7.1",
+    "eslint-scope": "^4.0.0",
     "json-parse-better-errors": "^1.0.2",
     "loader-runner": "^2.3.0",
     "loader-utils": "^1.1.0",
@@ -43,11 +43,11 @@
     "coveralls": "^2.11.2",
     "css-loader": "^0.28.3",
     "es6-promise-polyfill": "^1.1.1",
-    "eslint": "^4.19.1",
+    "eslint": "^5.2.0",
     "eslint-config-prettier": "^2.9.0",
-    "eslint-plugin-jest": "^21.17.0",
-    "eslint-plugin-node": "^6.0.1",
-    "eslint-plugin-prettier": "^2.6.0",
+    "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",
     "glob": "^7.1.2",
@@ -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.1.0",
+    "lint-staged": "^7.2.0",
     "lodash": "^4.17.4",
-    "prettier": "^1.13.5",
+    "prettier": "^1.14.0",
     "pug": "^2.0.3",
     "pug-loader": "^2.4.0",
     "raw-loader": "~0.5.0",
@@ -73,7 +73,7 @@
     "script-loader": "~0.7.0",
     "simple-git": "^1.65.0",
     "style-loader": "^0.19.1",
-    "typescript": "^2.9.1",
+    "typescript": "^3.0.0-rc",
     "url-loader": "^0.6.2",
     "val-loader": "^1.0.2",
     "vm-browserify": "~0.0.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",

package/schemas/WebpackOptions.json

@@ -410,11 +410,7 @@
         },
         "hashDigest": {
           "description": "Digest type used for the hash",
-          "enum": [
-            "latin1",
-            "hex",
-            "base64"
-          ]
+          "type": "string"
         },
         "hashDigestLength": {
           "description": "Number of chars which are used for the hash",
@@ -1596,7 +1592,7 @@
           "type": "boolean"
         },
         "moduleIds": {
-          "description": "Define the algorithm to choose module ids (natural: numeric ids in order for usage, named: readable ids for better debugging, hashed: short hashes as ids for better long term caching, size: numeric ids focused on minimal initial download size, total-size: numeric ids focused on minimal total download size, false: no algorithm used, as custom one can be provided via plugin)",
+          "description": "Define the algorithm to choose module ids (natural: numeric ids in order of usage, named: readable ids for better debugging, hashed: short hashes as ids for better long term caching, size: numeric ids focused on minimal initial download size, total-size: numeric ids focused on minimal total download size, false: no algorithm used, as custom one can be provided via plugin)",
           "enum": [
             "natural",
             "named",

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
+							)} 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;
+		}
+	});

package/schemas/plugins/BannerPlugin.json

@@ -1,96 +1,96 @@
-{
-  "definitions": {
-    "rule": {
-      "oneOf": [
-        {
-          "instanceof": "RegExp"
-        },
-        {
-          "minLength": 1,
-          "type": "string"
-        }
-      ]
-    },
-    "rules": {
-      "oneOf": [
-        {
-          "items": {
-            "description": "A rule condition",
-            "anyOf": [
-              {
-                "$ref": "#/definitions/rule"
-              }
-            ]
-          },
-          "type": "array"
-        },
-        {
-          "$ref": "#/definitions/rule"
-        }
-      ]
-    }
-  },
-  "oneOf": [
-    {
-      "type": "object",
-      "additionalProperties": false,
-      "required": [
-        "banner"
-      ],
-      "properties": {
-        "banner": {
-          "description": "Specifies the banner",
-          "anyOf": [
-            {
-              "instanceof": "Function"
-            },
-            {
-              "type": "string"
-            }
-          ]
-        },
-        "raw": {
-          "description": "If true, banner will not be wrapped in a comment",
-          "type": "boolean"
-        },
-        "entryOnly": {
-          "description": "If true, the banner will only be added to the entry chunks",
-          "type": "boolean"
-        },
-        "test": {
-          "description": "Include all modules that pass test assertion",
-          "anyOf": [
-            {
-              "$ref": "#/definitions/rules"
-            }
-          ]
-        },
-        "include": {
-          "description": "Include all modules matching any of these conditions",
-          "anyOf": [
-            {
-              "$ref": "#/definitions/rules"
-            }
-          ]
-        },
-        "exclude": {
-          "description": "Exclude all modules matching any of these conditions",
-          "anyOf": [
-            {
-              "$ref": "#/definitions/rules"
-            }
-          ]
-        }
-      }
-    },
-    {
-      "description": "The banner as function, it will be wrapped in a comment",
-      "instanceof": "Function"
-    },
-    {
-      "description": "The banner as string, it will be wrapped in a comment",
-      "minLength": 1,
-      "type": "string"
-    }
-  ]
-}
+{
+  "definitions": {
+    "rule": {
+      "oneOf": [
+        {
+          "instanceof": "RegExp"
+        },
+        {
+          "minLength": 1,
+          "type": "string"
+        }
+      ]
+    },
+    "rules": {
+      "oneOf": [
+        {
+          "items": {
+            "description": "A rule condition",
+            "anyOf": [
+              {
+                "$ref": "#/definitions/rule"
+              }
+            ]
+          },
+          "type": "array"
+        },
+        {
+          "$ref": "#/definitions/rule"
+        }
+      ]
+    }
+  },
+  "oneOf": [
+    {
+      "type": "object",
+      "additionalProperties": false,
+      "required": [
+        "banner"
+      ],
+      "properties": {
+        "banner": {
+          "description": "Specifies the banner",
+          "anyOf": [
+            {
+              "instanceof": "Function"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "raw": {
+          "description": "If true, banner will not be wrapped in a comment",
+          "type": "boolean"
+        },
+        "entryOnly": {
+          "description": "If true, the banner will only be added to the entry chunks",
+          "type": "boolean"
+        },
+        "test": {
+          "description": "Include all modules that pass test assertion",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/rules"
+            }
+          ]
+        },
+        "include": {
+          "description": "Include all modules matching any of these conditions",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/rules"
+            }
+          ]
+        },
+        "exclude": {
+          "description": "Exclude all modules matching any of these conditions",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/rules"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "The banner as function, it will be wrapped in a comment",
+      "instanceof": "Function"
+    },
+    {
+      "description": "The banner as string, it will be wrapped in a comment",
+      "minLength": 1,
+      "type": "string"
+    }
+  ]
+}

package/schemas/plugins/DllPlugin.json

@@ -1,32 +1,32 @@
-{
-  "additionalProperties": false,
-  "required": [
-    "path"
-  ],
-  "properties": {
-    "context": {
-      "description": "Context of requests in the manifest file (defaults to the webpack context)",
-      "minLength": 1,
-      "type": "string"
-    },
-    "name": {
-      "description": "Name of the exposed dll function (external name, use value of 'output.library')",
-      "minLength": 1,
-      "type": "string"
-    },
-    "type": {
-      "description": "Type of the dll bundle (external type, use value of 'output.libraryTarget')",
-      "minLength": 1,
-      "type": "string"
-    },
-    "path": {
-      "description": "Absolute path to the manifest json file (output)",
-      "minLength": 1,
-      "type": "string"
-    },
-    "entryOnly": {
-      "description": "If true, only entry points will be exposed",
-      "type": "boolean"
-    }
-  }
-}
+{
+  "additionalProperties": false,
+  "required": [
+    "path"
+  ],
+  "properties": {
+    "context": {
+      "description": "Context of requests in the manifest file (defaults to the webpack context)",
+      "minLength": 1,
+      "type": "string"
+    },
+    "name": {
+      "description": "Name of the exposed dll function (external name, use value of 'output.library')",
+      "minLength": 1,
+      "type": "string"
+    },
+    "type": {
+      "description": "Type of the dll bundle (external type, use value of 'output.libraryTarget')",
+      "minLength": 1,
+      "type": "string"
+    },
+    "path": {
+      "description": "Absolute path to the manifest json file (output)",
+      "minLength": 1,
+      "type": "string"
+    },
+    "entryOnly": {
+      "description": "If true, only entry points will be exposed",
+      "type": "boolean"
+    }
+  }
+}