Merge pull request webpack#6173 from timkendrick/patch-1

sokra · web-flow · commit f352436a0fd6 · 2017-12-22T08:19:23.000+01:00
Maintain ident when chaining pitching loaders
diff --git a/lib/NormalModuleFactory.js b/lib/NormalModuleFactory.js
@@ -133,7 +133,9 @@ class NormalModuleFactory extends Tapable {
 				try {
 					loaders.forEach(item => {
 						if(typeof item.options === "string" && /^\?/.test(item.options)) {
-							item.options = this.ruleSet.findOptionsByIdent(item.options.substr(1));
+							const ident = item.options.substr(1);
+							item.options = this.ruleSet.findOptionsByIdent(ident);
+							item.ident = ident;
 						}
 					});
 				} catch(e) {
diff --git a/test/configCases/loaders/generate-ident/d.js b/test/configCases/loaders/generate-ident/d.js
diff --git a/test/configCases/loaders/generate-ident/index.js b/test/configCases/loaders/generate-ident/index.js
@@ -2,4 +2,5 @@ it("should correctly pass complex query object with remaining request", function
 	require("./a").should.be.eql("ok");
 	require("./b").should.be.eql("maybe");
 	require("./c").should.be.eql("yes");
+	require("./d").should.be.eql("ok");
 });
diff --git a/test/configCases/loaders/generate-ident/webpack.config.js b/test/configCases/loaders/generate-ident/webpack.config.js
@@ -42,6 +42,22 @@ module.exports = {
 						}
 					}
 				}
+			},
+			{
+				test: /d\.js$/,
+				use: [
+					"./loader1",
+					"./loader1",
+					"./loader1",
+					{
+						loader: "./loader2",
+						options: {
+							f: function() {
+								return "ok";
+							}
+						}
+					}
+				]
 			}
 		]
 	}
