Unverified Commit f514684b authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Enable .mjs extension config in Turbopack (#58825)

Enable `.mjs` resolving in Turbopack to match the current webpack config.

Added an additional tests for this.
parent ecde2506
...@@ -163,6 +163,7 @@ pub async fn get_client_resolve_options_context( ...@@ -163,6 +163,7 @@ pub async fn get_client_resolve_options_context(
Ok(ResolveOptionsContext { Ok(ResolveOptionsContext {
enable_typescript: true, enable_typescript: true,
enable_react: true, enable_react: true,
enable_mjs_extension: true,
rules: vec![( rules: vec![(
foreign_code_context_condition(next_config, project_path).await?, foreign_code_context_condition(next_config, project_path).await?,
module_options_context.clone().cell(), module_options_context.clone().cell(),
......
...@@ -137,6 +137,7 @@ pub async fn get_edge_resolve_options_context( ...@@ -137,6 +137,7 @@ pub async fn get_edge_resolve_options_context(
Ok(ResolveOptionsContext { Ok(ResolveOptionsContext {
enable_typescript: true, enable_typescript: true,
enable_react: true, enable_react: true,
enable_mjs_extension: true,
rules: vec![( rules: vec![(
foreign_code_context_condition(next_config, project_path).await?, foreign_code_context_condition(next_config, project_path).await?,
resolve_options_context.clone().cell(), resolve_options_context.clone().cell(),
......
...@@ -193,6 +193,7 @@ pub async fn get_server_resolve_options_context( ...@@ -193,6 +193,7 @@ pub async fn get_server_resolve_options_context(
Ok(ResolveOptionsContext { Ok(ResolveOptionsContext {
enable_typescript: true, enable_typescript: true,
enable_react: true, enable_react: true,
enable_mjs_extension: true,
rules: vec![( rules: vec![(
foreign_code_context_condition, foreign_code_context_condition,
resolve_options_context.clone().cell(), resolve_options_context.clone().cell(),
......
export default function Root({ children }: { children: React.ReactNode }) {
return (
<html>
<body>{children}</body>
</html>
)
}
import { myFileFunction } from '../my-file'
export default function Page() {
return <p>{myFileFunction()}</p>
}
import { createNextDescribe } from 'e2e-utils'
createNextDescribe(
'mjs as extension',
{
files: __dirname,
},
({ next }) => {
it('should render the page correctly', async () => {
const $ = await next.render$('/')
expect($('p').text()).toBe('hello world!')
})
}
)
export function myFileFunction() {
return 'hello world!'
}
/**
* @type {import('next').NextConfig}
*/
const nextConfig = {}
module.exports = nextConfig
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment