webpack 4.3.0 → 4.4.0

package/lib/optimize/SplitChunksPlugin.js

@@ -85,7 +85,9 @@ module.exports = class SplitChunksPlugin {
 
 	static normalizeOptions(options = {}) {
 		return {
-			chunks: options.chunks || "all",
+			chunksFilter: SplitChunksPlugin.normalizeChunksFilter(
+				options.chunks || "all"
+			),
 			minSize: options.minSize || 0,
 			minChunks: options.minChunks || 1,
 			maxAsyncRequests: options.maxAsyncRequests || 1,
@@ -135,6 +137,19 @@ module.exports = class SplitChunksPlugin {
 		if (typeof name === "function") return name;
 	}
 
+	static normalizeChunksFilter(chunks) {
+		if (chunks === "initial") {
+			return chunk => chunk.canBeInitial();
+		}
+		if (chunks === "async") {
+			return chunk => !chunk.canBeInitial();
+		}
+		if (chunks === "all") {
+			return () => true;
+		}
+		if (typeof chunks === "function") return chunks;
+	}
+
 	static normalizeCacheGroups({ cacheGroups, automaticNameDelimiter }) {
 		if (typeof cacheGroups === "function") {
 			return cacheGroups;
@@ -162,6 +177,11 @@ module.exports = class SplitChunksPlugin {
 									r
 								);
 								if (result.name) result.getName = () => result.name;
+								if (result.chunks) {
+									result.chunksFilter = SplitChunksPlugin.normalizeChunksFilter(
+										result.chunks
+									);
+								}
 								results.push(result);
 							}
 						}
@@ -174,7 +194,9 @@ module.exports = class SplitChunksPlugin {
 								name: option.name,
 								automaticNameDelimiter
 							}),
-							chunks: option.chunks,
+							chunksFilter: SplitChunksPlugin.normalizeChunksFilter(
+								option.chunks
+							),
 							enforce: option.enforce,
 							minSize: option.minSize,
 							minChunks: option.minChunks,
@@ -264,7 +286,8 @@ module.exports = class SplitChunksPlugin {
 							const cacheGroup = {
 								key: cacheGroupSource.key,
 								priority: cacheGroupSource.priority || 0,
-								chunks: cacheGroupSource.chunks || this.options.chunks,
+								chunksFilter:
+									cacheGroupSource.chunksFilter || this.options.chunksFilter,
 								minSize:
 									cacheGroupSource.minSize !== undefined
 										? cacheGroupSource.minSize
@@ -304,16 +327,9 @@ module.exports = class SplitChunksPlugin {
 								// Break if minimum number of chunks is not reached
 								if (chunkIndices.length < cacheGroup.minChunks) continue;
 								// Select chunks by configuration
-								const selectedChunks =
-									cacheGroup.chunks === "initial"
-										? Array.from(chunkCombination).filter(chunk =>
-												chunk.canBeInitial()
-											)
-										: cacheGroup.chunks === "async"
-											? Array.from(chunkCombination).filter(
-													chunk => !chunk.canBeInitial()
-												)
-											: Array.from(chunkCombination);
+								const selectedChunks = Array.from(chunkCombination).filter(
+									cacheGroup.chunksFilter
+								);
 								// Break if minimum number of chunks is not reached
 								if (selectedChunks.length < cacheGroup.minChunks) continue;
 								// Determine name for split chunk
@@ -420,7 +436,7 @@ module.exports = class SplitChunksPlugin {
 									? Math.min(
 											item.cacheGroup.maxInitialRequests,
 											item.cacheGroup.maxAsyncRequests
-										)
+									  )
 									: item.cacheGroup.maxAsyncRequests;
 							if (isFinite(maxRequests) && getRequests(chunk) >= maxRequests)
 								continue;

package/lib/performance/SizeLimitsPlugin.js

@@ -1,105 +1,105 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Sean Larkin @thelarkinn
-*/
-"use strict";
-const EntrypointsOverSizeLimitWarning = require("./EntrypointsOverSizeLimitWarning");
-const AssetsOverSizeLimitWarning = require("./AssetsOverSizeLimitWarning");
-const NoAsyncChunksWarning = require("./NoAsyncChunksWarning");
-
-module.exports = class SizeLimitsPlugin {
-	constructor(options) {
-		this.hints = options.hints;
-		this.maxAssetSize = options.maxAssetSize;
-		this.maxEntrypointSize = options.maxEntrypointSize;
-		this.assetFilter = options.assetFilter;
-	}
-	apply(compiler) {
-		const entrypointSizeLimit = this.maxEntrypointSize;
-		const assetSizeLimit = this.maxAssetSize;
-		const hints = this.hints;
-		const assetFilter = this.assetFilter || (asset => !asset.endsWith(".map"));
-
-		compiler.hooks.afterEmit.tap("SizeLimitsPlugin", compilation => {
-			const warnings = [];
-
-			const getEntrypointSize = entrypoint =>
-				entrypoint.getFiles().reduce((currentSize, file) => {
-					if (assetFilter(file) && compilation.assets[file]) {
-						return currentSize + compilation.assets[file].size();
-					}
-
-					return currentSize;
-				}, 0);
-
-			const assetsOverSizeLimit = [];
-			for (const assetName of Object.keys(compilation.assets)) {
-				if (!assetFilter(assetName)) {
-					continue;
-				}
-
-				const asset = compilation.assets[assetName];
-				const size = asset.size();
-				if (size > assetSizeLimit) {
-					assetsOverSizeLimit.push({
-						name: assetName,
-						size: size
-					});
-					asset.isOverSizeLimit = true;
-				}
-			}
-
-			const entrypointsOverLimit = [];
-			for (const pair of compilation.entrypoints) {
-				const name = pair[0];
-				const entry = pair[1];
-				const size = getEntrypointSize(entry, compilation);
-
-				if (size > entrypointSizeLimit) {
-					entrypointsOverLimit.push({
-						name: name,
-						size: size,
-						files: entry.getFiles().filter(assetFilter)
-					});
-					entry.isOverSizeLimit = true;
-				}
-			}
-
-			if (hints) {
-				// 1. Individual Chunk: Size < 250kb
-				// 2. Collective Initial Chunks [entrypoint] (Each Set?): Size < 250kb
-				// 3. No Async Chunks
-				// if !1, then 2, if !2 return
-				if (assetsOverSizeLimit.length > 0) {
-					warnings.push(
-						new AssetsOverSizeLimitWarning(assetsOverSizeLimit, assetSizeLimit)
-					);
-				}
-				if (entrypointsOverLimit.length > 0) {
-					warnings.push(
-						new EntrypointsOverSizeLimitWarning(
-							entrypointsOverLimit,
-							entrypointSizeLimit
-						)
-					);
-				}
-
-				if (warnings.length > 0) {
-					const hasAsyncChunks =
-						compilation.chunks.filter(chunk => !chunk.canBeInitial()).length >
-						0;
-
-					if (!hasAsyncChunks) {
-						warnings.push(new NoAsyncChunksWarning());
-					}
-
-					if (hints === "error") {
-						compilation.errors.push(...warnings);
-					} else {
-						compilation.warnings.push(...warnings);
-					}
-				}
-			}
-		});
-	}
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Sean Larkin @thelarkinn
+*/
+"use strict";
+const EntrypointsOverSizeLimitWarning = require("./EntrypointsOverSizeLimitWarning");
+const AssetsOverSizeLimitWarning = require("./AssetsOverSizeLimitWarning");
+const NoAsyncChunksWarning = require("./NoAsyncChunksWarning");
+
+module.exports = class SizeLimitsPlugin {
+	constructor(options) {
+		this.hints = options.hints;
+		this.maxAssetSize = options.maxAssetSize;
+		this.maxEntrypointSize = options.maxEntrypointSize;
+		this.assetFilter = options.assetFilter;
+	}
+	apply(compiler) {
+		const entrypointSizeLimit = this.maxEntrypointSize;
+		const assetSizeLimit = this.maxAssetSize;
+		const hints = this.hints;
+		const assetFilter = this.assetFilter || (asset => !asset.endsWith(".map"));
+
+		compiler.hooks.afterEmit.tap("SizeLimitsPlugin", compilation => {
+			const warnings = [];
+
+			const getEntrypointSize = entrypoint =>
+				entrypoint.getFiles().reduce((currentSize, file) => {
+					if (assetFilter(file) && compilation.assets[file]) {
+						return currentSize + compilation.assets[file].size();
+					}
+
+					return currentSize;
+				}, 0);
+
+			const assetsOverSizeLimit = [];
+			for (const assetName of Object.keys(compilation.assets)) {
+				if (!assetFilter(assetName)) {
+					continue;
+				}
+
+				const asset = compilation.assets[assetName];
+				const size = asset.size();
+				if (size > assetSizeLimit) {
+					assetsOverSizeLimit.push({
+						name: assetName,
+						size: size
+					});
+					asset.isOverSizeLimit = true;
+				}
+			}
+
+			const entrypointsOverLimit = [];
+			for (const pair of compilation.entrypoints) {
+				const name = pair[0];
+				const entry = pair[1];
+				const size = getEntrypointSize(entry);
+
+				if (size > entrypointSizeLimit) {
+					entrypointsOverLimit.push({
+						name: name,
+						size: size,
+						files: entry.getFiles().filter(assetFilter)
+					});
+					entry.isOverSizeLimit = true;
+				}
+			}
+
+			if (hints) {
+				// 1. Individual Chunk: Size < 250kb
+				// 2. Collective Initial Chunks [entrypoint] (Each Set?): Size < 250kb
+				// 3. No Async Chunks
+				// if !1, then 2, if !2 return
+				if (assetsOverSizeLimit.length > 0) {
+					warnings.push(
+						new AssetsOverSizeLimitWarning(assetsOverSizeLimit, assetSizeLimit)
+					);
+				}
+				if (entrypointsOverLimit.length > 0) {
+					warnings.push(
+						new EntrypointsOverSizeLimitWarning(
+							entrypointsOverLimit,
+							entrypointSizeLimit
+						)
+					);
+				}
+
+				if (warnings.length > 0) {
+					const hasAsyncChunks =
+						compilation.chunks.filter(chunk => !chunk.canBeInitial()).length >
+						0;
+
+					if (!hasAsyncChunks) {
+						warnings.push(new NoAsyncChunksWarning());
+					}
+
+					if (hints === "error") {
+						compilation.errors.push(...warnings);
+					} else {
+						compilation.warnings.push(...warnings);
+					}
+				}
+			}
+		});
+	}
+};

package/lib/web/JsonpChunkTemplatePlugin.js

@@ -15,11 +15,11 @@ class JsonpChunkTemplatePlugin {
 				const globalObject = chunkTemplate.outputOptions.globalObject;
 				const source = new ConcatSource();
 				source.add(
-					`(${globalObject}[${JSON.stringify(jsonpFunction)}] = ${
-						globalObject
-					}[${JSON.stringify(jsonpFunction)}] || []).push([${JSON.stringify(
-						chunk.ids
-					)},`
+					`(${globalObject}[${JSON.stringify(
+						jsonpFunction
+					)}] = ${globalObject}[${JSON.stringify(
+						jsonpFunction
+					)}] || []).push([${JSON.stringify(chunk.ids)},`
 				);
 				source.add(modules);
 				const entries = [chunk.entryModule].filter(Boolean).map(m =>

package/lib/web/JsonpMainTemplatePlugin.js

@@ -265,7 +265,7 @@ class JsonpMainTemplatePlugin {
 										"",
 										"// run deferred modules when all chunks ready",
 										"return checkDeferredModules();"
-									])
+								  ])
 								: ""
 						]),
 						"};",
@@ -299,7 +299,7 @@ class JsonpMainTemplatePlugin {
 										"return result;"
 									]),
 									"}"
-								])
+							  ])
 							: ""
 					]);
 				}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "4.3.0",
+  "version": "4.4.0",
   "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",
@@ -34,9 +34,10 @@
     "coveralls": "^2.11.2",
     "css-loader": "^0.28.3",
     "es6-promise-polyfill": "^1.1.1",
-    "eslint": "^4.3.0",
-    "eslint-plugin-node": "^5.1.1",
-    "eslint-plugin-prettier": "^2.3.1",
+    "eslint": "^4.19.1",
+    "eslint-config-prettier": "^2.9.0",
+    "eslint-plugin-node": "^6.0.1",
+    "eslint-plugin-prettier": "^2.6.0",
     "express": "~4.13.1",
     "file-loader": "^1.1.6",
     "glob": "^7.1.2",
@@ -50,7 +51,7 @@
     "lodash": "^4.17.4",
     "mocha": "^3.2.0",
     "mocha-lcov-reporter": "^1.0.0",
-    "prettier": "^1.8.2",
+    "prettier": "^1.11.1",
     "raw-loader": "~0.5.0",
     "react": "^15.2.1",
     "react-dom": "^15.2.1",
@@ -104,7 +105,7 @@
     "lint-files": "npm run lint && npm run schema-lint",
     "lint": "eslint lib bin hot buildin \"test/*.js\" \"test/**/webpack.config.js\" \"examples/**/webpack.config.js\" \"schemas/**/*.js\"",
     "fix": "npm run lint -- --fix",
-    "pretty-files": "prettier \"lib/**.*\" \"bin/**.*\" \"hot/**.*\" \"buildin/**.*\" \"test/*.js\" \"test/**/webpack.config.js\" \"examples/**/webpack.config.js\" \"schemas/**/*.js\" --write",
+    "pretty-files": "prettier \"lib/**/*.js\" \"bin/*.js\" \"hot/*.js\" \"buildin/*.js\" \"test/*.js\" \"test/**/webpack.config.js\" \"examples/**/webpack.config.js\" \"schemas/**/*.js\" --write",
     "schema-lint": "mocha test/*.lint.js --opts test/lint-mocha.opts",
     "benchmark": "mocha --max-old-space-size=4096 --harmony --trace-deprecation test/*.benchmark.js -R spec",
     "cover": "npm run cover:init && npm run cover:all && npm run cover:report",

package/schemas/WebpackOptions.json

@@ -324,14 +324,7 @@
         },
         "chunkFilename": {
           "description": "The filename of non-entry chunks as relative path inside the `output.path` directory.",
-          "anyOf": [
-            {
-              "type": "string"
-            },
-            {
-              "instanceof": "Function"
-            }
-          ],
+          "type": "string",
           "absolutePath": false
         },
         "webassemblyModuleFilename": {
@@ -1337,10 +1330,17 @@
               "properties": {
                 "chunks": {
                   "description": "Select chunks for determining shared modules (defaults to \"async\", \"initial\" and \"all\" requires adding these chunks to the HTML)",
-                  "enum": [
-                    "initial",
-                    "async",
-                    "all"
+                  "oneOf": [
+                    {
+                      "enum": [
+                        "initial",
+                        "async",
+                        "all"
+                      ]
+                    },
+                    {
+                      "instanceof": "Function"
+                    }
                   ]
                 },
                 "minSize": {
@@ -1427,10 +1427,17 @@
                           },
                           "chunks": {
                             "description": "Select chunks for determining cache group content (defaults to \"initial\", \"initial\" and \"all\" requires adding these chunks to the HTML)",
-                            "enum": [
-                              "initial",
-                              "async",
-                              "all"
+                            "oneOf": [
+                              {
+                                "enum": [
+                                  "initial",
+                                  "async",
+                                  "all"
+                                ]
+                              },
+                              {
+                                "instanceof": "Function"
+                              }
                             ]
                           },
                           "enforce": {

package/schemas/ajv.absolutePath.js

@@ -12,7 +12,7 @@ const getErrorFor = (shouldBeAbsolute, data, schema) => {
 		? `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!`;
+		  )} is an absolute path!`;
 
 	return errorMessage(schema, data, message);
 };