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

Added an option to control the options for node-resolve. #79

Merged
merged 3 commits into from
Mar 31, 2017
Merged

Added an option to control the options for node-resolve. #79

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f94f4a
Added an option to control the options for node-resolve.
jonhartnett Feb 13, 2017
da8a40c
convert spaces to tabs
Rich-Harris Mar 30, 2017
48d89a6
Merge branch 'master' into master
Rich-Harris Mar 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export default function nodeResolve ( options = {} ) {
const useMain = options.main !== false;
const isPreferBuiltinsSet = options.preferBuiltins === true || options.preferBuiltins === false;
const preferBuiltins = isPreferBuiltinsSet ? options.preferBuiltins : true;
const customResolveOptions = options.customResolveOptions || {};
const jail = options.jail || '/';

const onwarn = options.onwarn || CONSOLE_WARN;
Expand Down Expand Up @@ -44,7 +45,7 @@ export default function nodeResolve ( options = {} ) {
return new Promise( ( accept, reject ) => {
resolveId(
importee,
{
Object.assign({
basedir: dirname( importer ),
packageFilter ( pkg ) {
if ( !useJsnext && !useMain && !useModule ) {
Expand All @@ -61,7 +62,7 @@ export default function nodeResolve ( options = {} ) {
return pkg;
},
extensions: options.extensions
},
}, customResolveOptions ),
( err, resolved ) => {
if ( err ) {
if ( skip === true ) accept( false );
Expand Down