update packages

1 files changed, 68 insertions, 53 deletions

diff --git a/node_modules/webpack/lib/optimize/ChunkModuleIdRangePlugin.js b/node_modules/webpack/lib/optimize/ChunkModuleIdRangePlugin.js
index 262014dc5..f507e426c 100644
--- a/node_modules/webpack/lib/optimize/ChunkModuleIdRangePlugin.js
+++ b/node_modules/webpack/lib/optimize/ChunkModuleIdRangePlugin.js
@@ -1,53 +1,68 @@
-/*

-	MIT License http://www.opensource.org/licenses/mit-license.php

-	Author Tobias Koppers @sokra

-*/

-"use strict";

-class ChunkModuleIdRangePlugin {

-	constructor(options) {

-		this.options = options;

-	}

-	apply(compiler) {

-		const options = this.options;

-		compiler.plugin("compilation", (compilation) => {

-			compilation.plugin("module-ids", (modules) => {

-				const chunk = this.chunks.find((chunk) => chunk.name === options.name);

-				if(!chunk) throw new Error("ChunkModuleIdRangePlugin: Chunk with name '" + options.name + "' was not found");

-				let currentId = options.start;

-				let chunkModules;

-				if(options.order) {

-					chunkModules = chunk.modules.slice();

-					switch(options.order) {

-						case "index":

-							chunkModules.sort((a, b) => {

-								return a.index - b.index;

-							});

-							break;

-						case "index2":

-							chunkModules.sort((a, b) => {

-								return a.index2 - b.index2;

-							});

-							break;

-						default:

-							throw new Error("ChunkModuleIdRangePlugin: unexpected value of order");

-					}

-

-				} else {

-					chunkModules = modules.filter((m) => {

-						return m.chunks.indexOf(chunk) >= 0;

-					});

-				}

-

-				for(let i = 0; i < chunkModules.length; i++) {

-					const m = chunkModules[i];

-					if(m.id === null) {

-						m.id = currentId++;

-					}

-					if(options.end && currentId > options.end)

-						break;

-				}

-			});

-		});

-	}

-}

-module.exports = ChunkModuleIdRangePlugin;

+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const sortByIndex = (a, b) => {
+	return a.index - b.index;
+};
+
+const sortByIndex2 = (a, b) => {
+	return a.index2 - b.index2;
+};
+
+class ChunkModuleIdRangePlugin {
+	constructor(options) {
+		this.options = options;
+	}
+
+	apply(compiler) {
+		const options = this.options;
+		compiler.hooks.compilation.tap("ChunkModuleIdRangePlugin", compilation => {
+			compilation.hooks.moduleIds.tap("ChunkModuleIdRangePlugin", modules => {
+				const chunk = compilation.chunks.find(
+					chunk => chunk.name === options.name
+				);
+				if (!chunk) {
+					throw new Error(
+						`ChunkModuleIdRangePlugin: Chunk with name '${
+							options.name
+						}"' was not found`
+					);
+				}
+
+				let chunkModules;
+				if (options.order) {
+					chunkModules = Array.from(chunk.modulesIterable);
+					switch (options.order) {
+						case "index":
+							chunkModules.sort(sortByIndex);
+							break;
+						case "index2":
+							chunkModules.sort(sortByIndex2);
+							break;
+						default:
+							throw new Error(
+								"ChunkModuleIdRangePlugin: unexpected value of order"
+							);
+					}
+				} else {
+					chunkModules = modules.filter(m => {
+						return m.chunksIterable.has(chunk);
+					});
+				}
+
+				let currentId = options.start || 0;
+				for (let i = 0; i < chunkModules.length; i++) {
+					const m = chunkModules[i];
+					if (m.id === null) {
+						m.id = currentId++;
+					}
+					if (options.end && currentId > options.end) break;
+				}
+			});
+		});
+	}
+}
+module.exports = ChunkModuleIdRangePlugin;