fix: check pkg main (#797)

* fix: check pkg main

* fix: load entry if present

* refactor: assert base filepath before loading entry

* fix: don't append js to fully relative path

gulpfile.js

@@ -326,12 +326,8 @@ gulp.task("installDevDeps", function(done) {
         "buble",
     ];
 
-    if (os.platform().match(/^win/)) {
-        let windowsCommands = ["start", "cmd.exe", "/K", "npm", "install", "--no-save", ...deps];
-        exec(windowsCommands.join(" "), () => {})
-    } else {
-        var installDeps = spawn("npm", ["install", "--no-save"].concat(deps), {
-            stdio: "inherit",
-        });
-    }
+    const ext = /^win/.test(os.platform()) ? ".cmd" : ""
+    spawn("npm" + ext, ["install", "--no-save"].concat(deps), {
+        stdio: "inherit",
+    });
 });

modules/fuse-box-loader-api/fusebox.js

@@ -152,6 +152,9 @@ function $getRef(name, o) {
     if (!file && !wildcard) {
         validPath = $pathJoin(filePath, "/", "index.js");
         file = pkg.f[validPath];
+        if (!file && filePath === ".") {
+            file = pkg.f[pkg.s && pkg.s.entry];
+        }
         if (!file) {
             validPath = filePath + ".js";
             file = pkg.f[validPath];

src/BundleSource.ts

@@ -41,7 +41,7 @@ export class BundleSource {
      * @memberOf BundleSource
      */
     public includeSourceMaps: boolean = false;
-    
+
     public bundleInfoObject: any;
 
     /**
@@ -110,7 +110,7 @@ export class BundleSource {
      */
     public endCollection(collection: ModuleCollection) {
         let entry = collection.entryFile ? collection.entryFile.info.fuseBoxPath : "";
-
+        entry = entry || collection.bundle && collection.bundle.entry
         if (entry) {
             this.collectionSource.add(null, `return ___scope___.entry = "${entry}";`);
         }

src/core/PathMaster.ts

@@ -12,6 +12,9 @@ import { BundleData } from "../arithmetic/Arithmetic";
  * and only has ascii + @ in the name it is considered a node module
  */
 const NODE_MODULE = /^([a-z@](?!:).*)$/;
+const isRelative = /^[\.\/\\]+$/
+const jsExtensions = ['js', 'jsx'];
+const tsExtensions = jsExtensions.concat(['ts', 'tsx']);
 
 export interface INodeModuleRequire {
     name: string;
@@ -225,21 +228,20 @@ export class PathMaster {
     }
 
     private testFolder(folder: string, name: string) {
-        const extensions = ["js", "jsx"];
+        let extensions = jsExtensions;
         if (this.tsMode) {
-            extensions.push("ts", "tsx");
+            extensions = tsExtensions
         }
 
         if (fs.existsSync(folder)) {
             for (let i = 0; i < extensions.length; i++) {
-                let ext = extensions[i];
-                const index = `index.${ext}`;
-                const target = path.join(folder, index);
-                if (fs.existsSync(target)) {
-                    let result = path.join(name, index);
-                    let startsWithDot = result[0] === "."; // After transformation we need to bring the dot back
-                    if (startsWithDot) {
-                        result = `./${result}`;
+                const index = "index." + extensions[i]
+                if (fs.existsSync(path.join(folder, index))) {
+                    const result = path.join(name, index);
+                    const [a, b] = name
+                    if (a === "." && b !== ".") {
+                        //add relative './' from `name`, back onto joined path
+                        return "./" + result;
                     }
                     return result;
                 }
@@ -248,9 +250,9 @@ export class PathMaster {
     }
 
     private checkFileName(root: string, name: string) {
-        const extensions = ["js", "jsx"];
+        let extensions = jsExtensions;
         if (this.tsMode) {
-            extensions.push("ts", "tsx");
+            extensions = tsExtensions;
         }
         for (let i = 0; i < extensions.length; i++) {
             let ext = extensions[i];
@@ -267,7 +269,7 @@ export class PathMaster {
 
     private ensureNodeModuleExtension(input: string) {
         let ext = path.extname(input);
-        if (!ext) {
+        if (!ext && !isRelative.test(input)) {
             return input + ".js";
         }
         return input;

src/loader/LoaderAPI.ts

@@ -293,9 +293,13 @@ function $getRef(name: string, o: RefOpts): IReference {
         wildcard = validPath;
     }
     if (!file && !wildcard) {
-        // try folder index.js
+        // try index.js
         validPath = $pathJoin(filePath, "/", "index.js");
         file = pkg.f[validPath];
+
+        if (!file && filePath === ".") {
+            file = pkg.f[pkg.s && pkg.s.entry];
+        }
         // last resort try adding .js extension
         // Some libraries have a weired convention of naming file lile "foo.bar""
         if (!file) {