fix: Entry point path failure when resolving at runtime (#823)

fuse-box · Oct 3, 2017 · abd760f · abd760f
1 parent 0646063
commit abd760f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/modules/fuse-box-loader-api/fusebox.js b/modules/fuse-box-loader-api/fusebox.js
@@ -144,6 +144,9 @@ function $getRef(name, o) {
     name = name ? name : "./" + pkg.s.entry;
     var filePath = $pathJoin(basePath, name);
     var validPath = $ensureExtension(filePath);
+    if (filePath === ".") {
+        validPath = pkg.s.entry || "index.js";
+    }
     var file = pkg.f[validPath];
     var wildcard;
     if (!file && validPath.indexOf("*") > -1) {
@@ -153,7 +156,8 @@ function $getRef(name, o) {
         validPath = $pathJoin(filePath, "/", "index.js");
         file = pkg.f[validPath];
         if (!file && filePath === ".") {
-            file = pkg.f[pkg.s && pkg.s.entry];
+            validPath = pkg.s && pkg.s.entry || "index.js";
+            file = pkg.f[validPath];
         }
         if (!file) {
             validPath = filePath + ".js";

diff --git a/modules/fuse-box-loader-api/fusebox.min.js b/modules/fuse-box-loader-api/fusebox.min.js
diff --git a/src/loader/LoaderAPI.ts b/src/loader/LoaderAPI.ts
@@ -298,7 +298,8 @@ function $getRef(name: string, o: RefOpts): IReference {
         file = pkg.f[validPath];
 
         if (!file && filePath === ".") {
-            file = pkg.f[pkg.s && pkg.s.entry];
+            validPath = pkg.s && pkg.s.entry || "index.js";
+            file = pkg.f[validPath];
         }
         // last resort try adding .js extension
         // Some libraries have a weired convention of naming file lile "foo.bar""