Merge pull request #266 from webpack/bugfix/pnp-fully-specified

remove fullySpecified when resolving a module request with PnP

Author: sokra

lib/PnpPlugin.js

@@ -77,7 +77,9 @@ module.exports = class PnpPlugin {
 					...request,
 					path: resolution,
 					request: undefined,
-					ignoreSymlinks: true
+					ignoreSymlinks: true,
+					fullySpecified:
+						request.fullySpecified && !/^(@[^/]+\/)?[^/]+$/.test(req)
 				};
 				resolver.doResolve(
 					target,

test/pnp.js

@@ -26,6 +26,7 @@ try {
 
 describe("pnp", () => {
 	let pnpApi;
+	let resolverFuzzy;
 	let resolver;
 	if (isAdmin) {
 		before(() => {
@@ -49,7 +50,7 @@ describe("pnp", () => {
 				}
 			}
 		});
-		resolver = ResolverFactory.createResolver({
+		resolverFuzzy = ResolverFactory.createResolver({
 			extensions: [".ts", ".js"],
 			aliasFields: ["browser"],
 			fileSystem: nodeFileSystem,
@@ -59,6 +60,16 @@ describe("pnp", () => {
 			pnpApi,
 			modules: ["node_modules", path.resolve(fixture, "../pnp-a")]
 		});
+		resolver = ResolverFactory.createResolver({
+			aliasFields: ["browser"],
+			fileSystem: nodeFileSystem,
+			fullySpecified: true,
+			alias: {
+				alias: path.resolve(fixture, "pkg")
+			},
+			pnpApi,
+			modules: ["node_modules", path.resolve(fixture, "../pnp-a")]
+		});
 	});
 	it("should resolve by going through the pnp api", done => {
 		pnpApi.mocks.set(
@@ -71,6 +82,13 @@ describe("pnp", () => {
 			done();
 		});
 	});
+	it("should not resolve a not fully specified request when fullySpecified is set", done => {
+		pnpApi.mocks.set("pkg/dir/index", path.resolve(fixture, "pkg/dir/index"));
+		resolver.resolve({}, __dirname, "pkg/dir/index", {}, (err, result) => {
+			err.should.be.instanceof(Error);
+			done();
+		});
+	});
 	it("should track dependency to the pnp api", done => {
 		pnpApi.mocks.set(
 			"pkg/dir/index.js",
@@ -114,11 +132,19 @@ describe("pnp", () => {
 		isAdmin
 			? done => {
 					pnpApi.mocks.set("pkg/symlink", path.resolve(fixture, "pkg/symlink"));
-					resolver.resolve({}, __dirname, "pkg/symlink", {}, (err, result) => {
-						if (err) return done(err);
-						result.should.equal(path.resolve(fixture, "pkg/symlink/index.js"));
-						done();
-					});
+					resolverFuzzy.resolve(
+						{},
+						__dirname,
+						"pkg/symlink",
+						{},
+						(err, result) => {
+							if (err) return done(err);
+							result.should.equal(
+								path.resolve(fixture, "pkg/symlink/index.js")
+							);
+							done();
+						}
+					);
 			  }
 			: undefined
 	);
@@ -127,7 +153,7 @@ describe("pnp", () => {
 			"@user/pkg/typescript",
 			path.resolve(fixture, "pkg/typescript")
 		);
-		resolver.resolve(
+		resolverFuzzy.resolve(
 			{},
 			__dirname,
 			"@user/pkg/typescript",
@@ -144,13 +170,19 @@ describe("pnp", () => {
 			"pkg/package-alias",
 			path.resolve(fixture, "pkg/package-alias")
 		);
-		resolver.resolve({}, __dirname, "pkg/package-alias", {}, (err, result) => {
-			if (err) return done(err);
-			result.should.equal(
-				path.resolve(fixture, "pkg/package-alias/browser.js")
-			);
-			done();
-		});
+		resolverFuzzy.resolve(
+			{},
+			__dirname,
+			"pkg/package-alias",
+			{},
+			(err, result) => {
+				if (err) return done(err);
+				result.should.equal(
+					path.resolve(fixture, "pkg/package-alias/browser.js")
+				);
+				done();
+			}
+		);
 	});
 	it("should prefer normal modules over pnp resolves", done => {
 		pnpApi.mocks.set("m1/a.js", path.resolve(fixture, "pkg/a.js"));