webpack 4.27.1 → 4.28.3

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/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/debug/ProfilingPlugin.js

@@ -1,4 +1,6 @@
 const fs = require("fs");
+const path = require("path");
+const mkdirp = require("mkdirp");
 const { Tracer } = require("chrome-trace-event");
 const validateOptions = require("schema-utils");
 const schema = require("../../schemas/plugins/debug/ProfilingPlugin.json");
@@ -93,6 +95,10 @@ const createTrace = outputPath => {
 		noStream: true
 	});
 	const profiler = new Profiler(inspector);
+	if (/\/|\\/.test(outputPath)) {
+		const dirPath = path.dirname(outputPath);
+		mkdirp.sync(dirPath);
+	}
 	const fsStream = fs.createWriteStream(outputPath);
 
 	let counter = 0;

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/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.1",
+  "version": "4.28.3",
   "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)"
         }
       }
     }