Merge pull request webpack#3384 from uncleyo/exclude-with-loader

sokra · web-flow · commit c356619bbeda · 2016-11-28T16:13:46.000+01:00
Unhide own modules when loader path matches exclude filter
diff --git a/lib/Stats.js b/lib/Stats.js
@@ -64,7 +64,7 @@ Stats.prototype.toJson = function toJson(options, forToString) {
 		}
 		if(excludeModules.length === 0)
 			return true;
-		var ident = module.identifier();
+		var ident = module.resource;
 		return !excludeModules.some(function(regExp) {
 			return regExp.test(ident);
 		});
diff --git a/test/statsCases/exclude-with-loader/a.txt b/test/statsCases/exclude-with-loader/a.txt
@@ -0,0 +1 @@
+module.exports = "a"
diff --git a/test/statsCases/exclude-with-loader/exclude/b.txt b/test/statsCases/exclude-with-loader/exclude/b.txt
@@ -0,0 +1 @@
+module.exports = "b"
diff --git a/test/statsCases/exclude-with-loader/expected.txt b/test/statsCases/exclude-with-loader/expected.txt
@@ -0,0 +1,8 @@
+Hash: affacd3db222d3fcb700
+Time: Xms
+    Asset     Size  Chunks             Chunk Names
+bundle.js  2.69 kB       0  [emitted]  main
+chunk    {0} bundle.js (main) 132 bytes [entry] [rendered]
+    [0] (webpack)/test/statsCases/exclude-with-loader/a.txt 43 bytes {0} [built]
+    [2] (webpack)/test/statsCases/exclude-with-loader/index.js 46 bytes {0} [built]
+     + 1 hidden modules
diff --git a/test/statsCases/exclude-with-loader/index.js b/test/statsCases/exclude-with-loader/index.js
@@ -0,0 +1,2 @@
+require("./a.txt")
+require("./exclude/b.txt")
diff --git a/test/statsCases/exclude-with-loader/webpack.config.js b/test/statsCases/exclude-with-loader/webpack.config.js
@@ -0,0 +1,18 @@
+module.exports = {
+	entry: "./index",
+	output: {
+		filename: "bundle.js"
+	},
+	stats: {
+		exclude: [
+			"node_modules",
+			"exclude"
+		]
+	},
+	module: {
+		loaders: [{
+			test: /\.txt/,
+			loader: "raw-loader"
+		}]
+	}
+};

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ Stats.prototype.toJson = function toJson(options, forToString) {`
`64`	`64`	`}`
`65`	`65`	`if(excludeModules.length === 0)`
`66`	`66`	`return true;`
`67`		`- var ident = module.identifier();`
	`67`	`+ var ident = module.resource;`
`68`	`68`	`return !excludeModules.some(function(regExp) {`
`69`	`69`	`return regExp.test(ident);`
`70`	`70`	`});`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+require("./a.txt")`
	`2`	`+require("./exclude/b.txt")`