Merge pull request webpack#6640 from clarkdo/module-assets

sokra · web-flow · commit ae2ae4e50401 · 2018-03-05T16:31:17.000+01:00
fix: module assets is in buildInfo
diff --git a/lib/Stats.js b/lib/Stats.js
@@ -136,6 +136,10 @@ class Stats {
 			options.nestedModules,
 			true
 		);
+		const showModuleAssets = optionOrLocalFallback(
+			options.moduleAssets,
+			!forToString
+		);
 		const showDepth = optionOrLocalFallback(options.depth, !forToString);
 		const showCachedModules = optionOrLocalFallback(options.cached, true);
 		const showCachedAssets = optionOrLocalFallback(options.cachedAssets, true);
@@ -417,7 +421,6 @@ class Stats {
 				optional: module.optional,
 				prefetched: module.prefetched,
 				chunks: Array.from(module.chunksIterable, chunk => chunk.id),
-				assets: Object.keys(module.assets || {}),
 				issuer: module.issuer && module.issuer.identifier(),
 				issuerId: module.issuer && module.issuer.id,
 				issuerName:
@@ -435,6 +438,9 @@ class Stats {
 				errors: module.errors ? module.errors.length : 0,
 				warnings: module.warnings ? module.warnings.length : 0
 			};
+			if (showModuleAssets) {
+				obj.assets = Object.keys(module.buildInfo.assets || {});
+			}
 			if (showReasons) {
 				obj.reasons = module.reasons
 					.map(reason => {
@@ -867,6 +873,13 @@ class Stats {
 			if (module.built) {
 				colors.green(" [built]");
 			}
+			if (module.assets && module.assets.length) {
+				colors.magenta(
+					` [${module.assets.length} asset${
+						module.assets.length === 1 ? "" : "s"
+					}]`
+				);
+			}
 			if (module.prefetched) {
 				colors.magenta(" [prefetched]");
 			}
diff --git a/schemas/WebpackOptions.json b/schemas/WebpackOptions.json
@@ -1767,6 +1767,10 @@
               "type": "boolean",
               "description": "add information about modules nested in other modules (like with module concatenation)"
             },
+            "moduleAssets": {
+              "type": "boolean",
+              "description": "add information about assets inside modules"
+            },
             "children": {
               "type": "boolean",
               "description": "add children information"
diff --git a/test/statsCases/module-assets/expected.txt b/test/statsCases/module-assets/expected.txt
@@ -0,0 +1,12 @@
+Hash: d71bd16b0b20f34e994a
+Time: Xms
+Built at: Thu Jan 01 1970 00:00:00 GMT
+Entrypoint main = main.js
+chunk    {0} 0.js 68 bytes <{1}> [rendered]
+    [0] ./node_modules/a/1.png 51 bytes {0} [built] [1 asset]
+    [1] ./node_modules/a/index.js 17 bytes {0} [built]
+chunk    {1} main.js (main) 12 bytes >{0}< [entry] [rendered]
+    [2] ./index.js 12 bytes {1} [built]
+   [0] ./node_modules/a/1.png 51 bytes {0} [built] [1 asset]
+   [1] ./node_modules/a/index.js 17 bytes {0} [built]
+   [2] ./index.js 12 bytes {1} [built]
diff --git a/test/statsCases/module-assets/index.js b/test/statsCases/module-assets/index.js
@@ -0,0 +1 @@
+import('a')
diff --git a/test/statsCases/module-assets/node_modules/a/1.png b/test/statsCases/module-assets/node_modules/a/1.png
diff --git a/test/statsCases/module-assets/node_modules/a/index.js b/test/statsCases/module-assets/node_modules/a/index.js
diff --git a/test/statsCases/module-assets/webpack.config.js b/test/statsCases/module-assets/webpack.config.js
@@ -0,0 +1,26 @@
+module.exports = {
+	mode: "production",
+	entry: "./index",
+	stats: {
+		assets: false,
+		chunks: true,
+		chunkModules: true,
+		modules: true,
+		moduleAssets: true
+	},
+	module: {
+		rules: [
+			{
+				test: /\.png$/,
+				use: [
+					{
+						loader: "file-loader",
+						options: {
+							name: "[name].[ext]"
+						}
+					}
+				]
+			}
+		]
+	}
+};
