fix(turbopack): correct __dirname and __filename in CJS modules #86480
+38
−6
Conversation
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 commit fixes an issue where __dirname and __filename were not being correctly resolved in CommonJS modules when using Turbopack. The issue was that the origin of the requiring module was being used to resolve these variables, instead of the origin of the CJS module itself. To fix this, I've introduced a new CjsPath variant to the FreeVarReference enum. This new variant is used to represent __dirname and __filename in CJS modules. The handle_free_var_reference function in urbopack/crates/turbopack-ecmascript/src/references/mod.rs has been updated to handle this new variant and resolve the path correctly using the origin of the CJS module. This change ensures that __dirname and __filename have the correct values in CJS modules, which is important for compatibility with existing Node.js code. Fixes vercel#86476
Member
|
Allow CI Workflow Run
Note: this should only be enabled once the PR is ready to go and can only be enabled by a maintainer |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This commit fixes an issue where __dirname and __filename were not being correctly resolved in CommonJS modules when using Turbopack. The issue was that the origin of the requiring module was being used to resolve these variables, instead of the origin of the CJS module itself.
To fix this, I've introduced a new CjsPath variant to the FreeVarReference enum. This new variant is used to represent __dirname and __filename in CJS modules. The handle_free_var_reference function in urbopack/crates/turbopack-ecmascript/src/references/mod.rs has been updated to handle this new variant and resolve the path correctly using the origin of the CJS module.
This change ensures that __dirname and __filename have the correct values in CJS modules, which is important for compatibility with existing Node.js code.
Fixes #86476