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

fix: regression in browser objects pointing to nested node_mpodules #143

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2,521 changes: 2,144 additions & 377 deletions package-lock.json

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions package.json
Expand Up @@ -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"
Expand All @@ -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": [
Expand Down
8 changes: 5 additions & 3 deletions src/index.js
Expand Up @@ -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;
});
Expand Down Expand Up @@ -94,7 +94,6 @@ export default function nodeResolve ( options = {} ) {
}
}


const parts = importee.split( /[/\\]/ );
let id = parts.shift();

Expand All @@ -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 );
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions test/node_modules/component-type/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions test/node_modules/component-type/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/node_modules/isomorphic-nested/lib/browser.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/node_modules/isomorphic-nested/lib/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/node_modules/isomorphic-object-main-implicit/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/node_modules/isomorphic-object-main/browser.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/node_modules/isomorphic-object-main/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/node_modules/isomorphic-object/browser.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/node_modules/isomorphic-object/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions 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;