From d6db14ce46bee0df6d09b448170a3ca103a3fd01 Mon Sep 17 00:00:00 2001
From: hrmny <github.leah@hrmny.sh>
Date: Mon, 15 May 2023 20:58:17 +0200
Subject: [PATCH] `MdxTransformModuleOptions` struct

---
 .../next-core/src/next_client/context.rs       | 17 ++++++++++++-----
 .../next-core/src/next_server/context.rs       | 18 +++++++++++-------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/packages/next-swc/crates/next-core/src/next_client/context.rs b/packages/next-swc/crates/next-core/src/next_client/context.rs
index 976a223788ee..b5a5652a154b 100644
--- a/packages/next-swc/crates/next-core/src/next_client/context.rs
+++ b/packages/next-swc/crates/next-core/src/next_client/context.rs
@@ -30,8 +30,8 @@ use turbopack_binding::{
             module_options::{
                 module_options_context::{ModuleOptionsContext, ModuleOptionsContextVc},
                 CustomEcmascriptTransformPlugins, CustomEcmascriptTransformPluginsVc,
-                JsxTransformOptions, PostCssTransformOptions, TypescriptTransformOptions,
-                WebpackLoadersOptions,
+                JsxTransformOptions, MdxTransformModuleOptions, PostCssTransformOptions,
+                TypescriptTransformOptions, WebpackLoadersOptions,
             },
             resolve_options_context::{ResolveOptionsContext, ResolveOptionsContextVc},
             transition::TransitionsByNameVc,
@@ -177,8 +177,16 @@ pub async fn get_client_module_options_context(
 
     let tsconfig = get_typescript_transform_options(project_path);
     let decorators_options = get_decorators_transform_options(project_path);
-    let enable_mdx_rs = *next_config.mdx_rs().await?;
-    let mdx_provider_import_source = enable_mdx_rs.then(mdx_import_source_file);
+    let enable_mdx_rs = if *next_config.mdx_rs().await? {
+        Some(
+            MdxTransformModuleOptions {
+                provider_import_source: Some(mdx_import_source_file()),
+            }
+            .cell(),
+        )
+    } else {
+        None
+    };
     let jsx_runtime_options = get_jsx_transform_options(project_path);
     let enable_webpack_loaders = {
         let options = &*next_config.webpack_loaders_options().await?;
@@ -248,7 +256,6 @@ pub async fn get_client_module_options_context(
         enable_webpack_loaders,
         enable_typescript_transform: Some(tsconfig),
         enable_mdx_rs,
-        mdx_provider_import_source,
         decorators: Some(decorators_options),
         rules: vec![
             (
diff --git a/packages/next-swc/crates/next-core/src/next_server/context.rs b/packages/next-swc/crates/next-core/src/next_server/context.rs
index a2d6d7a5d226..0eaf0e23913c 100644
--- a/packages/next-swc/crates/next-core/src/next_server/context.rs
+++ b/packages/next-swc/crates/next-core/src/next_server/context.rs
@@ -32,6 +32,7 @@ use turbopack_binding::{
         },
     },
 };
+use turbopack_binding::turbopack::turbopack::module_options::MdxTransformModuleOptions;
 
 use super::{
     resolve::ExternalCjsModulesResolvePluginVc, transforms::get_next_server_transforms_rules,
@@ -293,8 +294,16 @@ pub async fn get_server_module_options_context(
 
     let tsconfig = get_typescript_transform_options(project_path);
     let decorators_options = get_decorators_transform_options(project_path);
-    let enable_mdx_rs = *next_config.mdx_rs().await?;
-    let mdx_provider_import_source = enable_mdx_rs.then(mdx_import_source_file);
+    let enable_mdx_rs = if *next_config.mdx_rs().await? {
+        Some(
+            MdxTransformModuleOptions {
+                provider_import_source: Some(mdx_import_source_file()),
+            }
+               .cell(),
+        )
+    } else {
+        None
+    };
     let jsx_runtime_options = get_jsx_transform_options(project_path);
     let enable_emotion = *get_emotion_compiler_config(next_config).await?;
     let enable_styled_components = *get_styled_components_compiler_config(next_config).await?;
@@ -334,7 +343,6 @@ pub async fn get_server_module_options_context(
                 enable_webpack_loaders,
                 enable_typescript_transform: Some(tsconfig),
                 enable_mdx_rs,
-                mdx_provider_import_source,
                 decorators: Some(decorators_options),
                 rules: vec![
                     (
@@ -393,7 +401,6 @@ pub async fn get_server_module_options_context(
                 enable_webpack_loaders,
                 enable_typescript_transform: Some(tsconfig),
                 enable_mdx_rs,
-                mdx_provider_import_source,
                 decorators: Some(decorators_options),
                 rules: vec![
                     (
@@ -452,7 +459,6 @@ pub async fn get_server_module_options_context(
                 enable_webpack_loaders,
                 enable_typescript_transform: Some(tsconfig),
                 enable_mdx_rs,
-                mdx_provider_import_source,
                 decorators: Some(decorators_options),
                 rules: vec![
                     (
@@ -483,7 +489,6 @@ pub async fn get_server_module_options_context(
                 enable_webpack_loaders,
                 enable_typescript_transform: Some(tsconfig),
                 enable_mdx_rs,
-                mdx_provider_import_source,
                 decorators: Some(decorators_options),
                 rules: vec![
                     (
@@ -518,7 +523,6 @@ pub async fn get_server_module_options_context(
                 enable_webpack_loaders,
                 enable_typescript_transform: Some(tsconfig),
                 enable_mdx_rs,
-                mdx_provider_import_source,
                 decorators: Some(decorators_options),
                 rules: vec![
                     (