fix: PathResolver and browser overrides should respect a module override

nchanged · nchanged · commit 2ecd6637925a · 2018-04-01T15:22:06.000+02:00
diff --git a/src/core/PathMaster.ts b/src/core/PathMaster.ts
@@ -382,19 +382,22 @@ export class PathMaster {
         for (let key in browserOverrides) {
             let value = browserOverrides[key];
             if (typeof value === "string") {
-                if (/\.\//.test(key)) {
-                    key = key.slice(2);
-                }
-                if (/\.\//.test(value)) {
-                    value = "~/" + value.slice(2);
+                if (/^[a-z]/.test(value) && !/.js$/.test(value)) {
+                    value = value;
                 } else {
-                    value = "~/" + value;
-                }
-                if (!/.js$/.test(value)) {
-                    value = value + ".js";
+                    if (/\.\//.test(key)) {
+                        key = key.slice(2);
+                    }
+                    if (/\.\//.test(value)) {
+                        value = "~/" + value.slice(2);
+                    } else {
+                        value = "~/" + value;
+                    }
+                    if (!/.js$/.test(value)) {
+                        value = value + ".js";
+                    }
                 }
             }
-
             newOverrides[key] = value;
         }
         return newOverrides;
diff --git a/src/tests/BrowserFieldPackageJSON.test.ts b/src/tests/BrowserFieldPackageJSON.test.ts
@@ -96,7 +96,7 @@ export class BrowserFieldPackageJsonTest {
             "package.json": JSON.stringify({
                 name: name,
                 browser: {
-                    "hello.js": "target"
+                    "hello.js": "path"
                 }
             }),
             "index.js": `module.exports = require("./hello")`,
@@ -115,7 +115,7 @@ export class BrowserFieldPackageJsonTest {
             }
         ).simple().then(test => test.browser(window => {
             const index = window.FuseBox.import("./index");
-            should(index).deepEqual({ data: { target: 'world' } });
+            should(index.data.resolve).beFunction();
         }));
     }
 
@@ -191,7 +191,7 @@ export class BrowserFieldPackageJsonTest {
             "package.json": JSON.stringify({
                 name: name,
                 browser: {
-                    "hello.js": "target"
+                    "hello.js": "target.js"
                 }
             }),
             "index.js": `

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ export class BrowserFieldPackageJsonTest {`
`96`	`96`	`"package.json": JSON.stringify({`
`97`	`97`	`name: name,`
`98`	`98`	`browser: {`
`99`		`- "hello.js": "target"`
	`99`	`+ "hello.js": "path"`
`100`	`100`	`}`
`101`	`101`	`}),`
`102`	`102`	"index.js": `module.exports = require("./hello")`,
`@@ -115,7 +115,7 @@ export class BrowserFieldPackageJsonTest {`
`115`	`115`	`}`
`116`	`116`	`).simple().then(test => test.browser(window => {`
`117`	`117`	`const index = window.FuseBox.import("./index");`
`118`		`- should(index).deepEqual({ data: { target: 'world' } });`
	`118`	`+ should(index.data.resolve).beFunction();`
`119`	`119`	`}));`
`120`	`120`	`}`
`121`	`121`
`@@ -191,7 +191,7 @@ export class BrowserFieldPackageJsonTest {`
`191`	`191`	`"package.json": JSON.stringify({`
`192`	`192`	`name: name,`
`193`	`193`	`browser: {`
`194`		`- "hello.js": "target"`
	`194`	`+ "hello.js": "target.js"`
`195`	`195`	`}`
`196`	`196`	`}),`
`197`	`197`	"index.js": `