Merge pull request #194 from webpack/bugfix/pnp-dep

PnP tracks dependency to the .pnp.js file

Author: sokra

lib/PnpPlugin.js

@@ -23,16 +23,26 @@ module.exports = class PnpPlugin {
 				const issuer = `${request.path}/`;
 
 				let resolution;
+				let apiResolution;
 				try {
 					resolution = this.pnpApi.resolveToUnqualified(req, issuer, {
 						considerBuiltins: false
 					});
+					if (resolveContext.fileDependencies) {
+						apiResolution = this.pnpApi.resolveToUnqualified("pnpapi", issuer, {
+							considerBuiltins: false
+						});
+					}
 				} catch (error) {
 					return callback(error);
 				}
 
 				if (resolution === req) return callback();
 
+				if (apiResolution) {
+					resolveContext.fileDependencies.add(apiResolution);
+				}
+
 				const obj = {
 					...request,
 					path: resolution,

test/pnp.js

@@ -62,6 +62,28 @@ describe("pnp", () => {
 			done();
 		});
 	});
+	it("should track dependency to the pnp api", done => {
+		pnpApi.mocks.set(
+			"pkg/dir/index.js",
+			path.resolve(fixture, "pkg/dir/index.js")
+		);
+		pnpApi.mocks.set("pnpapi", path.resolve(fixture, ".pnp.js"));
+		const fileDependencies = new Set();
+		resolver.resolve(
+			{},
+			__dirname,
+			"pkg/dir/index.js",
+			{ fileDependencies },
+			(err, result) => {
+				if (err) return done(err);
+				result.should.equal(path.resolve(fixture, "pkg/dir/index.js"));
+				Array.from(fileDependencies).should.containEql(
+					path.resolve(fixture, ".pnp.js")
+				);
+				done();
+			}
+		);
+	});
 	it("should resolve module names with package.json", done => {
 		pnpApi.mocks.set("pkg", path.resolve(fixture, "pkg"));
 		resolver.resolve({}, __dirname, "pkg", {}, (err, result) => {