webpack 4.26.0 → 4.26.1

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/global.js

@@ -7,7 +7,7 @@ g = (function() {
 
 try {
 	// This works if eval is allowed (see CSP)
-	g = g || Function("return this")() || (1, eval)("this");
+	g = g || new Function("return this")();
 } catch (e) {
 	// This works if the window reference is available
 	if (typeof window === "object") g = window;

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/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/optimize/SplitChunksPlugin.js

@@ -795,7 +795,7 @@ module.exports = class SplitChunksPlugin {
 							maxSizeQueueMap.get(chunk) || this.options.fallbackCacheGroup;
 						if (!maxSize) continue;
 						const results = deterministicGroupingForModules({
-							maxSize,
+							maxSize: Math.max(minSize, maxSize),
 							minSize,
 							items: chunk.modulesIterable,
 							getKey(module) {

package/lib/util/deterministicGrouping.js

@@ -124,6 +124,13 @@ module.exports = ({ maxSize, minSize, items, getSize, getKey }) => {
 	/** @type {Node<T>[]} */
 	const initialNodes = [];
 
+	// lexically ordering of keys
+	nodes.sort((a, b) => {
+		if (a.key < b.key) return -1;
+		if (a.key > b.key) return 1;
+		return 0;
+	});
+
 	// return nodes bigger than maxSize directly as group
 	for (const node of nodes) {
 		if (node.size >= maxSize) {
@@ -134,13 +141,6 @@ module.exports = ({ maxSize, minSize, items, getSize, getKey }) => {
 	}
 
 	if (initialNodes.length > 0) {
-		// lexically ordering of keys
-		initialNodes.sort((a, b) => {
-			if (a.key < b.key) return -1;
-			if (a.key > b.key) return 1;
-			return 0;
-		});
-
 		// calculate similarities between lexically adjacent nodes
 		/** @type {number[]} */
 		const similarities = [];
@@ -150,76 +150,99 @@ module.exports = ({ maxSize, minSize, items, getSize, getKey }) => {
 			similarities.push(similarity(a.key, b.key));
 		}
 
-		const queue = [new Group(initialNodes, similarities)];
+		const initialGroup = new Group(initialNodes, similarities);
 
-		while (queue.length) {
-			const group = queue.pop();
-			// only groups bigger than maxSize need to be splitted
-			if (group.size < maxSize) {
-				result.push(group);
-				continue;
+		if (initialGroup.size < minSize) {
+			// We hit an edgecase where the working set is already smaller than minSize
+			// We merge it with the smallest result node to keep minSize intact
+			if (result.length > 0) {
+				const smallestGroup = result.reduce(
+					(min, group) => (min.size > group.size ? group : min)
+				);
+				for (const node of initialGroup.nodes) smallestGroup.nodes.push(node);
+				smallestGroup.nodes.sort((a, b) => {
+					if (a.key < b.key) return -1;
+					if (a.key > b.key) return 1;
+					return 0;
+				});
+			} else {
+				// There are no other nodes
+				// We use all nodes and have to accept that it's smaller than minSize
+				result.push(initialGroup);
 			}
+		} else {
+			const queue = [initialGroup];
 
-			// find unsplittable area from left and right
-			// going minSize from left and right
-			let left = 0;
-			let leftSize = 0;
-			while (leftSize < minSize) {
-				leftSize += group.nodes[left].size;
-				left++;
-			}
-			let right = group.nodes.length - 1;
-			let rightSize = 0;
-			while (rightSize < minSize) {
-				rightSize += group.nodes[right].size;
-				right--;
-			}
+			while (queue.length) {
+				const group = queue.pop();
+				// only groups bigger than maxSize need to be splitted
+				if (group.size < maxSize) {
+					result.push(group);
+					continue;
+				}
 
-			if (left - 1 > right) {
-				// can't split group while holding minSize
-				// because minSize is preferred of maxSize we return
-				// the group here even while it's too big
-				// To avoid this make sure maxSize > minSize * 3
-				result.push(group);
-				continue;
-			}
-			if (left <= right) {
-				// when there is a area between left and right
-				// we look for best split point
-				// we split at the minimum similarity
-				// here key space is separated the most
-				let best = left - 1;
-				let bestSimilarity = group.similarities[best];
-				for (let i = left; i <= right; i++) {
-					const similarity = group.similarities[i];
-					if (similarity < bestSimilarity) {
-						best = i;
-						bestSimilarity = similarity;
+				// find unsplittable area from left and right
+				// going minSize from left and right
+				// at least one node need to be included otherwise we get stuck
+				let left = 0;
+				let leftSize = 0;
+				while (leftSize <= minSize) {
+					leftSize += group.nodes[left].size;
+					left++;
+				}
+				let right = group.nodes.length - 1;
+				let rightSize = 0;
+				while (rightSize <= minSize) {
+					rightSize += group.nodes[right].size;
+					right--;
+				}
+
+				if (left - 1 > right) {
+					// can't split group while holding minSize
+					// because minSize is preferred of maxSize we return
+					// the group here even while it's too big
+					// To avoid this make sure maxSize > minSize * 3
+					result.push(group);
+					continue;
+				}
+				if (left <= right) {
+					// when there is a area between left and right
+					// we look for best split point
+					// we split at the minimum similarity
+					// here key space is separated the most
+					let best = left - 1;
+					let bestSimilarity = group.similarities[best];
+					for (let i = left; i <= right; i++) {
+						const similarity = group.similarities[i];
+						if (similarity < bestSimilarity) {
+							best = i;
+							bestSimilarity = similarity;
+						}
 					}
+					left = best + 1;
+					right = best;
 				}
-				left = best + 1;
-				right = best;
-			}
 
-			// create two new groups for left and right area
-			// and queue them up
-			const rightNodes = [group.nodes[right + 1]];
-			/** @type {number[]} */
-			const rightSimilaries = [];
-			for (let i = right + 2; i < group.nodes.length; i++) {
-				rightSimilaries.push(group.similarities[i - 1]);
-				rightNodes.push(group.nodes[i]);
-			}
-			queue.push(new Group(rightNodes, rightSimilaries));
-
-			const leftNodes = [group.nodes[0]];
-			/** @type {number[]} */
-			const leftSimilaries = [];
-			for (let i = 1; i < left; i++) {
-				leftSimilaries.push(group.similarities[i - 1]);
-				leftNodes.push(group.nodes[i]);
+				// create two new groups for left and right area
+				// and queue them up
+				const rightNodes = [group.nodes[right + 1]];
+				/** @type {number[]} */
+				const rightSimilaries = [];
+				for (let i = right + 2; i < group.nodes.length; i++) {
+					rightSimilaries.push(group.similarities[i - 1]);
+					rightNodes.push(group.nodes[i]);
+				}
+				queue.push(new Group(rightNodes, rightSimilaries));
+
+				const leftNodes = [group.nodes[0]];
+				/** @type {number[]} */
+				const leftSimilaries = [];
+				for (let i = 1; i < left; i++) {
+					leftSimilaries.push(group.similarities[i - 1]);
+					leftNodes.push(group.nodes[i]);
+				}
+				queue.push(new Group(leftNodes, leftSimilaries));
 			}
-			queue.push(new Group(leftNodes, leftSimilaries));
 		}
 	}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "4.26.0",
+  "version": "4.26.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",