-
-
Notifications
You must be signed in to change notification settings - Fork 3k
fix: use original require() error for TS files if ERR_UNKNOWN_FILE_EXTENSION #5408
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
Open
JoshuaKGoldberg
wants to merge
1
commit into
mochajs:main
Choose a base branch
from
JoshuaKGoldberg:require-module-syntax-throw
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
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
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -92,9 +92,19 @@ const tryImportAndRequire = async (file, esmDecorator) => { | |||||
const requireModule = async (file, esmDecorator) => { | ||||||
try { | ||||||
return require(file); | ||||||
} catch (err) { | ||||||
// Import if require fails. | ||||||
return dealWithExports(await formattedImport(file, esmDecorator)); | ||||||
} catch (requireErr) { | ||||||
// Fallback to import() if require() fails. | ||||||
try { | ||||||
return dealWithExports(await formattedImport(file, esmDecorator)); | ||||||
} catch (importErr) { | ||||||
// If a --require module throws in a Node.js version that doesn't yet support .ts files, | ||||||
// the fallback import() will throw an uninformative error about the file extension. | ||||||
// What we actually care about is the original require() error. | ||||||
// See: https://github.com/mochajs/mocha/issues/5393 | ||||||
throw /\.(?:c|m)?ts$/.test(file) || importErr?.code === "ERR_UNKNOWN_FILE_EXTENSION" | ||||||
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. Regex is already weird enough, I'm in favor of minor repetition if it supports clarity
Suggested change
|
||||||
? requireErr | ||||||
: importErr; | ||||||
} | ||||||
} | ||||||
} | ||||||
|
||||||
|
Oops, something went wrong.
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.
Maybe we can add tests for a specific range of Node versions? We should have an automated test that enters this branch of code for sure
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.
(discussed 1:1) Agreed. It really hurts me not covering this behavior with tests 🙃. We'll block this on #5407: once that lands, I can add an integration/similar test for a specific Node.js version or two.
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.
Ref also #5413 which also adds an if-else here and adds tests for the new branch