Fix require to look in bundle *after* filesystem

luvit · Apr 17, 2017 · c8da7e7 · c8da7e7 · zhaozg · Apr 19, 2017
1 parent 4dbbfa2
commit c8da7e7
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/deps/require.lua b/deps/require.lua
@@ -179,9 +179,16 @@ local function moduleRequire(base, name)
       end
     end
 
-    -- Stop at filesystem or prefix root (58 is ":")
-    if base == "/" or base:byte(-1) == 58 then break end
-    base = pathJoin(base, "..")
+    if base == "/" then
+      -- If we reach filesystem root, look in root on bundle
+      base = "bundle:"
+    elseif base:byte(-1) == 58 then
+      -- If we reach root of bundle, it doesn't exist
+      break
+    else
+      -- Otherwise, keep going higher
+      base = pathJoin(base, "..")
+    end
   end
 end