Merge pull request #9328 from jchapman127/bugfix/match-resource

[WIP] Fixes #9053: Wrong loaders order when using inline match resource

lib/NormalModuleFactory.js

@@ -335,7 +335,11 @@ class NormalModuleFactory extends Tapable {
 						],
 						(err, results) => {
 							if (err) return callback(err);
-							loaders = results[0].concat(loaders, results[1], results[2]);
+							if (matchResource === undefined) {
+								loaders = results[0].concat(loaders, results[1], results[2]);
+							} else {
+								loaders = results[0].concat(results[1], loaders, results[2]);
+							}
 							process.nextTick(() => {
 								const type = settings.type;
 								const resolveOptions = settings.resolve;

test/configCases/loaders/issue-9053/b.js

@@ -0,0 +1 @@
+module.exports = ["b"];

test/configCases/loaders/issue-9053/c.js

@@ -0,0 +1 @@
+module.exports = ["c"];

test/configCases/loaders/issue-9053/index.js

@@ -0,0 +1,17 @@
+it("should apply inline loaders before matchResource", function() {
+	var foo = require("c.js!=!loader1!./b.js");
+
+	expect(foo).toEqual(["b", "1", "2"]);
+});
+
+it("should apply config loaders before inline loaders", function() {
+	var foo = require("loader1!./c.js");
+
+	expect(foo).toEqual(["c", "2", "1"]);
+});
+
+it("should not apply config loaders when matchResource is used", function() {
+	var foo = require("d.js!=!loader1!./c.js");
+
+	expect(foo).toEqual(["c", "1", "3"]);
+});

test/configCases/loaders/issue-9053/webpack.config.js

@@ -0,0 +1,14 @@
+module.exports = {
+	module: {
+		rules: [
+			{
+				test: /c\.js$/,
+				use: ["loader2"]
+			},
+			{
+				test: /d\.js$/,
+				use: ["loader3"]
+			}
+		]
+	}
+};