Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add support for enabling .mjs extension resolving #6525

Merged
merged 3 commits into from
Nov 22, 2023
Merged

Add support for enabling .mjs extension resolving #6525

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe48cbe
Add support for enabling .mjs extension resolving
timneutkens Nov 21, 2023
b81aff8
Fix lint
timneutkens Nov 21, 2023
3b4f9bb
Merge branch 'main' into 11-21-Add_support_for_enabling_.mjs_extensio…
timneutkens Nov 22, 2023
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
3 changes: 3 additions & 0 deletions crates/turbopack/src/resolve.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,9 @@ async fn base_resolve_options(
ext.push(".jsx".to_string());
}
ext.push(".js".to_string());
if opts.enable_mjs_extension {
ext.push(".mjs".to_string());
}
if opt.enable_node_native_modules {
ext.push(".node".to_string());
}
Expand Down
3 changes: 3 additions & 0 deletions crates/turbopack/src/resolve_options_context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ pub struct ResolveOptionsContext {
#[serde(default)]
pub enable_node_native_modules: bool,
#[serde(default)]
// Enable resolving of .mjs files without the .mjs extension
pub enable_mjs_extension: bool,
#[serde(default)]
/// Enable resolving of the node_modules folder when within the provided
/// directory
pub enable_node_modules: Option<Vc<FileSystemPath>>,
Expand Down
Loading