Throw on the main export and be silent when using resolveFrom.silent() #4
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
index.js
Outdated
| return null; | ||
| if (silent) { | ||
| try { | ||
| _resolveFileName(fromDir, fromFile, moduleId); |
There was a problem hiding this comment.
This needs to return. Probably needs a test to confirm this is working.
There was a problem hiding this comment.
Funny, the tests were covering it and it worked, there was another return statement at the end of the function, for the "non silent" case.
because it didn't fall to the cache it just worked :)
test.js
Outdated
| t.is(m.silent('fixture', './nonexistent'), null); | ||
| const resolveFromfixture = m.bind(null, 'fixture'); | ||
| t.regex(resolveFromfixture('./fixture'), /fixture\/fixture\.js$/); | ||
| const silentResolveFromfixture = m.silent.bind(null, 'fixture'); |
There was a problem hiding this comment.
The silent assertions should be in a separate test.
index.js
Outdated
| @@ -2,7 +2,15 @@ | |||
| const path = require('path'); | |||
| const Module = require('module'); | |||
|
|
|||
| module.exports = (fromDir, moduleId) => { | |||
| const _resolveFileName = (fromDir, fromFile, moduleId) => { | |||
There was a problem hiding this comment.
Wondering why you prefixed this with underscores? Might have missed something in the conversation though.
There was a problem hiding this comment.
You're right, I removed the underscores.
sindresorhus
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As a response to this PR- #3
and - sindresorhus/import-from#1