webpack 3.3.0 → 3.5.1

package/lib/optimize/AggressiveSplittingPlugin.js

@@ -39,6 +39,13 @@ class AggressiveSplittingPlugin {
 	apply(compiler) {
 		compiler.plugin("this-compilation", (compilation) => {
 			compilation.plugin("optimize-chunks-advanced", (chunks) => {
+				// Precompute stuff
+				const nameToModuleMap = new Map();
+				compilation.modules.forEach(m => {
+					const name = identifierUtils.makePathsRelative(compiler.context, m.identifier(), compilation.cache);
+					nameToModuleMap.set(name, m);
+				});
+
 				const savedSplits = compilation.records && compilation.records.aggressiveSplits || [];
 				const usedSplits = compilation._aggressiveSplittingSplits ?
 					savedSplits.concat(compilation._aggressiveSplittingSplits) : savedSplits;
@@ -48,45 +55,51 @@ class AggressiveSplittingPlugin {
 				// 1. try to restore to recorded splitting
 				for(let j = 0; j < usedSplits.length; j++) {
 					const splitData = usedSplits[j];
-					for(let i = 0; i < chunks.length; i++) {
-						const chunk = chunks[i];
+					const selectedModules = splitData.modules.map(name => nameToModuleMap.get(name));
 
-						if(chunk.getNumberOfModules() < splitData.modules.length)
-							continue;
+					// Does the modules exist at all?
+					if(selectedModules.every(Boolean)) {
 
-						const nameToModuleMap = new Map();
-						chunk.forEachModule(m => {
-							const name = identifierUtils.makePathsRelative(compiler.context, m.identifier());
-							nameToModuleMap.set(name, m);
-						});
+						// Find all chunks containing all modules in the split
+						for(let i = 0; i < chunks.length; i++) {
+							const chunk = chunks[i];
 
-						const selectedModules = splitData.modules.map(name => nameToModuleMap.get(name));
-						if(selectedModules.every(Boolean)) {
-							if(chunk.getNumberOfModules() > splitData.modules.length) {
-								const newChunk = compilation.addChunk();
-								selectedModules.forEach(moveModuleBetween(chunk, newChunk));
-								chunk.split(newChunk);
-								chunk.name = null;
-								newChunk._fromAggressiveSplitting = true;
-								if(j < savedSplits.length)
-									newChunk._fromAggressiveSplittingIndex = j;
-								if(splitData.id !== null && splitData.id !== undefined) {
-									newChunk.id = splitData.id;
-								}
-								newChunk.origins = chunk.origins.map(copyWithReason);
-								chunk.origins = chunk.origins.map(copyWithReason);
-								return true;
-							} else {
-								if(j < savedSplits.length)
-									chunk._fromAggressiveSplittingIndex = j;
-								chunk.name = null;
-								if(splitData.id !== null && splitData.id !== undefined) {
-									chunk.id = splitData.id;
+							// Cheap check if chunk is suitable at all
+							if(chunk.getNumberOfModules() < splitData.modules.length)
+								continue;
+
+							// Check if all modules are in the chunk
+							if(selectedModules.every(m => chunk.containsModule(m))) {
+
+								// Is chunk identical to the split or do we need to split it?
+								if(chunk.getNumberOfModules() > splitData.modules.length) {
+									// split the chunk into two parts
+									const newChunk = compilation.addChunk();
+									selectedModules.forEach(moveModuleBetween(chunk, newChunk));
+									chunk.split(newChunk);
+									chunk.name = null;
+									newChunk._fromAggressiveSplitting = true;
+									if(j < savedSplits.length)
+										newChunk._fromAggressiveSplittingIndex = j;
+									if(splitData.id !== null && splitData.id !== undefined) {
+										newChunk.id = splitData.id;
+									}
+									newChunk.origins = chunk.origins.map(copyWithReason);
+									chunk.origins = chunk.origins.map(copyWithReason);
+									return true;
+								} else { // chunk is identical to the split
+									if(j < savedSplits.length)
+										chunk._fromAggressiveSplittingIndex = j;
+									chunk.name = null;
+									if(splitData.id !== null && splitData.id !== undefined) {
+										chunk.id = splitData.id;
+									}
 								}
 							}
 						}
 					}
 				}
+
 				// 2. for any other chunk which isn't splitted yet, split it
 				for(let i = 0; i < chunks.length; i++) {
 					const chunk = chunks[i];
@@ -127,7 +140,7 @@ class AggressiveSplittingPlugin {
 							newChunk.origins = chunk.origins.map(copyWithReason);
 							chunk.origins = chunk.origins.map(copyWithReason);
 							compilation._aggressiveSplittingSplits = (compilation._aggressiveSplittingSplits || []).concat({
-								modules: newChunk.mapModules(m => identifierUtils.makePathsRelative(compiler.context, m.identifier()))
+								modules: newChunk.mapModules(m => identifierUtils.makePathsRelative(compiler.context, m.identifier(), compilation.cache))
 							});
 							return true;
 						} else {
@@ -144,7 +157,7 @@ class AggressiveSplittingPlugin {
 					if(chunk.hasEntryModule()) return;
 					const size = chunk.size(this.options);
 					const incorrectSize = size < minSize;
-					const modules = chunk.mapModules(m => identifierUtils.makePathsRelative(compiler.context, m.identifier()));
+					const modules = chunk.mapModules(m => identifierUtils.makePathsRelative(compiler.context, m.identifier(), compilation.cache));
 					if(typeof chunk._fromAggressiveSplittingIndex === "undefined") {
 						if(incorrectSize) return;
 						chunk.recorded = true;

package/lib/optimize/ChunkModuleIdRangePlugin.js

@@ -11,9 +11,7 @@ class ChunkModuleIdRangePlugin {
 		const options = this.options;
 		compiler.plugin("compilation", (compilation) => {
 			compilation.plugin("module-ids", (modules) => {
-				const chunk = this.chunks.filter((chunk) => {
-					return chunk.name === options.name;
-				})[0];
+				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;

package/lib/optimize/CommonsChunkPlugin.js

@@ -60,8 +60,8 @@ The available options are:
 		 * that webpack will take care of loading this file.
 		 */
 		if(options.async && options.filename) {
-			throw new Error(`You can not specify a filename if you use the \"async\" option.
-You can however specify the name of the async chunk by passing the desired string as the \"async\" option.`);
+			throw new Error(`You can not specify a filename if you use the "async" option.
+You can however specify the name of the async chunk by passing the desired string as the "async" option.`);
 		}
 
 		/**
@@ -201,7 +201,7 @@ You can however specify the name of the async chunk by passing the desired strin
 
 		// we dont have named chunks specified, so we just take all of them
 		if(asyncOrNoSelectedChunk) {
-			return allChunks.filter(chunk => !chunk.isInitial());
+			return allChunks;
 		}
 
 		/**
@@ -229,8 +229,15 @@ Take a look at the "name"/"names" or async/children option.`);
 			}
 
 			return targetChunk.chunks.filter((chunk) => {
+				// we only are interested in on-demand chunks
+				if(chunk.isInitial())
+					return false;
+
 				// we can only move modules from this chunk if the "commonChunk" is the only parent
-				return asyncOption || chunk.parents.length === 1;
+				if(!asyncOption)
+					return chunk.parents.length === 1;
+
+				return true;
 			});
 		}