Skip to content

Commit 431a035

Browse files
committed
Keep pnpm-internal symlinks out of the symlink cache
1 parent 87a6b88 commit 431a035

File tree

2 files changed

+0
-25
lines changed

2 files changed

+0
-25
lines changed

src/compiler/program.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3756,11 +3756,7 @@ namespace ts {
37563756
}
37573757

37583758
function handleDirectoryCouldBeSymlink(directory: string) {
3759-
<<<<<<< HEAD
37603759
if (!host.getResolvedProjectReferences() || containsIgnoredPath(directory)) return;
3761-
=======
3762-
if (!host.getResolvedProjectReferences() && !pathContainsPnpmDirectory(directory)) return;
3763-
>>>>>>> 5abd4628af... Create symlink cache when a pnpm module is found
37643760

37653761
// Because we already watch node_modules, handle symlinks in there
37663762
if (!originalRealpath || !stringContains(directory, nodeModulesPathPart)) return;

tests/cases/fourslash/server/autoImportProviderPnpm.ts

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)