fix(loader): add auto loaded module to package.loaded early to preven…

…t require loops
folke · Jul 21, 2024 · 18d1c1b · 18d1c1b · Parsifa1 · Jul 21, 2024
1 parent 9a374a0
commit 18d1c1b
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/lua/lazy/core/loader.lua b/lua/lazy/core/loader.lua
@@ -552,15 +552,16 @@ function M.loader(modname)
   end
 
   if ret then
-    M.auto_load(modname, ret.modpath)
     local mod = package.loaded[modname]
-    if type(mod) == "table" then
-      return function()
-        return mod
-      end
+    if type(mod) ~= "table" then
+      mod = loadfile(ret.modpath, nil, nil, ret.stat)()
     end
+    package.loaded[modname] = mod
+    M.auto_load(modname, ret.modpath)
     -- selene: allow(incorrect_standard_library_use)
-    return loadfile(ret.modpath, nil, nil, ret.stat)
+    return function()
+      return mod
+    end
   end
 end