fix: give precedence to pnp over node_modules, close #288

webpack · Apr 15, 2021 · 5df4f05 · 5df4f05
1 parent f08fe3f
commit 5df4f05
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/lib/ResolverFactory.js b/lib/ResolverFactory.js
@@ -399,14 +399,14 @@ exports.createResolver = function (options) {
 	});
 	modules.forEach(item => {
 		if (Array.isArray(item)) {
-			plugins.push(
-				new ModulesInHierachicDirectoriesPlugin("raw-module", item, "module")
-			);
 			if (item.includes("node_modules") && pnpApi) {
 				plugins.push(
 					new PnpPlugin("raw-module", pnpApi, "undescribed-resolve-in-package")
 				);
 			}
+			plugins.push(
+				new ModulesInHierachicDirectoriesPlugin("raw-module", item, "module")
+			);
 		} else {
 			plugins.push(new ModulesInRootPlugin("raw-module", item, "module"));
 		}

diff --git a/test/pnp.js b/test/pnp.js
@@ -172,17 +172,16 @@ describe("pnp", () => {
 			}
 		);
 	});
-	it("should prefer normal modules over pnp resolves", done => {
+	it("should prefer pnp resolves over normal modules", done => {
 		pnpApi.mocks.set("m1", path.resolve(fixture, "pkg"));
 		resolver.resolve(
 			{},
 			path.resolve(__dirname, "fixtures"),
 			"m1/a.js",
 			{},
-			(err, result) => {
-				if (err) return done(err);
-				result.should.equal(path.resolve(fixture, "../node_modules/m1/a.js"));
-				done();
+			err => {
+				if (err) return done();
+				done(new Error("Resolved by normal modules"));
 			}
 		);
 	});