webpack 4.27.0 → 4.28.2

package/LICENSE

@@ -1,20 +1,20 @@
-Copyright JS Foundation and other contributors
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright JS Foundation and other contributors
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/SECURITY.md

@@ -1,9 +1,9 @@
-# Reporting Security Issues
-
-If you discover a security issue in webpack, please report it by sending an
-email to [webpack@opencollective.com](mailto:webpack@opencollective.com).
-
-This will allow us to assess the risk, and make a fix available before we add a
-bug report to the GitHub repository.
-
-Thanks for helping make webpack safe for everyone.
+# Reporting Security Issues
+
+If you discover a security issue in webpack, please report it by sending an
+email to [webpack@opencollective.com](mailto:webpack@opencollective.com).
+
+This will allow us to assess the risk, and make a fix available before we add a
+bug report to the GitHub repository.
+
+Thanks for helping make webpack safe for everyone.

package/buildin/amd-define.js

@@ -1,3 +1,3 @@
-module.exports = function() {
-	throw new Error("define cannot be used indirect");
-};
+module.exports = function() {
+	throw new Error("define cannot be used indirect");
+};

package/buildin/amd-options.js

@@ -1,2 +1,2 @@
-/* globals __webpack_amd_options__ */
-module.exports = __webpack_amd_options__;
+/* globals __webpack_amd_options__ */
+module.exports = __webpack_amd_options__;

package/buildin/module.js

@@ -1,22 +1,22 @@
-module.exports = function(module) {
-	if (!module.webpackPolyfill) {
-		module.deprecate = function() {};
-		module.paths = [];
-		// module.parent = undefined by default
-		if (!module.children) module.children = [];
-		Object.defineProperty(module, "loaded", {
-			enumerable: true,
-			get: function() {
-				return module.l;
-			}
-		});
-		Object.defineProperty(module, "id", {
-			enumerable: true,
-			get: function() {
-				return module.i;
-			}
-		});
-		module.webpackPolyfill = 1;
-	}
-	return module;
-};
+module.exports = function(module) {
+	if (!module.webpackPolyfill) {
+		module.deprecate = function() {};
+		module.paths = [];
+		// module.parent = undefined by default
+		if (!module.children) module.children = [];
+		Object.defineProperty(module, "loaded", {
+			enumerable: true,
+			get: function() {
+				return module.l;
+			}
+		});
+		Object.defineProperty(module, "id", {
+			enumerable: true,
+			get: function() {
+				return module.i;
+			}
+		});
+		module.webpackPolyfill = 1;
+	}
+	return module;
+};

package/buildin/system.js

@@ -1,7 +1,7 @@
-// Provide a "System" global.
-module.exports = {
-	// Make sure import is only used as "System.import"
-	import: function() {
-		throw new Error("System.import cannot be used indirectly");
-	}
-};
+// Provide a "System" global.
+module.exports = {
+	// Make sure import is only used as "System.import"
+	import: function() {
+		throw new Error("System.import cannot be used indirectly");
+	}
+};

package/declarations/plugins/IgnorePlugin.d.ts

@@ -21,7 +21,7 @@ export type IgnorePluginOptions =
 			 */
 			checkContext?: ((context: string) => boolean);
 			/**
-			 * A filter function for resource
+			 * A filter function for resource and context
 			 */
-			checkResource?: ((resource: string) => boolean);
+			checkResource?: ((resource: string, context: string) => boolean);
 	  };

package/hot/emitter.js

@@ -1,2 +1,2 @@
-var EventEmitter = require("events");
-module.exports = new EventEmitter();
+var EventEmitter = require("events");
+module.exports = new EventEmitter();

package/lib/IgnorePlugin.js

@@ -30,61 +30,47 @@ class IgnorePlugin {
 		this.checkIgnore = this.checkIgnore.bind(this);
 	}
 
-	/**
-	 * @param {string} resource resource
-	 * @returns {boolean} returns true if a "resourceRegExp" exists
-	 * and the resource given matches the regexp.
-	 */
-	checkResource(resource) {
-		if ("checkResource" in this.options && this.options.checkResource) {
-			return this.options.checkResource(resource);
-		}
-		if ("resourceRegExp" in this.options && this.options.resourceRegExp) {
-			return this.options.resourceRegExp.test(resource);
-		}
-		return false;
-	}
-
-	/**
-	 * @param {string} context context
-	 * @returns {boolean} returns true if "contextRegExp" does not exist
-	 * or if context matches the given regexp.
-	 */
-	checkContext(context) {
-		if ("checkContext" in this.options && this.options.checkContext) {
-			return this.options.checkContext(context);
-		}
-		if ("contextRegExp" in this.options && this.options.contextRegExp) {
-			return this.options.contextRegExp.test(context);
-		}
-		return true;
-	}
-
 	/**
 	 * Note that if "contextRegExp" is given, both the "resourceRegExp"
 	 * and "contextRegExp" have to match.
 	 *
-	 * @param {TODO} result result
-	 * @returns {boolean} returns true if result should be ignored
-	 */
-	checkResult(result) {
-		if (!result) {
-			return true;
-		}
-		return (
-			this.checkResource(result.request) && this.checkContext(result.context)
-		);
-	}
-
-	/**
 	 * @param {TODO} result result
 	 * @returns {TODO|null} returns result or null if result should be ignored
 	 */
 	checkIgnore(result) {
-		// check if result is ignored
-		if (this.checkResult(result)) {
-			return null;
+		if (!result) return result;
+
+		if (
+			"checkResource" in this.options &&
+			this.options.checkResource &&
+			this.options.checkResource(result.request, result.context)
+		) {
+			// TODO webpack 5 remove checkContext, as checkResource already gets context
+			if ("checkContext" in this.options && this.options.checkContext) {
+				if (this.options.checkContext(result.context)) {
+					return null;
+				}
+			} else {
+				return null;
+			}
 		}
+
+		if (
+			"resourceRegExp" in this.options &&
+			this.options.resourceRegExp &&
+			this.options.resourceRegExp.test(result.request)
+		) {
+			if ("contextRegExp" in this.options && this.options.contextRegExp) {
+				// if "contextRegExp" is given,
+				// both the "resourceRegExp" and "contextRegExp" have to match.
+				if (this.options.contextRegExp.test(result.context)) {
+					return null;
+				}
+			} else {
+				return null;
+			}
+		}
+
 		return result;
 	}
 

package/lib/node/NodeSourcePlugin.js

@@ -116,9 +116,6 @@ module.exports = class NodeSourcePlugin {
 				normalModuleFactory.hooks.parser
 					.for("javascript/dynamic")
 					.tap("NodeSourcePlugin", handler);
-				normalModuleFactory.hooks.parser
-					.for("javascript/esm")
-					.tap("NodeSourcePlugin", handler);
 			}
 		);
 		compiler.hooks.afterResolvers.tap("NodeSourcePlugin", compiler => {

package/lib/optimize/SplitChunksPlugin.js

@@ -465,11 +465,7 @@ module.exports = class SplitChunksPlugin {
 						module
 					) => {
 						// Break if minimum number of chunks is not reached
-						if (
-							!cacheGroup.enforce &&
-							selectedChunks.length < cacheGroup.minChunks
-						)
-							return;
+						if (selectedChunks.length < cacheGroup.minChunks) return;
 						// Determine name for split chunk
 						const name = cacheGroup.getName(
 							module,
@@ -492,7 +488,7 @@ module.exports = class SplitChunksPlugin {
 									modules: new SortableSet(undefined, sortByIdentifier),
 									cacheGroup,
 									name,
-									validateSize: !cacheGroup.enforce && cacheGroup.minSize > 0,
+									validateSize: cacheGroup.minSize > 0,
 									size: 0,
 									chunks: new Set(),
 									reuseableChunks: new Set(),
@@ -534,27 +530,40 @@ module.exports = class SplitChunksPlugin {
 								priority: cacheGroupSource.priority || 0,
 								chunksFilter:
 									cacheGroupSource.chunksFilter || this.options.chunksFilter,
-								enforce: cacheGroupSource.enforce,
 								minSize:
+									cacheGroupSource.minSize !== undefined
+										? cacheGroupSource.minSize
+										: cacheGroupSource.enforce
+											? 0
+											: this.options.minSize,
+								minSizeForMaxSize:
 									cacheGroupSource.minSize !== undefined
 										? cacheGroupSource.minSize
 										: this.options.minSize,
 								maxSize:
 									cacheGroupSource.maxSize !== undefined
 										? cacheGroupSource.maxSize
-										: this.options.maxSize,
+										: cacheGroupSource.enforce
+											? 0
+											: this.options.maxSize,
 								minChunks:
 									cacheGroupSource.minChunks !== undefined
 										? cacheGroupSource.minChunks
-										: this.options.minChunks,
+										: cacheGroupSource.enforce
+											? 1
+											: this.options.minChunks,
 								maxAsyncRequests:
 									cacheGroupSource.maxAsyncRequests !== undefined
 										? cacheGroupSource.maxAsyncRequests
-										: this.options.maxAsyncRequests,
+										: cacheGroupSource.enforce
+											? Infinity
+											: this.options.maxAsyncRequests,
 								maxInitialRequests:
 									cacheGroupSource.maxInitialRequests !== undefined
 										? cacheGroupSource.maxInitialRequests
-										: this.options.maxInitialRequests,
+										: cacheGroupSource.enforce
+											? Infinity
+											: this.options.maxInitialRequests,
 								getName:
 									cacheGroupSource.getName !== undefined
 										? cacheGroupSource.getName
@@ -572,11 +581,7 @@ module.exports = class SplitChunksPlugin {
 							// For all combination of chunk selection
 							for (const chunkCombination of combs) {
 								// Break if minimum number of chunks is not reached
-								if (
-									!cacheGroup.enforce &&
-									chunkCombination.size < cacheGroup.minChunks
-								)
-									continue;
+								if (chunkCombination.size < cacheGroup.minChunks) continue;
 								// Select chunks by configuration
 								const {
 									chunks: selectedChunks,
@@ -586,14 +591,12 @@ module.exports = class SplitChunksPlugin {
 									cacheGroup.chunksFilter
 								);
 
-								if (selectedChunks.length > 0) {
-									addModuleToChunksInfoMap(
-										cacheGroup,
-										selectedChunks,
-										selectedChunksKey,
-										module
-									);
-								}
+								addModuleToChunksInfoMap(
+									cacheGroup,
+									selectedChunks,
+									selectedChunksKey,
+									module
+								);
 							}
 						}
 					}
@@ -672,9 +675,8 @@ module.exports = class SplitChunksPlugin {
 						if (usedChunks.length === 0) continue;
 
 						if (
-							!item.cacheGroup.enforce &&
-							(Number.isFinite(item.cacheGroup.maxInitialRequests) ||
-								Number.isFinite(item.cacheGroup.maxAsyncRequests))
+							Number.isFinite(item.cacheGroup.maxInitialRequests) ||
+							Number.isFinite(item.cacheGroup.maxAsyncRequests)
 						) {
 							const chunkInLimit = usedChunks.filter(chunk => {
 								// respect max requests when not enforced
@@ -692,8 +694,6 @@ module.exports = class SplitChunksPlugin {
 							});
 
 							if (chunkInLimit.length < usedChunks.length) {
-								// We do not need to check enforce here as it was
-								// already checked above.
 								if (chunkInLimit.length >= item.cacheGroup.minChunks) {
 									for (const module of item.modules) {
 										addModuleToChunksInfoMap(
@@ -775,7 +775,7 @@ module.exports = class SplitChunksPlugin {
 							maxSizeQueueMap.set(newChunk, {
 								minSize: Math.max(
 									oldMaxSizeSettings ? oldMaxSizeSettings.minSize : 0,
-									item.cacheGroup.minSize
+									item.cacheGroup.minSizeForMaxSize
 								),
 								maxSize: Math.min(
 									oldMaxSizeSettings ? oldMaxSizeSettings.maxSize : Infinity,

package/lib/web/JsonpMainTemplate.runtime.js

@@ -12,12 +12,11 @@ module.exports = function() {
 
 	// 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$;
 		if ($crossOriginLoading$) script.crossOrigin = $crossOriginLoading$;
-		head.appendChild(script);
+		document.head.appendChild(script);
 	}
 
 	// eslint-disable-next-line no-unused-vars

package/lib/web/JsonpMainTemplatePlugin.js

@@ -282,9 +282,8 @@ class JsonpMainTemplatePlugin {
 							"promises.push(installedChunkData[2] = promise);",
 							"",
 							"// start chunk loading",
-							"var head = document.getElementsByTagName('head')[0];",
 							mainTemplate.hooks.jsonpScript.call("", chunk, hash),
-							"head.appendChild(script);"
+							"document.head.appendChild(script);"
 						]),
 						"}"
 					]),
@@ -310,14 +309,13 @@ class JsonpMainTemplatePlugin {
 					"var chunkPreloadData = chunkPreloadMap[chunkId];",
 					"if(chunkPreloadData) {",
 					Template.indent([
-						"var head = document.getElementsByTagName('head')[0];",
 						"chunkPreloadData.forEach(function(chunkId) {",
 						Template.indent([
 							"if(installedChunks[chunkId] === undefined) {",
 							Template.indent([
 								"installedChunks[chunkId] = null;",
 								mainTemplate.hooks.linkPreload.call("", chunk, hash),
-								"head.appendChild(link);"
+								"document.head.appendChild(link);"
 							]),
 							"}"
 						]),
@@ -388,14 +386,13 @@ class JsonpMainTemplatePlugin {
 							withPrefetch
 								? Template.asString([
 										"// chunk prefetching for javascript",
-										"var head = document.getElementsByTagName('head')[0];",
 										"prefetchChunks.forEach(function(chunkId) {",
 										Template.indent([
 											"if(installedChunks[chunkId] === undefined) {",
 											Template.indent([
 												"installedChunks[chunkId] = null;",
 												mainTemplate.hooks.linkPrefetch.call("", chunk, hash),
-												"head.appendChild(link);"
+												"document.head.appendChild(link);"
 											]),
 											"}"
 										]),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "4.27.0",
+  "version": "4.28.2",
   "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",

package/schemas/plugins/IgnorePlugin.json

@@ -27,9 +27,9 @@
           "tsType": "((context: string) => boolean)"
         },
         "checkResource": {
-          "description": "A filter function for resource",
+          "description": "A filter function for resource and context",
           "instanceof": "Function",
-          "tsType": "((resource: string) => boolean)"
+          "tsType": "((resource: string, context: string) => boolean)"
         }
       }
     }