fix: avoid direct requires to pnpapi

merceyz · Aug 26, 2021 · 88a1059 · 88a1059
1 parent 83a9f88
commit 88a1059
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/src/compiler/moduleSpecifiers.ts b/src/compiler/moduleSpecifiers.ts
@@ -558,7 +558,8 @@ namespace ts.moduleSpecifiers {
 
         let packageName: string | undefined;
         if (!parts && typeof process.versions.pnp !== "undefined") {
-            const pnpApi = require("pnpapi");
+            const {findPnpApi} = require("module");
+            const pnpApi = findPnpApi(path);
             const locator = pnpApi.findPackageLocator(path);
             // eslint-disable-next-line no-null/no-null
             if (locator !== null) {

diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -4121,7 +4121,8 @@ namespace ts.server {
             if (typeof process.versions.pnp === "undefined") {
                 return;
             }
-            const pnpFileName = require.resolve("pnpapi");
+            const {findPnpApi} = require("module");
+            const pnpFileName = findPnpApi(__filename).resolveRequest('pnpapi', null);
             return this.watchFactory.watchFile(
                 pnpFileName,
                 () => {

diff --git a/src/server/project.ts b/src/server/project.ts
@@ -2248,11 +2248,12 @@ namespace ts.server {
                 // the PnP API. This way users don't have to know the virtual paths,
                 // but we still support them just fine even through references.
 
-                const pnpApi = require("pnpapi");
                 const basePath = this.getCurrentDirectory();
+                const {findPnpApi} = require("module");
 
                 const getPnpPath = (path: string) => {
                     try {
+                        const pnpApi = findPnpApi(`${path}/`);
                         const targetLocator = pnpApi.findPackageLocator(`${path}/`);
                         const {packageLocation} = pnpApi.getPackageInformation(targetLocator);
                         const request = combinePaths(targetLocator.name, getRelativePathFromDirectory(packageLocation, path, false));

diff --git a/src/tsserver/nodeServer.ts b/src/tsserver/nodeServer.ts
@@ -196,7 +196,8 @@ namespace ts.server {
                     try {
                         const args = [combinePaths(__dirname, "watchGuard.js"), path];
                         if (typeof process.versions.pnp !== "undefined") {
-                            args.unshift('-r', require.resolve('pnpapi'));
+                            const {findPnpApi} = require("module");
+                            args.unshift('-r', findPnpApi(__filename).resolveRequest('pnpapi', null));
                         }
                         if (logger.hasLevel(LogLevel.verbose)) {
                             logger.info(`Starting ${process.execPath} with args:${stringifyIndented(args)}`);
@@ -511,7 +512,8 @@ namespace ts.server {
                 }
 
                 if (typeof process.versions.pnp !== "undefined") {
-                    execArgv.unshift('-r', require.resolve('pnpapi'));
+                    const {findPnpApi} = require("module");
+                    execArgv.unshift('-r', findPnpApi(__filename).resolveRequest('pnpapi', null));
                 }
 
                 this.installer = childProcess.fork(combinePaths(__dirname, "typingsInstaller.js"), args, { execArgv });