webpack 4.15.0 → 4.16.2

package/lib/optimize/MinChunkSizePlugin.js

@@ -1,77 +1,77 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const validateOptions = require("schema-utils");
-const schema = require("../../schemas/plugins/optimize/MinChunkSizePlugin.json");
-
-class MinChunkSizePlugin {
-	constructor(options) {
-		validateOptions(schema, options, "Min Chunk Size Plugin");
-		this.options = options;
-	}
-
-	apply(compiler) {
-		const options = this.options;
-		const minChunkSize = options.minChunkSize;
-		compiler.hooks.compilation.tap("MinChunkSizePlugin", compilation => {
-			compilation.hooks.optimizeChunksAdvanced.tap(
-				"MinChunkSizePlugin",
-				chunks => {
-					const equalOptions = {
-						chunkOverhead: 1,
-						entryChunkMultiplicator: 1
-					};
-
-					const sortedSizeFilteredExtendedPairCombinations = chunks
-						.reduce((combinations, a, idx) => {
-							// create combination pairs
-							for (let i = 0; i < idx; i++) {
-								const b = chunks[i];
-								combinations.push([b, a]);
-							}
-							return combinations;
-						}, [])
-						.filter(pair => {
-							// check if one of the chunks sizes is smaller than the minChunkSize
-							const p0SmallerThanMinChunkSize =
-								pair[0].size(equalOptions) < minChunkSize;
-							const p1SmallerThanMinChunkSize =
-								pair[1].size(equalOptions) < minChunkSize;
-							return p0SmallerThanMinChunkSize || p1SmallerThanMinChunkSize;
-						})
-						.map(pair => {
-							// extend combination pairs with size and integrated size
-							const a = pair[0].size(options);
-							const b = pair[1].size(options);
-							const ab = pair[0].integratedSize(pair[1], options);
-							return [a + b - ab, ab, pair[0], pair[1]];
-						})
-						.filter(pair => {
-							// filter pairs that do not have an integratedSize
-							// meaning they can NOT be integrated!
-							return pair[1] !== false;
-						})
-						.sort((a, b) => {
-							// sadly javascript does an inplace sort here
-							// sort by size
-							const diff = b[0] - a[0];
-							if (diff !== 0) return diff;
-							return a[1] - b[1];
-						});
-
-					if (sortedSizeFilteredExtendedPairCombinations.length === 0) return;
-
-					const pair = sortedSizeFilteredExtendedPairCombinations[0];
-
-					pair[2].integrate(pair[3], "min-size");
-					chunks.splice(chunks.indexOf(pair[3]), 1);
-					return true;
-				}
-			);
-		});
-	}
-}
-module.exports = MinChunkSizePlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const validateOptions = require("schema-utils");
+const schema = require("../../schemas/plugins/optimize/MinChunkSizePlugin.json");
+
+class MinChunkSizePlugin {
+	constructor(options) {
+		validateOptions(schema, options, "Min Chunk Size Plugin");
+		this.options = options;
+	}
+
+	apply(compiler) {
+		const options = this.options;
+		const minChunkSize = options.minChunkSize;
+		compiler.hooks.compilation.tap("MinChunkSizePlugin", compilation => {
+			compilation.hooks.optimizeChunksAdvanced.tap(
+				"MinChunkSizePlugin",
+				chunks => {
+					const equalOptions = {
+						chunkOverhead: 1,
+						entryChunkMultiplicator: 1
+					};
+
+					const sortedSizeFilteredExtendedPairCombinations = chunks
+						.reduce((combinations, a, idx) => {
+							// create combination pairs
+							for (let i = 0; i < idx; i++) {
+								const b = chunks[i];
+								combinations.push([b, a]);
+							}
+							return combinations;
+						}, [])
+						.filter(pair => {
+							// check if one of the chunks sizes is smaller than the minChunkSize
+							const p0SmallerThanMinChunkSize =
+								pair[0].size(equalOptions) < minChunkSize;
+							const p1SmallerThanMinChunkSize =
+								pair[1].size(equalOptions) < minChunkSize;
+							return p0SmallerThanMinChunkSize || p1SmallerThanMinChunkSize;
+						})
+						.map(pair => {
+							// extend combination pairs with size and integrated size
+							const a = pair[0].size(options);
+							const b = pair[1].size(options);
+							const ab = pair[0].integratedSize(pair[1], options);
+							return [a + b - ab, ab, pair[0], pair[1]];
+						})
+						.filter(pair => {
+							// filter pairs that do not have an integratedSize
+							// meaning they can NOT be integrated!
+							return pair[1] !== false;
+						})
+						.sort((a, b) => {
+							// sadly javascript does an inplace sort here
+							// sort by size
+							const diff = b[0] - a[0];
+							if (diff !== 0) return diff;
+							return a[1] - b[1];
+						});
+
+					if (sortedSizeFilteredExtendedPairCombinations.length === 0) return;
+
+					const pair = sortedSizeFilteredExtendedPairCombinations[0];
+
+					pair[2].integrate(pair[3], "min-size");
+					chunks.splice(chunks.indexOf(pair[3]), 1);
+					return true;
+				}
+			);
+		});
+	}
+}
+module.exports = MinChunkSizePlugin;

package/lib/optimize/NaturalChunkOrderPlugin.js

@@ -0,0 +1,41 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+/** @typedef {import("../Compiler")} Compiler */
+
+class NaturalChunkOrderPlugin {
+	/**
+	 * @param {Compiler} compiler webpack compiler
+	 * @returns {void}
+	 */
+	apply(compiler) {
+		compiler.hooks.compilation.tap("NaturalChunkOrderPlugin", compilation => {
+			compilation.hooks.optimizeChunkOrder.tap(
+				"NaturalChunkOrderPlugin",
+				chunks => {
+					chunks.sort((chunkA, chunkB) => {
+						const a = chunkA.modulesIterable[Symbol.iterator]();
+						const b = chunkB.modulesIterable[Symbol.iterator]();
+						// eslint-disable-next-line no-constant-condition
+						while (true) {
+							const aItem = a.next();
+							const bItem = b.next();
+							if (aItem.done && bItem.done) return 0;
+							if (aItem.done) return -1;
+							if (bItem.done) return 1;
+							const aModuleId = aItem.value.id;
+							const bModuleId = bItem.value.id;
+							if (aModuleId < bModuleId) return -1;
+							if (aModuleId > bModuleId) return 1;
+						}
+					});
+				}
+			);
+		});
+	}
+}
+
+module.exports = NaturalChunkOrderPlugin;

package/lib/optimize/OccurrenceChunkOrderPlugin.js

@@ -0,0 +1,61 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const validateOptions = require("schema-utils");
+const schema = require("../../schemas/plugins/optimize/OccurrenceOrderChunkIdsPlugin.json");
+
+class OccurrenceOrderChunkIdsPlugin {
+	constructor(options = {}) {
+		validateOptions(schema, options, "Occurrence Order Chunk Ids Plugin");
+		this.options = options;
+	}
+
+	apply(compiler) {
+		const prioritiseInitial = this.options.prioritiseInitial;
+		compiler.hooks.compilation.tap(
+			"OccurrenceOrderChunkIdsPlugin",
+			compilation => {
+				compilation.hooks.optimizeChunkOrder.tap(
+					"OccurrenceOrderChunkIdsPlugin",
+					chunks => {
+						const occursInInitialChunksMap = new Map();
+						const originalOrder = new Map();
+
+						let i = 0;
+						for (const c of chunks) {
+							let occurs = 0;
+							for (const chunkGroup of c.groupsIterable) {
+								for (const parent of chunkGroup.parentsIterable) {
+									if (parent.isInitial()) occurs++;
+								}
+							}
+							occursInInitialChunksMap.set(c, occurs);
+							originalOrder.set(c, i++);
+						}
+
+						chunks.sort((a, b) => {
+							if (prioritiseInitial) {
+								const aEntryOccurs = occursInInitialChunksMap.get(a);
+								const bEntryOccurs = occursInInitialChunksMap.get(b);
+								if (aEntryOccurs > bEntryOccurs) return -1;
+								if (aEntryOccurs < bEntryOccurs) return 1;
+							}
+							const aOccurs = a.getNumberOfGroups();
+							const bOccurs = b.getNumberOfGroups();
+							if (aOccurs > bOccurs) return -1;
+							if (aOccurs < bOccurs) return 1;
+							const orgA = originalOrder.get(a);
+							const orgB = originalOrder.get(b);
+							return orgA - orgB;
+						});
+					}
+				);
+			}
+		);
+	}
+}
+
+module.exports = OccurrenceOrderChunkIdsPlugin;

package/lib/optimize/OccurrenceModuleOrderPlugin.js

@@ -0,0 +1,103 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const validateOptions = require("schema-utils");
+const schema = require("../../schemas/plugins/optimize/OccurrenceOrderModuleIdsPlugin.json");
+
+class OccurrenceOrderModuleIdsPlugin {
+	constructor(options = {}) {
+		validateOptions(schema, options, "Occurrence Order Module Ids Plugin");
+		this.options = options;
+	}
+
+	apply(compiler) {
+		const prioritiseInitial = this.options.prioritiseInitial;
+		compiler.hooks.compilation.tap(
+			"OccurrenceOrderModuleIdsPlugin",
+			compilation => {
+				compilation.hooks.optimizeModuleOrder.tap(
+					"OccurrenceOrderModuleIdsPlugin",
+					modules => {
+						const occursInInitialChunksMap = new Map();
+						const occursInAllChunksMap = new Map();
+
+						const initialChunkChunkMap = new Map();
+						const entryCountMap = new Map();
+						for (const m of modules) {
+							let initial = 0;
+							let entry = 0;
+							for (const c of m.chunksIterable) {
+								if (c.canBeInitial()) initial++;
+								if (c.entryModule === m) entry++;
+							}
+							initialChunkChunkMap.set(m, initial);
+							entryCountMap.set(m, entry);
+						}
+
+						const countOccursInEntry = (sum, r) => {
+							if (!r.module) {
+								return sum;
+							}
+							return sum + initialChunkChunkMap.get(r.module);
+						};
+						const countOccurs = (sum, r) => {
+							if (!r.module) {
+								return sum;
+							}
+							let factor = 1;
+							if (typeof r.dependency.getNumberOfIdOccurrences === "function") {
+								factor = r.dependency.getNumberOfIdOccurrences();
+							}
+							if (factor === 0) {
+								return sum;
+							}
+							return sum + factor * r.module.getNumberOfChunks();
+						};
+
+						if (prioritiseInitial) {
+							for (const m of modules) {
+								const result =
+									m.reasons.reduce(countOccursInEntry, 0) +
+									initialChunkChunkMap.get(m) +
+									entryCountMap.get(m);
+								occursInInitialChunksMap.set(m, result);
+							}
+						}
+
+						const originalOrder = new Map();
+						let i = 0;
+						for (const m of modules) {
+							const result =
+								m.reasons.reduce(countOccurs, 0) +
+								m.getNumberOfChunks() +
+								entryCountMap.get(m);
+							occursInAllChunksMap.set(m, result);
+							originalOrder.set(m, i++);
+						}
+
+						modules.sort((a, b) => {
+							if (prioritiseInitial) {
+								const aEntryOccurs = occursInInitialChunksMap.get(a);
+								const bEntryOccurs = occursInInitialChunksMap.get(b);
+								if (aEntryOccurs > bEntryOccurs) return -1;
+								if (aEntryOccurs < bEntryOccurs) return 1;
+							}
+							const aOccurs = occursInAllChunksMap.get(a);
+							const bOccurs = occursInAllChunksMap.get(b);
+							if (aOccurs > bOccurs) return -1;
+							if (aOccurs < bOccurs) return 1;
+							const orgA = originalOrder.get(a);
+							const orgB = originalOrder.get(b);
+							return orgA - orgB;
+						});
+					}
+				);
+			}
+		);
+	}
+}
+
+module.exports = OccurrenceOrderModuleIdsPlugin;

package/lib/optimize/OccurrenceOrderPlugin.js

@@ -1,133 +1,135 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-class OccurrenceOrderPlugin {
-	constructor(preferEntry) {
-		if (preferEntry !== undefined && typeof preferEntry !== "boolean") {
-			throw new Error(
-				"Argument should be a boolean.\nFor more info on this plugin, see https://webpack.js.org/plugins/"
-			);
-		}
-		this.preferEntry = preferEntry;
-	}
-	apply(compiler) {
-		const preferEntry = this.preferEntry;
-		compiler.hooks.compilation.tap("OccurrenceOrderPlugin", compilation => {
-			compilation.hooks.optimizeModuleOrder.tap(
-				"OccurrenceOrderPlugin",
-				modules => {
-					const occursInInitialChunksMap = new Map();
-					const occursInAllChunksMap = new Map();
-
-					const initialChunkChunkMap = new Map();
-					const entryCountMap = new Map();
-					for (const m of modules) {
-						let initial = 0;
-						let entry = 0;
-						for (const c of m.chunksIterable) {
-							if (c.canBeInitial()) initial++;
-							if (c.entryModule === m) entry++;
-						}
-						initialChunkChunkMap.set(m, initial);
-						entryCountMap.set(m, entry);
-					}
-
-					const countOccursInEntry = (sum, r) => {
-						if (!r.module) {
-							return sum;
-						}
-						return sum + initialChunkChunkMap.get(r.module);
-					};
-					const countOccurs = (sum, r) => {
-						if (!r.module) {
-							return sum;
-						}
-						let factor = 1;
-						if (typeof r.dependency.getNumberOfIdOccurrences === "function") {
-							factor = r.dependency.getNumberOfIdOccurrences();
-						}
-						if (factor === 0) {
-							return sum;
-						}
-						return sum + factor * r.module.getNumberOfChunks();
-					};
-
-					if (preferEntry) {
-						for (const m of modules) {
-							const result =
-								m.reasons.reduce(countOccursInEntry, 0) +
-								initialChunkChunkMap.get(m) +
-								entryCountMap.get(m);
-							occursInInitialChunksMap.set(m, result);
-						}
-					}
-
-					const originalOrder = new Map();
-					let i = 0;
-					for (const m of modules) {
-						const result =
-							m.reasons.reduce(countOccurs, 0) +
-							m.getNumberOfChunks() +
-							entryCountMap.get(m);
-						occursInAllChunksMap.set(m, result);
-						originalOrder.set(m, i++);
-					}
-
-					modules.sort((a, b) => {
-						if (preferEntry) {
-							const aEntryOccurs = occursInInitialChunksMap.get(a);
-							const bEntryOccurs = occursInInitialChunksMap.get(b);
-							if (aEntryOccurs > bEntryOccurs) return -1;
-							if (aEntryOccurs < bEntryOccurs) return 1;
-						}
-						const aOccurs = occursInAllChunksMap.get(a);
-						const bOccurs = occursInAllChunksMap.get(b);
-						if (aOccurs > bOccurs) return -1;
-						if (aOccurs < bOccurs) return 1;
-						const orgA = originalOrder.get(a);
-						const orgB = originalOrder.get(b);
-						return orgB - orgA;
-					});
-				}
-			);
-			compilation.hooks.optimizeChunkOrder.tap(
-				"OccurrenceOrderPlugin",
-				chunks => {
-					const occursInInitialChunksMap = new Map();
-					const originalOrder = new Map();
-
-					let i = 0;
-					for (const c of chunks) {
-						let occurs = 0;
-						for (const chunkGroup of c.groupsIterable) {
-							for (const parent of chunkGroup.parentsIterable) {
-								if (parent.isInitial()) occurs++;
-							}
-						}
-						occursInInitialChunksMap.set(c, occurs);
-						originalOrder.set(c, i++);
-					}
-
-					chunks.sort((a, b) => {
-						const aEntryOccurs = occursInInitialChunksMap.get(a);
-						const bEntryOccurs = occursInInitialChunksMap.get(b);
-						if (aEntryOccurs > bEntryOccurs) return -1;
-						if (aEntryOccurs < bEntryOccurs) return 1;
-						const aOccurs = a.getNumberOfGroups();
-						const bOccurs = b.getNumberOfGroups();
-						if (aOccurs > bOccurs) return -1;
-						if (aOccurs < bOccurs) return 1;
-						const orgA = originalOrder.get(a);
-						const orgB = originalOrder.get(b);
-						return orgB - orgA;
-					});
-				}
-			);
-		});
-	}
-}
-
-module.exports = OccurrenceOrderPlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+// TODO webpack 5 remove this plugin
+// It has been splitted into separate plugins for modules and chunks
+class OccurrenceOrderPlugin {
+	constructor(preferEntry) {
+		if (preferEntry !== undefined && typeof preferEntry !== "boolean") {
+			throw new Error(
+				"Argument should be a boolean.\nFor more info on this plugin, see https://webpack.js.org/plugins/"
+			);
+		}
+		this.preferEntry = preferEntry;
+	}
+	apply(compiler) {
+		const preferEntry = this.preferEntry;
+		compiler.hooks.compilation.tap("OccurrenceOrderPlugin", compilation => {
+			compilation.hooks.optimizeModuleOrder.tap(
+				"OccurrenceOrderPlugin",
+				modules => {
+					const occursInInitialChunksMap = new Map();
+					const occursInAllChunksMap = new Map();
+
+					const initialChunkChunkMap = new Map();
+					const entryCountMap = new Map();
+					for (const m of modules) {
+						let initial = 0;
+						let entry = 0;
+						for (const c of m.chunksIterable) {
+							if (c.canBeInitial()) initial++;
+							if (c.entryModule === m) entry++;
+						}
+						initialChunkChunkMap.set(m, initial);
+						entryCountMap.set(m, entry);
+					}
+
+					const countOccursInEntry = (sum, r) => {
+						if (!r.module) {
+							return sum;
+						}
+						return sum + initialChunkChunkMap.get(r.module);
+					};
+					const countOccurs = (sum, r) => {
+						if (!r.module) {
+							return sum;
+						}
+						let factor = 1;
+						if (typeof r.dependency.getNumberOfIdOccurrences === "function") {
+							factor = r.dependency.getNumberOfIdOccurrences();
+						}
+						if (factor === 0) {
+							return sum;
+						}
+						return sum + factor * r.module.getNumberOfChunks();
+					};
+
+					if (preferEntry) {
+						for (const m of modules) {
+							const result =
+								m.reasons.reduce(countOccursInEntry, 0) +
+								initialChunkChunkMap.get(m) +
+								entryCountMap.get(m);
+							occursInInitialChunksMap.set(m, result);
+						}
+					}
+
+					const originalOrder = new Map();
+					let i = 0;
+					for (const m of modules) {
+						const result =
+							m.reasons.reduce(countOccurs, 0) +
+							m.getNumberOfChunks() +
+							entryCountMap.get(m);
+						occursInAllChunksMap.set(m, result);
+						originalOrder.set(m, i++);
+					}
+
+					modules.sort((a, b) => {
+						if (preferEntry) {
+							const aEntryOccurs = occursInInitialChunksMap.get(a);
+							const bEntryOccurs = occursInInitialChunksMap.get(b);
+							if (aEntryOccurs > bEntryOccurs) return -1;
+							if (aEntryOccurs < bEntryOccurs) return 1;
+						}
+						const aOccurs = occursInAllChunksMap.get(a);
+						const bOccurs = occursInAllChunksMap.get(b);
+						if (aOccurs > bOccurs) return -1;
+						if (aOccurs < bOccurs) return 1;
+						const orgA = originalOrder.get(a);
+						const orgB = originalOrder.get(b);
+						return orgA - orgB;
+					});
+				}
+			);
+			compilation.hooks.optimizeChunkOrder.tap(
+				"OccurrenceOrderPlugin",
+				chunks => {
+					const occursInInitialChunksMap = new Map();
+					const originalOrder = new Map();
+
+					let i = 0;
+					for (const c of chunks) {
+						let occurs = 0;
+						for (const chunkGroup of c.groupsIterable) {
+							for (const parent of chunkGroup.parentsIterable) {
+								if (parent.isInitial()) occurs++;
+							}
+						}
+						occursInInitialChunksMap.set(c, occurs);
+						originalOrder.set(c, i++);
+					}
+
+					chunks.sort((a, b) => {
+						const aEntryOccurs = occursInInitialChunksMap.get(a);
+						const bEntryOccurs = occursInInitialChunksMap.get(b);
+						if (aEntryOccurs > bEntryOccurs) return -1;
+						if (aEntryOccurs < bEntryOccurs) return 1;
+						const aOccurs = a.getNumberOfGroups();
+						const bOccurs = b.getNumberOfGroups();
+						if (aOccurs > bOccurs) return -1;
+						if (aOccurs < bOccurs) return 1;
+						const orgA = originalOrder.get(a);
+						const orgB = originalOrder.get(b);
+						return orgA - orgB;
+					});
+				}
+			);
+		});
+	}
+}
+
+module.exports = OccurrenceOrderPlugin;