feat(turbopack): support initial compiler.emotion flag

vercel · Apr 5, 2023 · c218808 · c218808
1 parent 3f75387
commit c218808
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 5 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
@@ -47,7 +47,7 @@ use crate::{
     },
     react_refresh::assert_can_resolve_react_refresh,
     transform_options::{
-        get_decorators_transform_options, get_jsx_transform_options,
+        get_decorators_transform_options, get_emotion_compiler_config, get_jsx_transform_options,
         get_typescript_transform_options,
     },
     util::foreign_code_context_condition,
@@ -174,6 +174,8 @@ pub async fn get_client_module_options_context(
             .clone_if()
     };
 
+    let emotion_compiler_options = get_emotion_compiler_config(next_config);
+
     let module_options_context = ModuleOptionsContext {
         preset_env_versions: Some(env),
         execution_context: Some(execution_context),
@@ -185,7 +187,7 @@ pub async fn get_client_module_options_context(
         // we try resolve it once at the root and pass down a context to all
         // the modules.
         enable_jsx: Some(jsx_runtime_options),
-        enable_emotion: true,
+        enable_emotion: Some(emotion_compiler_options),
         enable_react_refresh,
         enable_styled_components: true,
         enable_styled_jsx: true,

diff --git a/packages/next-swc/crates/next-core/src/next_config.rs b/packages/next-swc/crates/next-core/src/next_config.rs
@@ -55,9 +55,11 @@ pub struct NextConfig {
     pub rewrites: Rewrites,
     pub transpile_packages: Option<Vec<String>>,
 
+    // Partially supported
+    pub compiler: Option<CompilerConfig>,
+
     // unsupported
     cross_origin: Option<String>,
-    compiler: Option<CompilerConfig>,
     amp: AmpConfig,
     analytics_id: String,
     asset_prefix: String,
@@ -353,6 +355,7 @@ pub struct ExperimentalConfig {
     pub app_dir: Option<bool>,
     pub server_components_external_packages: Option<Vec<String>>,
     pub turbo: Option<ExperimentalTurboConfig>,
+    pub compiler: Option<CompilerConfig>,
 
     // unsupported
     adjust_font_fallbacks: Option<bool>,
@@ -420,6 +423,7 @@ enum MiddlewarePrefetchType {
 pub struct CompilerConfig {
     pub react_remove_properties: Option<bool>,
     pub relay: Option<RelayConfig>,
+    pub emotion: Option<serde_json::Value>,
     pub remove_console: Option<RemoveConsoleConfig>,
 }
 

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
@@ -32,7 +32,7 @@ use crate::{
     next_config::NextConfigVc,
     next_import_map::get_next_server_import_map,
     transform_options::{
-        get_decorators_transform_options, get_jsx_transform_options,
+        get_decorators_transform_options, get_emotion_compiler_config, get_jsx_transform_options,
         get_typescript_transform_options,
     },
     util::foreign_code_context_condition,
@@ -235,6 +235,7 @@ 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 jsx_runtime_options = get_jsx_transform_options(project_path);
+    let emotion_compiler_options = get_emotion_compiler_config(next_config);
 
     let module_options_context = match ty.into_value() {
         ServerContextType::Pages { .. } | ServerContextType::PagesData { .. } => {
@@ -245,6 +246,7 @@ pub async fn get_server_module_options_context(
             ModuleOptionsContext {
                 enable_jsx: Some(jsx_runtime_options),
                 enable_styled_jsx: true,
+                enable_emotion: Some(emotion_compiler_options),
                 enable_postcss_transform,
                 enable_webpack_loaders,
                 enable_typescript_transform: Some(tsconfig),
@@ -265,6 +267,7 @@ pub async fn get_server_module_options_context(
             ModuleOptionsContext {
                 enable_jsx: Some(jsx_runtime_options),
                 enable_styled_jsx: true,
+                enable_emotion: Some(emotion_compiler_options),
                 enable_postcss_transform,
                 enable_webpack_loaders,
                 enable_typescript_transform: Some(tsconfig),
@@ -287,6 +290,7 @@ pub async fn get_server_module_options_context(
             };
             ModuleOptionsContext {
                 enable_jsx: Some(jsx_runtime_options),
+                enable_emotion: Some(emotion_compiler_options),
                 enable_postcss_transform,
                 enable_webpack_loaders,
                 enable_typescript_transform: Some(tsconfig),
@@ -324,6 +328,7 @@ pub async fn get_server_module_options_context(
             };
             ModuleOptionsContext {
                 enable_jsx: Some(jsx_runtime_options),
+                enable_emotion: Some(emotion_compiler_options),
                 enable_styled_jsx: true,
                 enable_postcss_transform,
                 enable_webpack_loaders,

diff --git a/packages/next-swc/crates/next-core/src/transform_options.rs b/packages/next-swc/crates/next-core/src/transform_options.rs
@@ -7,7 +7,8 @@ use turbo_binding::turbopack::{
     },
     ecmascript::typescript::resolve::{read_from_tsconfigs, read_tsconfigs, tsconfig},
     turbopack::module_options::{
-        DecoratorsKind, DecoratorsOptions, DecoratorsOptionsVc, JsxTransformOptions,
+        DecoratorsKind, DecoratorsOptions, DecoratorsOptionsVc, EmotionLabelKind,
+        EmotionTransformOptions, EmotionTransformOptionsVc, JsxTransformOptions,
         JsxTransformOptionsVc, TypescriptTransformOptions, TypescriptTransformOptionsVc,
     },
 };
@@ -152,3 +153,41 @@ pub async fn get_jsx_transform_options(
 
     Ok(react_transform_options.cell())
 }
+
+#[turbo_tasks::function]
+pub async fn get_emotion_compiler_config(
+    next_config: NextConfigVc,
+) -> Result<EmotionTransformOptionsVc> {
+    let emotion_compiler_config = (*next_config.await?)
+        .compiler
+        .as_ref()
+        .map(|value| {
+            value
+                .emotion
+                .as_ref()
+                .map(|value| {
+                    if value.is_boolean() {
+                        EmotionTransformOptionsVc::cell(EmotionTransformOptions {
+                            enabled: value.as_bool().unwrap_or(false),
+                            ..Default::default()
+                        })
+                    } else {
+                        EmotionTransformOptionsVc::cell(EmotionTransformOptions {
+                            enabled: true,
+                            sourcemap: value["sourcemap"].as_bool(),
+                            auto_label: match value["auto_label"].to_string().as_str() {
+                                "dev-only" => Some(EmotionLabelKind::DevOnly),
+                                "always" => Some(EmotionLabelKind::Always),
+                                "never" => Some(EmotionLabelKind::Never),
+                                _ => None,
+                            },
+                            label_format: value["labelFormat"].as_str().map(|s| s.to_string()),
+                        })
+                    }
+                })
+                .unwrap_or_default()
+        })
+        .unwrap_or_default();
+
+    Ok(emotion_compiler_config)
+}
diff --git a/packages/next/src/lib/turbopack-warning.ts b/packages/next/src/lib/turbopack-warning.ts
@@ -7,6 +7,7 @@ const supportedTurbopackNextConfigOptions = [
   'configFileName',
   'env',
   'experimental.appDir',
+  'compiler.emotion',
   'experimental.serverComponentsExternalPackages',
   'experimental.turbo',
   'images',