-
Notifications
You must be signed in to change notification settings - Fork 87
fix: try to resolve next modules via multiple paths #479
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
458e183
fix: resolve modules as array
ascorbic b197d6e
chore: test against canary
ascorbic eb3642c
fix: add paths for next canary
ascorbic 47c121d
fix: use resolveNextModule in tests
ascorbic af9efbf
fix: set default next path in tests
ascorbic 7114c5c
fix: use legacy peer deps in ci test
ascorbic 531fdb8
Merge branch 'main' into fix/next-imports
ascorbic 713bb51
fix: add comments
ascorbic 7058992
Merge branch 'main' into fix/next-imports
ascorbic File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,31 @@ | ||
/** | ||
* Try one or more Next.js imports until one is found. | ||
* We can't require() these normally, because the "next" package might not be resolvable from the root of a monorepo | ||
*/ | ||
const resolveNextModule = (module, nextRoot) => { | ||
// Get the default list of require paths... | ||
const paths = require.resolve.paths(module) | ||
// ...add the root of the Next site to the beginning of that list so we try it first... | ||
paths.unshift(nextRoot) | ||
// ...then resolve the module using that list of paths. | ||
return require.resolve(module, { paths }) | ||
const resolveNextModule = (modules, nextRoot) => { | ||
if (!Array.isArray(modules)) { | ||
// eslint-disable-next-line no-param-reassign | ||
modules = [modules] | ||
} | ||
for (const key in modules) { | ||
const module = modules[key] | ||
// Get the default list of require paths... | ||
const paths = require.resolve.paths(module) | ||
// ...add the root of the Next site to the beginning of that list so we try it first... | ||
paths.unshift(nextRoot) | ||
// ...then resolve the module using that list of paths. | ||
try { | ||
const resolved = require.resolve(module, { paths }) | ||
if (resolved) { | ||
console.log('resolved', resolved) | ||
return resolved | ||
} | ||
} catch (error) { | ||
// Failed. Trying next. | ||
} | ||
} | ||
|
||
throw new Error(`Could not resolve Next module. Tried "${modules.join(', ')}"`) | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ez |
||
|
||
module.exports = resolveNextModule |
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
NICE