Support reactRemoveProperties with Turbopack (#67853)

Author: mischnic

Cargo.lock

@@ -740,7 +740,7 @@ impl Project {
             .and_then(|c| c.styled_components.as_ref().map(|sc| sc.is_enabled()))
             .unwrap_or_default();
         let react_remove_properties_enabled = compiler_options
-            .and_then(|c| c.react_remove_properties)
+            .and_then(|c| c.react_remove_properties.as_ref().map(|rc| rc.is_enabled()))
             .unwrap_or_default();
         let remove_console_enabled = compiler_options
             .and_then(|c| c.remove_console.as_ref().map(|rc| rc.is_enabled()))

packages/next-swc/crates/next-api/src/project.rs

@@ -32,6 +32,7 @@ lazy_static = { workspace = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }
 rustc-hash = { workspace = true }
+react_remove_properties = "0.24.15"
 remove_console = "0.25.15"
 turbopack-binding = { workspace = true, features = [
   "__swc_transform_modularize_imports",

packages/next-swc/crates/next-core/Cargo.toml

@@ -52,8 +52,9 @@ use crate::{
             NextSharedRuntimeResolvePlugin,
         },
         transforms::{
-            emotion::get_emotion_transform_rule, relay::get_relay_transform_rule,
-            remove_console::get_remove_console_transform_rule,
+            emotion::get_emotion_transform_rule,
+            react_remove_properties::get_react_remove_properties_transform_rule,
+            relay::get_relay_transform_rule, remove_console::get_remove_console_transform_rule,
             styled_components::get_styled_components_transform_rule,
             styled_jsx::get_styled_jsx_transform_rule,
             swc_ecma_transform_plugins::get_swc_ecma_transform_plugin_rule,
@@ -250,6 +251,7 @@ pub async fn get_client_module_options_context(
         get_emotion_transform_rule(next_config).await?,
         get_styled_components_transform_rule(next_config).await?,
         get_styled_jsx_transform_rule(next_config, target_browsers).await?,
+        get_react_remove_properties_transform_rule(next_config).await?,
         get_remove_console_transform_rule(next_config).await?,
     ]
     .into_iter()

packages/next-swc/crates/next-core/src/next_client/context.rs

@@ -729,7 +729,7 @@ impl StyledComponentsTransformOptionsOrBoolean {
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, TraceRawVcs)]
 #[serde(rename_all = "camelCase")]
 pub struct CompilerConfig {
-    pub react_remove_properties: Option<bool>,
+    pub react_remove_properties: Option<ReactRemoveProperties>,
     pub relay: Option<RelayConfig>,
     pub emotion: Option<EmotionTransformOptionsOrBoolean>,
     pub remove_console: Option<RemoveConsoleConfig>,
@@ -743,6 +743,15 @@ pub enum ReactRemoveProperties {
     Config { properties: Option<Vec<String>> },
 }
 
+impl ReactRemoveProperties {
+    pub fn is_enabled(&self) -> bool {
+        match self {
+            Self::Boolean(enabled) => *enabled,
+            _ => true,
+        }
+    }
+}
+
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, TraceRawVcs)]
 #[serde(untagged)]
 pub enum RemoveConsoleConfig {

packages/next-swc/crates/next-core/src/next_config.rs

@@ -61,6 +61,7 @@ use crate::{
         transforms::{
             emotion::get_emotion_transform_rule, get_ecma_transform_rule,
             next_react_server_components::get_next_react_server_components_transform_rule,
+            react_remove_properties::get_react_remove_properties_transform_rule,
             relay::get_relay_transform_rule, remove_console::get_remove_console_transform_rule,
             styled_components::get_styled_components_transform_rule,
             styled_jsx::get_styled_jsx_transform_rule,
@@ -468,6 +469,7 @@ pub async fn get_server_module_options_context(
         get_swc_ecma_transform_plugin_rule(next_config, project_path).await?,
         get_relay_transform_rule(next_config, project_path).await?,
         get_emotion_transform_rule(next_config).await?,
+        get_react_remove_properties_transform_rule(next_config).await?,
         get_remove_console_transform_rule(next_config).await?,
     ]
     .into_iter()

packages/next-swc/crates/next-core/src/next_server/context.rs

@@ -13,6 +13,7 @@ pub(crate) mod next_pure;
 pub(crate) mod next_react_server_components;
 pub(crate) mod next_shake_exports;
 pub(crate) mod next_strip_page_exports;
+pub(crate) mod react_remove_properties;
 pub(crate) mod relay;
 pub(crate) mod remove_console;
 pub(crate) mod server_actions;

packages/next-swc/crates/next-core/src/next_shared/transforms/mod.rs

@@ -0,0 +1,70 @@
+use anyhow::Result;
+use async_trait::async_trait;
+use turbo_tasks::Vc;
+use turbopack_binding::{
+    swc::core::{
+        common::util::take::Take,
+        ecma::{
+            ast::{Module, Program},
+            visit::FoldWith,
+        },
+    },
+    turbopack::{
+        ecmascript::{CustomTransformer, TransformContext},
+        turbopack::module_options::ModuleRule,
+    },
+};
+
+use super::get_ecma_transform_rule;
+use crate::next_config::{NextConfig, ReactRemoveProperties};
+
+/// Returns a rule which applies the react_remove_properties transform.
+pub async fn get_react_remove_properties_transform_rule(
+    next_config: Vc<NextConfig>,
+) -> Result<Option<ModuleRule>> {
+    let enable_mdx_rs = next_config.mdx_rs().await?.is_some();
+
+    let module_rule = next_config
+        .await?
+        .compiler
+        .as_ref()
+        .and_then(|value| value.react_remove_properties.as_ref())
+        .and_then(|config| match config {
+            ReactRemoveProperties::Boolean(false) => None,
+            ReactRemoveProperties::Boolean(true) => {
+                Some(react_remove_properties::Config::All(true))
+            }
+            ReactRemoveProperties::Config { properties } => Some(
+                react_remove_properties::Config::WithOptions(react_remove_properties::Options {
+                    properties: properties.as_deref().unwrap_or_default().to_owned(),
+                }),
+            ),
+        })
+        .map(|config| {
+            get_ecma_transform_rule(
+                Box::new(ReactRemovePropertiesTransformer { config }),
+                enable_mdx_rs,
+                true,
+            )
+        });
+
+    Ok(module_rule)
+}
+
+#[derive(Debug)]
+struct ReactRemovePropertiesTransformer {
+    config: react_remove_properties::Config,
+}
+
+#[async_trait]
+impl CustomTransformer for ReactRemovePropertiesTransformer {
+    #[tracing::instrument(level = tracing::Level::TRACE, name = "react_remove_properties", skip_all)]
+    async fn transform(&self, program: &mut Program, _ctx: &TransformContext<'_>) -> Result<()> {
+        let p = std::mem::replace(program, Program::Module(Module::dummy()));
+        *program = p.fold_with(&mut react_remove_properties::react_remove_properties(
+            self.config.clone(),
+        ));
+
+        Ok(())
+    }
+}

packages/next-swc/crates/next-core/src/next_shared/transforms/react_remove_properties.rs

@@ -16,7 +16,7 @@ const unsupportedTurbopackNextConfigOptions = [
   // 'experimental.clientRouterFilter',
   // 'experimental.optimizePackageImports',
   // 'compiler.emotion',
-  'compiler.reactRemoveProperties',
+  // 'compiler.reactRemoveProperties',
   // 'compiler.relay',
   // 'compiler.removeConsole',
   // 'compiler.styledComponents',

packages/next/src/lib/turbopack-warning.ts

@@ -15927,8 +15927,8 @@
       "runtimeError": false
     },
     "test/production/jest/remove-react-properties/remove-react-properties-jest.test.ts": {
-      "passed": [],
-      "failed": ["next/jest data-testid should be removed in production"],
+      "passed": ["next/jest data-testid should be removed in production"],
+      "failed": [],
       "pending": [],
       "flakey": [],
       "runtimeError": true