From b5d588e1bdb989d479892789c4e52c6626279b00 Mon Sep 17 00:00:00 2001 From: Cristiano Calcagno Date: Thu, 29 Apr 2021 16:20:01 +0200 Subject: [PATCH 1/2] Fix another infinite loop on paths on Windows. --- analysis/src/ModuleResolution.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/analysis/src/ModuleResolution.ml b/analysis/src/ModuleResolution.ml index eb1204907..6a16ccc2e 100644 --- a/analysis/src/ModuleResolution.ml +++ b/analysis/src/ModuleResolution.ml @@ -1,5 +1,5 @@ let rec resolveNodeModulePath ~startPath name = let path = Filename.concat (Filename.concat startPath "node_modules") name in if Files.exists path then Some path - else if startPath = "/" then None + else if startPath = "/" || Filename.dirname startPath = startPath then None else resolveNodeModulePath ~startPath:(Filename.dirname startPath) name From 34aa29c53645810ead9b8a7d5534c8ae9062bc53 Mon Sep 17 00:00:00 2001 From: Cheng Lou Date: Thu, 29 Apr 2021 07:44:32 -0700 Subject: [PATCH 2/2] Update ModuleResolution.ml --- analysis/src/ModuleResolution.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/analysis/src/ModuleResolution.ml b/analysis/src/ModuleResolution.ml index 6a16ccc2e..c073aff6c 100644 --- a/analysis/src/ModuleResolution.ml +++ b/analysis/src/ModuleResolution.ml @@ -1,5 +1,5 @@ let rec resolveNodeModulePath ~startPath name = let path = Filename.concat (Filename.concat startPath "node_modules") name in if Files.exists path then Some path - else if startPath = "/" || Filename.dirname startPath = startPath then None + else if Filename.dirname startPath = startPath then None else resolveNodeModulePath ~startPath:(Filename.dirname startPath) name