fix: pass resolveSymlinks to directory-fetcher (pnpm#5644)

weyert · Nov 16, 2022 · 1d04e66 · 1d04e66
1 parent 1f412c9
commit 1d04e66
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 1 deletion.
diff --git a/.changeset/warm-lizards-agree.md b/.changeset/warm-lizards-agree.md
@@ -0,0 +1,7 @@
+---
+"@pnpm/core": minor
+"@pnpm/headless": minor
+"@pnpm/lifecycle": minor
+---
+
+New option added: resolveSymlinksInInjectedDirs.
diff --git a/packages/core/src/install/extendInstallOptions.ts b/packages/core/src/install/extendInstallOptions.ts
@@ -116,6 +116,7 @@ export interface StrictInstallOptions {
   patchedDependencies?: Record<string, string>
 
   allProjects: ProjectOptions[]
+  resolveSymlinksInInjectedDirs: boolean
 }
 
 export type InstallOptions =
@@ -199,6 +200,7 @@ const defaults = async (opts: InstallOptions) => {
     workspacePackages: {},
     enableModulesDir: true,
     modulesCacheMaxAge: 7 * 24 * 60,
+    resolveSymlinksInInjectedDirs: false,
   } as StrictInstallOptions
 }
 

diff --git a/packages/core/src/install/index.ts b/packages/core/src/install/index.ts
@@ -245,6 +245,7 @@ export async function mutateModules (
       extraBinPaths: opts.extraBinPaths,
       extraEnv: opts.extraEnv,
       rawConfig: opts.rawConfig,
+      resolveSymlinksInInjectedDirs: opts.resolveSymlinksInInjectedDirs,
       scriptsPrependNodePath: opts.scriptsPrependNodePath,
       scriptShell: opts.scriptShell,
       shellEmulator: opts.shellEmulator,

diff --git a/packages/headless/src/index.ts b/packages/headless/src/index.ts
@@ -144,6 +144,7 @@ export interface HeadlessOptions {
   wantedLockfile?: Lockfile
   ownLifecycleHooksStdio?: 'inherit' | 'pipe'
   pendingBuilds: string[]
+  resolveSymlinksInInjectedDirs?: boolean
   skipped: Set<string>
   enableModulesDir?: boolean
   nodeLinker?: 'isolated' | 'hoisted' | 'pnp'
@@ -194,6 +195,7 @@ export async function headlessInstall (opts: HeadlessOptions) {
     extraBinPaths: opts.extraBinPaths,
     extraEnv: opts.extraEnv,
     rawConfig: opts.rawConfig,
+    resolveSymlinksInInjectedDirs: opts.resolveSymlinksInInjectedDirs,
     scriptsPrependNodePath: opts.scriptsPrependNodePath,
     scriptShell: opts.scriptShell,
     shellEmulator: opts.shellEmulator,

diff --git a/packages/lifecycle/src/runLifecycleHooksConcurrently.ts b/packages/lifecycle/src/runLifecycleHooksConcurrently.ts
@@ -11,6 +11,7 @@ export type RunLifecycleHooksConcurrentlyOptions = Omit<RunLifecycleHookOptions,
 | 'pkgRoot'
 | 'rootModulesDir'
 > & {
+  resolveSymlinksInInjectedDirs?: boolean
   storeController: StoreController
 }
 
@@ -53,7 +54,7 @@ export async function runLifecycleHooksConcurrently (
           await runLifecycleHook(stage, manifest, runLifecycleHookOpts)
         }
         if (targetDirs == null || targetDirs.length === 0) return
-        const filesResponse = await fetchFromDir(rootDir, {})
+        const filesResponse = await fetchFromDir(rootDir, { resolveSymlinks: opts.resolveSymlinksInInjectedDirs })
         await Promise.all(
           targetDirs.map(async (targetDir) => {
             const targetModulesDir = path.join(targetDir, 'node_modules')