make pnpapi workaround platform-specific (#1656)

evanw · evanw · commit 695ddb9b0f60 · 2021-10-04T23:46:15.000-04:00
I'm not sure if this will fix anything, but it probably couldn't hurt.
diff --git a/lib/npm/node-platform.ts b/lib/npm/node-platform.ts
@@ -108,7 +108,7 @@ by esbuild to install the correct binary executable for your current platform.`)
   }
   if (isYarnPnP) {
     const esbuildLibDir = path.dirname(require.resolve('esbuild'));
-    const binTargetPath = path.join(esbuildLibDir, 'yarn-pnp-' + path.basename(subpath));
+    const binTargetPath = path.join(esbuildLibDir, `pnpapi-${pkg}-${path.basename(subpath)}`);
     if (!fs.existsSync(binTargetPath)) {
       fs.copyFileSync(binPath, binTargetPath);
       fs.chmodSync(binTargetPath, 0o755);

Original file line number	Diff line number	Diff line change
@@ -108,7 +108,7 @@ by esbuild to install the correct binary executable for your current platform.`)
`108`	`108`	`}`
`109`	`109`	`if (isYarnPnP) {`
`110`	`110`	`const esbuildLibDir = path.dirname(require.resolve('esbuild'));`
`111`		`- const binTargetPath = path.join(esbuildLibDir, 'yarn-pnp-' + path.basename(subpath));`
	`111`	+ const binTargetPath = path.join(esbuildLibDir, `pnpapi-${pkg}-${path.basename(subpath)}`);
`112`	`112`	`if (!fs.existsSync(binTargetPath)) {`
`113`	`113`	`fs.copyFileSync(binPath, binTargetPath);`
`114`	`114`	`fs.chmodSync(binTargetPath, 0o755);`