Skip to content
This repository was archived by the owner on Aug 4, 2021. It is now read-only.

Commit 1eff8d7

Browse files
keithamuslukastaegert
authored andcommitted
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
1 parent aad0239 commit 1eff8d7

File tree

17 files changed

+2282
-408
lines changed

17 files changed

+2282
-408
lines changed

package-lock.json

+2,144-377
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"version": "4.0.0",
55
"devDependencies": {
66
"buble": "^0.19.6",
7-
"es5-ext": "^0.10.46",
8-
"eslint": "^5.10.0",
9-
"mocha": "^5.2.0",
10-
"rollup": "^0.67.4",
11-
"rollup-plugin-buble": "^0.19.4",
7+
"es5-ext": "^0.10.47",
8+
"eslint": "^5.14.1",
9+
"mocha": "^6.0.0",
10+
"rollup": "^1.2.2",
11+
"rollup-plugin-buble": "^0.19.6",
1212
"rollup-plugin-commonjs": "^9.2.0",
1313
"string-capitalize": "^1.0.1",
1414
"vlq": "^1.0.0"
@@ -32,7 +32,7 @@
3232
"dependencies": {
3333
"builtin-modules": "^3.0.0",
3434
"is-module": "^1.0.0",
35-
"resolve": "^1.8.1"
35+
"resolve": "^1.10.0"
3636
},
3737
"repository": "rollup/rollup-plugin-node-resolve",
3838
"keywords": [

src/index.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function cachedIsFile (file, cb) {
2929
.then(
3030
stat => stat.isFile(),
3131
err => {
32-
if (err.code == 'ENOENT') return false;
32+
if (err.code === 'ENOENT') return false;
3333
delete isFileCache[file];
3434
throw err;
3535
});
@@ -94,7 +94,6 @@ export default function nodeResolve ( options = {} ) {
9494
}
9595
}
9696

97-
9897
const parts = importee.split( /[/\\]/ );
9998
let id = parts.shift();
10099

@@ -118,7 +117,10 @@ export default function nodeResolve ( options = {} ) {
118117
const pkgRoot = dirname( pkgPath );
119118
if (options.browser && typeof pkg[ 'browser' ] === 'object') {
120119
packageBrowserField = Object.keys(pkg[ 'browser' ]).reduce((browser, key) => {
121-
const resolved = pkg[ 'browser' ][ key ] === false ? false : resolve( pkgRoot, pkg[ 'browser' ][ key ] );
120+
let resolved = pkg[ 'browser' ][ key ];
121+
if (resolved && resolved[0] === '.') {
122+
resolved = resolve( pkgRoot, pkg[ 'browser' ][ key ] );
123+
}
122124
browser[ key ] = resolved;
123125
if ( key[0] === '.' ) {
124126
const absoluteKey = resolve( pkgRoot, key );

test/node_modules/browser-entry-points-to-node-module/index.js

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/node_modules/browser-entry-points-to-node-module/package.json

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/node_modules/component-type/index.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/node_modules/component-type/package.json

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/node_modules/isomorphic-nested/lib/browser.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/node_modules/isomorphic-nested/lib/index.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/node_modules/isomorphic-object-main-implicit/browser.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/node_modules/isomorphic-object-main-implicit/index.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/node_modules/isomorphic-object-main/browser.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/node_modules/isomorphic-object-main/index.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/node_modules/isomorphic-object/browser.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/node_modules/isomorphic-object/index.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
import sample from 'browser-entry-points-to-node-module';
2+
export default sample;

0 commit comments

Comments
 (0)