fix: resolve symlinks in system watchers (#712)

TypeStrong · Feb 12, 2022 · b5a38c1 · b5a38c1
1 parent a6b66eb
commit b5a38c1
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/src/typescript/worker/lib/system.ts b/src/typescript/worker/lib/system.ts
@@ -161,15 +161,15 @@ export const system: ControlledTypeScriptSystem = {
     isInitialRun = false;
   },
   invokeFileCreated(path: string) {
-    const normalizedPath = realFileSystem.normalizePath(path);
+    const normalizedPath = normalizeAndResolvePath(path);
 
     invokeFileWatchers(path, typescript.FileWatcherEventKind.Created);
     invokeDirectoryWatchers(normalizedPath);
 
     deletedFiles.set(normalizedPath, false);
   },
   invokeFileChanged(path: string) {
-    const normalizedPath = realFileSystem.normalizePath(path);
+    const normalizedPath = normalizeAndResolvePath(path);
 
     if (deletedFiles.get(normalizedPath) || !fileWatcherCallbacksMap.has(normalizedPath)) {
       invokeFileWatchers(path, typescript.FileWatcherEventKind.Created);
@@ -181,7 +181,7 @@ export const system: ControlledTypeScriptSystem = {
     }
   },
   invokeFileDeleted(path: string) {
-    const normalizedPath = realFileSystem.normalizePath(path);
+    const normalizedPath = normalizeAndResolvePath(path);
 
     if (!deletedFiles.get(normalizedPath)) {
       invokeFileWatchers(path, typescript.FileWatcherEventKind.Deleted);
@@ -205,8 +205,7 @@ function createWatcher<TCallback>(
   path: string,
   callback: TCallback
 ) {
-  const normalizedPath = realFileSystem.normalizePath(path);
-
+  const normalizedPath = normalizeAndResolvePath(path);
   const watchers = watchersMap.get(normalizedPath) || [];
   const nextWatchers = [...watchers, callback];
   watchersMap.set(normalizedPath, nextWatchers);
@@ -226,7 +225,7 @@ function createWatcher<TCallback>(
 }
 
 function invokeFileWatchers(path: string, event: ts.FileWatcherEventKind) {
-  const normalizedPath = realFileSystem.normalizePath(path);
+  const normalizedPath = normalizeAndResolvePath(path);
   if (normalizedPath.endsWith('.js')) {
     // trigger relevant .d.ts file watcher - handles the case, when we have webpack watcher
     // that points to a symlinked package
@@ -243,7 +242,7 @@ function invokeFileWatchers(path: string, event: ts.FileWatcherEventKind) {
 }
 
 function invokeDirectoryWatchers(path: string) {
-  const normalizedPath = realFileSystem.normalizePath(path);
+  const normalizedPath = normalizeAndResolvePath(path);
   const directory = dirname(normalizedPath);
 
   if (ignoredPaths.some((ignoredPath) => forwardSlash(normalizedPath).includes(ignoredPath))) {
@@ -272,6 +271,16 @@ function invokeDirectoryWatchers(path: string) {
   );
 }
 
+function normalizeAndResolvePath(path: string) {
+  let normalizedPath = realFileSystem.normalizePath(path);
+  try {
+    normalizedPath = realFileSystem.realPath(normalizedPath);
+  } catch (error) {
+    // ignore error - maybe file doesn't exist
+  }
+  return normalizedPath;
+}
+
 function isArtifact(path: string) {
   return (
     (artifacts.dirs.some((dir) => path.includes(dir)) ||