feature(alias): allow loader query to be used for aliased loader

TheLarkInn · TheLarkInn · commit 1999af3ef67a · 2016-12-08T02:58:56.000-06:00
diff --git a/lib/NormalModuleFactory.js b/lib/NormalModuleFactory.js
@@ -228,6 +228,8 @@ NormalModuleFactory.prototype.resolveRequestArray = function resolveRequestArray
 	if(array.length === 0) return callback(null, []);
 	async.map(array, function(item, callback) {
 		resolver.resolve(contextInfo, context, item.loader, function(err, result) {
+			var resultQuery;
+			var queryIndex = result.indexOf("?");
 			if(err && /^[^/]*$/.test(item.loader) && !/-loader$/.test(item.loader)) {
 				return resolver.resolve(contextInfo, context, item.loader + "-loader", function(err2) {
 					if(!err2) {
@@ -239,9 +241,20 @@ NormalModuleFactory.prototype.resolveRequestArray = function resolveRequestArray
 				});
 			}
 			if(err) return callback(err);
-			return callback(null, objectAssign({}, item, {
+
+			if(queryIndex > -1) {
+				resultQuery = result.substr(queryIndex + 1, result.length);
+				result = result.substr(0, queryIndex)
+			}
+
+			var resultRequest = {
 				loader: result
-			}));
+			};
+
+			if(resultQuery)
+				item.options = resultQuery;
+
+			return callback(null, objectAssign({}, item, resultRequest));
 		});
 	}, callback);
 };
diff --git a/test/ConfigTestCases.test.js b/test/ConfigTestCases.test.js
@@ -11,6 +11,7 @@ var webpack = require("../lib/webpack");
 describe("ConfigTestCases", function() {
 	var casesPath = path.join(__dirname, "configCases");
 	var categories = fs.readdirSync(casesPath);
+
 	categories = categories.map(function(cat) {
 		return {
 			name: cat,
diff --git a/test/configCases/loaders/issue-3320/a.js b/test/configCases/loaders/issue-3320/a.js
diff --git a/test/configCases/loaders/issue-3320/index.js b/test/configCases/loaders/issue-3320/index.js
@@ -0,0 +1,5 @@
+it("should resolve aliased loader module with query (issue-3320)", function() {
+	var foo = require('./a');
+
+	foo.should.be.eql("someMessage");
+});
diff --git a/test/configCases/loaders/issue-3320/node_modules/any-loader.js b/test/configCases/loaders/issue-3320/node_modules/any-loader.js
diff --git a/test/configCases/loaders/issue-3320/webpack.config.js b/test/configCases/loaders/issue-3320/webpack.config.js
@@ -0,0 +1,19 @@
+module.exports = {
+	resolveLoader: {
+		alias: {
+			"any-loader": 'any-loader?foo="someMessage"'
+		}
+	},
+	module: {
+		rules: [
+			{
+				test: /a\.js$/,
+				use: [
+					{
+						loader: "any-loader"
+					}
+				]
+			}
+		]
+	}
+}
