Fix package extry point parsing and bump version.

charto · Nov 19, 2018 · cb03fac · cb03fac
1 parent a4b71f6
commit cb03fac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cresolve",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Node-style module resolution for SystemJS",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

diff --git a/src/Resolver.ts b/src/Resolver.ts
@@ -281,8 +281,6 @@ export class Resolver {
 			config.packages[packageName] = subConfig;
 		}
 
-		subConfig.main = main;
-
 		if(typeof(pkg.browser) == 'string') {
 			// Use browser entry point.
 			if(pathName == main) pathName = pkg.browser;
@@ -299,6 +297,8 @@ export class Resolver {
 			}
 		}
 
+		subConfig.main = main;
+
 		for(let key of Object.keys(pkg.dependencies || {})) {
 			if(!this.versionTbl[key]) {
 				this.versionTbl[key] = semverMax(
@@ -397,7 +397,7 @@ export class Resolver {
 
 				parentAddress ? this.getContainingPackage(sys, parentAddress) : Promise.resolve()
 			).then(() => this.findPackageRoot(
-				guess,
+				parentAddress || guess,
 				[ 'https://unpkg.com/' + packageName + '@' + (this.versionTbl[packageName!] || 'latest') ],
 				packageName
 			)).catch(() => Promise.reject(