fixed chunkNameFiles for chunk merging

sokra · sokra · commit 8dac14a3d95a · 2012-10-26T01:41:21.000+02:00
diff --git a/lib/formatOutput.js b/lib/formatOutput.js
@@ -26,11 +26,16 @@ module.exports = function(stats, options) {
 		});
 		var fileChunkNames = {};
 		Object.keys(stats.chunkNameFiles).forEach(function(name) {
-			if(name.length > maxLenChunkname) maxLenChunkname = name.length;
-			fileChunkNames[stats.chunkNameFiles[name]] = name;
+			if(/^[1-9][0-9]*$/.test(name)) return;
+			var filename = stats.chunkNameFiles[name];
+			if(!fileChunkNames[filename])
+				fileChunkNames[filename] = [];
+			fileChunkNames[filename].push(name);
+			var length = fileChunkNames[filename].join(" ").length;
+			if(length > maxLenChunkname) maxLenChunkname = length;
 		});
 		Object.keys(stats.fileSizes).forEach(function(file) {
-			var name = fileChunkNames[file] || "";
+			var name = fileChunkNames[file] && fileChunkNames[file].join(" ") || "";
 			var fileLine = sprintf("%" + maxLenChunkname + "s", name) + c("\033[1m") + sprintf("%" + (3 + maxLenFilename) + "s", file) + c("\033[22m")+": "+c("\033[1m") + sprintf("%8d", stats.fileSizes[file]) + c("\033[22m") + " chars/bytes ";
 			buf.push(fileLine);
 		});
diff --git a/lib/webpack.js b/lib/webpack.js
@@ -447,32 +447,35 @@ function webpack(context, moduleName, options, callback) {
 			var chunkNameMap = {};
 
 			chunkIds.reverse().forEach(function(chunkId) {
-				var chunk = depTree.chunks[chunkId]
-				if(!chunk.filename) return;
-				var modulesArray = [];
-				for(var moduleId in chunk.modules) {
-					if(chunk.modules[moduleId] === "include") {
-						var modu = depTree.modules[moduleId];
-						modulesArray.push({
-							id: modu.realId,
-							size: modu.size,
-							filename: modu.filename,
-							dirname: modu.dirname,
-							fromCache: modu.fromCache,
-							toCache: modu.toCache,
-							seperate: modu.seperate,
-							profile: modu.profile,
-							loaders: modu.loaders,
-							dependencies: modu.dependencies,
-							reasons: modu.reasons});
-						sum++;
-					}
+				var chunk = depTree.chunks[chunkId];
+				if(chunk.filename) {
+					var modulesArray = [];
+					for(var moduleId in chunk.modules) {
+						if(chunk.modules[moduleId] === "include") {
+							var modu = depTree.modules[moduleId];
+							modulesArray.push({
+								id: modu.realId,
+								size: modu.size,
+								filename: modu.filename,
+								dirname: modu.dirname,
+								fromCache: modu.fromCache,
+								toCache: modu.toCache,
+								seperate: modu.seperate,
+								profile: modu.profile,
+								loaders: modu.loaders,
+								dependencies: modu.dependencies,
+								reasons: modu.reasons});
+							sum++;
+						}
 
+					}
+					modulesArray.sort(function(a, b) {
+						return a.id - b.id;
+					});
+					fileModulesMap[path.basename(chunk.filename)] = modulesArray;
 				}
-				modulesArray.sort(function(a, b) {
-					return a.id - b.id;
-				});
-				fileModulesMap[path.basename(chunk.filename)] = modulesArray;
+				while(chunk.equals)
+					chunk = depTree.chunks[chunk.equals];
 				chunkNameMap[chunkId] = path.basename(chunk.filename).replace(HASH_REGEXP, hash);
 			});
 			buffer.modulesIncludingDuplicates = sum;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "webpack",
-	"version": "0.7.6",
+	"version": "0.7.7",
 	"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 loading of js, json, jade, coffee, css, ... out of the box and more with custom loaders.",
 	"dependencies": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "webpack",`
`3`		`- "version": "0.7.6",`
	`3`	`+ "version": "0.7.7",`
`4`	`4`	`"author": "Tobias Koppers @sokra",`
`5`	`5`	`"description": "Packs CommonJs/AMD Modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loading of js, json, jade, coffee, css, ... out of the box and more with custom loaders.",`
`6`	`6`	`"dependencies": {`