fix: regression in browser objects pointing to nested node_mpodules (#…

…143) * fix: regression in browser objects pointing to nested node_mpodules * Update dependencies and simplify tests for Rollup 1 * Add missing test dependency and add explicit warning checks for tests
rollup · Feb 22, 2019 · 1eff8d7 · 1eff8d7
1 parent aad0239
commit 1eff8d7
Show file tree

Hide file tree

Showing 17 changed files with 2,282 additions and 408 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -4,11 +4,11 @@
   "version": "4.0.0",
   "devDependencies": {
     "buble": "^0.19.6",
-    "es5-ext": "^0.10.46",
-    "eslint": "^5.10.0",
-    "mocha": "^5.2.0",
-    "rollup": "^0.67.4",
-    "rollup-plugin-buble": "^0.19.4",
+    "es5-ext": "^0.10.47",
+    "eslint": "^5.14.1",
+    "mocha": "^6.0.0",
+    "rollup": "^1.2.2",
+    "rollup-plugin-buble": "^0.19.6",
     "rollup-plugin-commonjs": "^9.2.0",
     "string-capitalize": "^1.0.1",
     "vlq": "^1.0.0"
@@ -32,7 +32,7 @@
   "dependencies": {
     "builtin-modules": "^3.0.0",
     "is-module": "^1.0.0",
-    "resolve": "^1.8.1"
+    "resolve": "^1.10.0"
   },
   "repository": "rollup/rollup-plugin-node-resolve",
   "keywords": [

diff --git a/src/index.js b/src/index.js
@@ -29,7 +29,7 @@ function cachedIsFile (file, cb) {
 			.then(
 				stat => stat.isFile(),
 				err => {
-					if (err.code == 'ENOENT') return false;
+					if (err.code === 'ENOENT') return false;
 					delete isFileCache[file];
 					throw err;
 				});
@@ -94,7 +94,6 @@ export default function nodeResolve ( options = {} ) {
 				}
 			}
 
-
 			const parts = importee.split( /[/\\]/ );
 			let id = parts.shift();
 
@@ -118,7 +117,10 @@ export default function nodeResolve ( options = {} ) {
 					const pkgRoot = dirname( pkgPath );
 					if (options.browser && typeof pkg[ 'browser' ] === 'object') {
 						packageBrowserField = Object.keys(pkg[ 'browser' ]).reduce((browser, key) => {
-							const resolved = pkg[ 'browser' ][ key ] === false ? false : resolve( pkgRoot, pkg[ 'browser' ][ key ] );
+							let resolved = pkg[ 'browser' ][ key ];
+							if (resolved && resolved[0] === '.') {
+								resolved = resolve( pkgRoot, pkg[ 'browser' ][ key ] );
+							}
 							browser[ key ] = resolved;
 							if ( key[0] === '.' ) {
 								const absoluteKey = resolve( pkgRoot, key );

diff --git a/test/node_modules/browser-entry-points-to-node-module/index.js b/test/node_modules/browser-entry-points-to-node-module/index.js
diff --git a/test/node_modules/browser-entry-points-to-node-module/package.json b/test/node_modules/browser-entry-points-to-node-module/package.json
diff --git a/test/node_modules/component-type/index.js b/test/node_modules/component-type/index.js
diff --git a/test/node_modules/component-type/package.json b/test/node_modules/component-type/package.json
diff --git a/test/node_modules/isomorphic-nested/lib/browser.js b/test/node_modules/isomorphic-nested/lib/browser.js
diff --git a/test/node_modules/isomorphic-nested/lib/index.js b/test/node_modules/isomorphic-nested/lib/index.js
diff --git a/test/node_modules/isomorphic-object-main-implicit/browser.js b/test/node_modules/isomorphic-object-main-implicit/browser.js
diff --git a/test/node_modules/isomorphic-object-main-implicit/index.js b/test/node_modules/isomorphic-object-main-implicit/index.js
diff --git a/test/node_modules/isomorphic-object-main/browser.js b/test/node_modules/isomorphic-object-main/browser.js
diff --git a/test/node_modules/isomorphic-object-main/index.js b/test/node_modules/isomorphic-object-main/index.js
diff --git a/test/node_modules/isomorphic-object/browser.js b/test/node_modules/isomorphic-object/browser.js
diff --git a/test/node_modules/isomorphic-object/index.js b/test/node_modules/isomorphic-object/index.js
diff --git a/test/samples/browser-entry-points-to-node-module/index.js b/test/samples/browser-entry-points-to-node-module/index.js
@@ -0,0 +1,2 @@
+import sample from 'browser-entry-points-to-node-module';
+export default sample;