Merge pull request #133 from keithamus/fix-browser-resolve-regressions

fix(browser-resolve): fix regressions from refactor

src/index.js

@@ -6,6 +6,7 @@ import fs from 'fs';
 
 const ES6_BROWSER_EMPTY = resolve( __dirname, '../src/empty.js' );
 const CONSOLE_WARN = ( ...args ) => console.warn( ...args ); // eslint-disable-line no-console
+const exts = [ '.js', '.json', '.node' ];
 
 export default function nodeResolve ( options = {} ) {
 	const useModule = options.module !== false;
@@ -37,13 +38,14 @@ export default function nodeResolve ( options = {} ) {
 			if ( !importer ) return null;
 
 			if (options.browser && browserMapCache[importer]) {
+				const resolvedImportee = resolve( dirname( importer ), importee );
 				const browser = browserMapCache[importer];
-				if (browser[importee]) {
-					importee = browser[importee];
-				}
-				if (browser[importee] === false) {
+				if (browser[importee] === false || browser[resolvedImportee] === false) {
 					return ES6_BROWSER_EMPTY;
 				}
+				if (browser[importee] || browser[resolvedImportee] || browser[resolvedImportee + '.js'] || browser[resolvedImportee + '.json']) {
+					importee = browser[importee] || browser[resolvedImportee] || browser[resolvedImportee + '.js'] || browser[resolvedImportee + '.json'];
+				}
 			}
 
 
@@ -66,19 +68,28 @@ export default function nodeResolve ( options = {} ) {
 					importee,
 					Object.assign({
 						basedir: dirname( importer ),
-						packageFilter ( pkg ) {
+						packageFilter ( pkg, pkgPath ) {
+							const pkgRoot = dirname( pkgPath );
 							if (options.browser && typeof pkg[ 'browser' ] === 'object') {
 								packageBrowserField = Object.keys(pkg[ 'browser' ]).reduce((browser, key) => {
-									browser[ key ] = pkg[ 'browser' ][key];
-									if (key[0] === '.' && !extname(key)) browser[ key + '.js'] = browser[ key + '.json' ] = browser[ key ];
+									const resolved = pkg[ 'browser' ][ key ] === false ? false : resolve( pkgRoot, pkg[ 'browser' ][ key ] );
+									browser[ key ] = resolved;
+									if ( key[0] === '.' ) {
+										const absoluteKey = resolve( pkgRoot, key );
+										browser[ absoluteKey ] = resolved;
+										if ( !extname(key) ) {
+											exts.reduce( ( browser, ext ) => {
+												browser[ absoluteKey + ext ] = browser[ key ];
+												return browser;
+											}, browser );
+										}
+									}
 									return browser;
 								}, {});
 							}
 
 							if (options.browser && typeof pkg[ 'browser' ] === 'string') {
 								pkg[ 'main' ] = pkg[ 'browser' ];
-							} else if (options.browser && typeof pkg[ 'browser' ] === 'object' && pkg[ 'browser' ][ pkg[ 'main' ] ]) {
-								pkg[ 'main' ] = pkg[ 'browser' ][ pkg[ 'main' ] ];
 							} else if ( useModule && pkg[ 'module' ] ) {
 								pkg[ 'main' ] = pkg[ 'module' ];
 							} else if ( useJsnext && pkg[ 'jsnext:main' ] ) {
@@ -91,7 +102,12 @@ export default function nodeResolve ( options = {} ) {
 						extensions: options.extensions
 					}, customResolveOptions ),
 					( err, resolved ) => {
-						if (options.browser && packageBrowserField) browserMapCache[resolved] = packageBrowserField;
+						if (options.browser && packageBrowserField) {
+							if (packageBrowserField[ resolved ]) {
+								resolved = packageBrowserField[ resolved ];
+							}
+							browserMapCache[resolved] = packageBrowserField;
+						}
 
 						if ( !disregardResult && !err ) {
 							if ( resolved && fs.existsSync( resolved ) ) {

test/samples/browser-object-builtin/main.js

@@ -0,0 +1,2 @@
+import main from 'builtins-browser';
+export default main;

test/samples/browser-object-main/main.js

@@ -0,0 +1,2 @@
+import { env, dep, test } from 'isomorphic-object-main';
+export { env, dep, test };

test/samples/browser-object-nested/main.js

@@ -0,0 +1,2 @@
+import { env, dep, test } from 'isomorphic-nested';
+export { env, dep, test };

test/samples/browser-object/main-implicit.js

@@ -0,0 +1,2 @@
+import { env } from 'isomorphic-object-main-implicit';
+export { env };

test/test.js

@@ -155,6 +155,66 @@ describe( 'rollup-plugin-node-resolve', function () {
 		});
 	});
 
+	it( 'allows use of object browser field, resolving `main`', function () {
+		return rollup.rollup({
+			entry: 'samples/browser-object-main/main.js',
+			plugins: [
+				nodeResolve({
+					main: true,
+					browser: true
+				})
+			]
+		}).then( executeBundle ).then( module => {
+			assert.equal( module.exports.env, 'browser' );
+			assert.equal( module.exports.dep, 'browser-dep' );
+			assert.equal( module.exports.test, 43 );
+		});
+	});
+
+	it( 'allows use of object browser field, resolving implicit `main`', function () {
+		return rollup.rollup({
+			entry: 'samples/browser-object/main-implicit.js',
+			plugins: [
+				nodeResolve({
+					main: true,
+					browser: true
+				})
+			]
+		}).then( executeBundle ).then( module => {
+			assert.equal( module.exports.env, 'browser' );
+		});
+	});
+
+	it( 'allows use of object browser field, resolving replaced builtins', function () {
+		return rollup.rollup({
+			entry: 'samples/browser-object-builtin/main.js',
+			plugins: [
+				nodeResolve({
+					main: true,
+					browser: true
+				})
+			]
+		}).then( executeBundle ).then( module => {
+			assert.equal( module.exports, 'browser-fs' );
+		});
+	});
+
+	it( 'allows use of object browser field, resolving nested directories', function () {
+		return rollup.rollup({
+			entry: 'samples/browser-object-nested/main.js',
+			plugins: [
+				nodeResolve({
+					main: true,
+					browser: true
+				})
+			]
+		}).then( executeBundle ).then( module => {
+			assert.equal( module.exports.env, 'browser' );
+			assert.equal( module.exports.dep, 'browser-dep' );
+			assert.equal( module.exports.test, 43 );
+		});
+	});
+
 	it( 'supports `false` in browser field', function () {
 		return rollup.rollup({
 			entry: 'samples/browser-false/main.js',