Server actions transform data-urls

mischnic · mischnic · commit 5fce570497ad · 2025-03-07T10:08:33.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/next-core/src/next_shared/transforms/server_actions.rs b/crates/next-core/src/next_shared/transforms/server_actions.rs
@@ -1,6 +1,8 @@
 use anyhow::Result;
 use async_trait::async_trait;
-use next_custom_transforms::transforms::server_actions::{server_actions, Config};
+use next_custom_transforms::transforms::server_actions::{
+    server_actions, Config, ServerActionMode,
+};
 use swc_core::{common::FileName, ecma::ast::Program};
 use turbo_rcstr::RcStr;
 use turbo_tasks::{ResolvedVc, Vc};
@@ -63,6 +65,7 @@ impl CustomTransformer for NextServerActions {
                 use_cache_enabled: self.use_cache_enabled,
                 hash_salt: self.encryption_key.await?.to_string(),
                 cache_kinds: self.cache_kinds.owned().await?,
+                mode: ServerActionMode::Turbopack,
             },
             ctx.comments.clone(),
             Default::default(),
diff --git a/crates/next-custom-transforms/Cargo.toml b/crates/next-custom-transforms/Cargo.toml
@@ -38,6 +38,7 @@ swc_core = { workspace = true, features = [
   "cached",
   "common_concurrent",
   "ecma_ast",
+  "ecma_codegen",
   "ecma_loader_lru",
   "ecma_loader_node",
   "ecma_minifier",
@@ -59,6 +60,7 @@ swc_emotion = { workspace = true }
 swc_relay = { workspace = true }
 turbopack-ecmascript-plugins = { workspace = true, optional = true }
 turbo-rcstr = { workspace = true }
+urlencoding = { workspace = true }
 
 react_remove_properties = "0.33.0"
 remove_console = "0.34.0"
diff --git a/crates/next-custom-transforms/src/transforms/server_actions.rs b/crates/next-custom-transforms/src/transforms/server_actions.rs
@@ -4,6 +4,7 @@ use std::{
     convert::{TryFrom, TryInto},
     mem::{replace, take},
     rc::Rc,
+    sync::Arc,
 };
 
 use hex::encode as hex_encode;
@@ -12,23 +13,32 @@ use rustc_hash::{FxHashMap, FxHashSet};
 use serde::Deserialize;
 use sha1::{Digest, Sha1};
 use swc_core::{
-    atoms::Atom,
+    atoms::{atom, Atom},
     common::{
         comments::{Comment, CommentKind, Comments},
         errors::HANDLER,
         source_map::PURE_SP,
         util::take::Take,
-        BytePos, FileName, Mark, Span, SyntaxContext, DUMMY_SP,
+        BytePos, FileName, Mark, SourceMap, Span, SyntaxContext, DUMMY_SP,
     },
     ecma::{
         ast::*,
+        codegen::{text_writer::JsWriter, Emitter},
         utils::{private_ident, quote_ident, ExprFactory},
         visit::{noop_visit_mut_type, visit_mut_pass, VisitMut, VisitMutWith},
     },
     quote,
 };
 use turbo_rcstr::RcStr;
 
+use crate::FxIndexMap;
+
+#[derive(Clone, Copy, Debug, Deserialize)]
+pub enum ServerActionMode {
+    Webpack,
+    Turbopack,
+}
+
 #[derive(Clone, Debug, Deserialize)]
 #[serde(deny_unknown_fields, rename_all = "camelCase")]
 pub struct Config {
@@ -37,6 +47,7 @@ pub struct Config {
     pub use_cache_enabled: bool,
     pub hash_salt: String,
     pub cache_kinds: FxHashSet<RcStr>,
+    pub mode: ServerActionMode,
 }
 
 #[derive(Clone, Debug)]
@@ -1809,46 +1820,49 @@ impl<C: Comments> VisitMut for ServerActions<C> {
         let call_server_ident = private_ident!("callServer");
         let find_source_map_url_ident = private_ident!("findSourceMapURL");
 
-        if (self.has_action || self.has_cache) && !self.config.is_react_server_layer {
-            // import {
-            //   createServerReference,
-            //   callServer,
-            //   findSourceMapURL
-            // } from 'private-next-rsc-action-client-wrapper'
-            // createServerReference("action_id")
-            new.push(ModuleItem::ModuleDecl(ModuleDecl::Import(ImportDecl {
-                span: DUMMY_SP,
-                specifiers: vec![
-                    ImportSpecifier::Named(ImportNamedSpecifier {
-                        span: DUMMY_SP,
-                        local: create_ref_ident.clone(),
-                        imported: None,
-                        is_type_only: false,
-                    }),
-                    ImportSpecifier::Named(ImportNamedSpecifier {
+        let client_layer_import = ((self.has_action || self.has_cache)
+            && !self.config.is_react_server_layer)
+            .then(|| {
+                // import {
+                //   createServerReference,
+                //   callServer,
+                //   findSourceMapURL
+                // } from 'private-next-rsc-action-client-wrapper'
+                // createServerReference("action_id")
+                ModuleItem::ModuleDecl(ModuleDecl::Import(ImportDecl {
+                    span: DUMMY_SP,
+                    specifiers: vec![
+                        ImportSpecifier::Named(ImportNamedSpecifier {
+                            span: DUMMY_SP,
+                            local: create_ref_ident.clone(),
+                            imported: None,
+                            is_type_only: false,
+                        }),
+                        ImportSpecifier::Named(ImportNamedSpecifier {
+                            span: DUMMY_SP,
+                            local: call_server_ident.clone(),
+                            imported: None,
+                            is_type_only: false,
+                        }),
+                        ImportSpecifier::Named(ImportNamedSpecifier {
+                            span: DUMMY_SP,
+                            local: find_source_map_url_ident.clone(),
+                            imported: None,
+                            is_type_only: false,
+                        }),
+                    ],
+                    src: Box::new(Str {
                         span: DUMMY_SP,
-                        local: call_server_ident.clone(),
-                        imported: None,
-                        is_type_only: false,
+                        value: "private-next-rsc-action-client-wrapper".into(),
+                        raw: None,
                     }),
-                    ImportSpecifier::Named(ImportNamedSpecifier {
-                        span: DUMMY_SP,
-                        local: find_source_map_url_ident.clone(),
-                        imported: None,
-                        is_type_only: false,
-                    }),
-                ],
-                src: Box::new(Str {
-                    span: DUMMY_SP,
-                    value: "private-next-rsc-action-client-wrapper".into(),
-                    raw: None,
-                }),
-                type_only: false,
-                with: None,
-                phase: Default::default(),
-            })));
-            new.rotate_right(1);
-        }
+                    type_only: false,
+                    with: None,
+                    phase: Default::default(),
+                }))
+            });
+
+        let mut client_layer_exports = FxIndexMap::default();
 
         // If it's a "use server" or a "use cache" file, all exports need to be annotated.
         if should_track_exports {
@@ -1885,7 +1899,7 @@ impl<C: Comments> VisitMut for ServerActions<C> {
                                 })),
                             },
                         ));
-                        new.push(export_expr);
+                        client_layer_exports.insert(atom!("default"), export_expr);
                     } else {
                         let export_expr =
                             ModuleItem::ModuleDecl(ModuleDecl::ExportDecl(ExportDecl {
@@ -1932,7 +1946,7 @@ impl<C: Comments> VisitMut for ServerActions<C> {
                                     ..Default::default()
                                 })),
                             }));
-                        new.push(export_expr);
+                        client_layer_exports.insert(export_name.clone(), export_expr);
                     }
                 } else if !in_cache_file {
                     self.annotations.push(Stmt::Expr(ExprStmt {
@@ -2098,6 +2112,50 @@ impl<C: Comments> VisitMut for ServerActions<C> {
             new.rotate_right(2);
         }
 
+        if (self.has_action || self.has_cache) && !self.config.is_react_server_layer {
+            match self.config.mode {
+                ServerActionMode::Webpack => {
+                    new.push(client_layer_import.unwrap());
+                    new.rotate_right(1);
+                    new.extend(client_layer_exports.into_iter().map(|(_, v)| v));
+                }
+                ServerActionMode::Turbopack => {
+                    for (export, stmt) in client_layer_exports {
+                        new.push(ModuleItem::ModuleDecl(ModuleDecl::ExportNamed(
+                            NamedExport {
+                                specifiers: vec![ExportSpecifier::Named(ExportNamedSpecifier {
+                                    span: DUMMY_SP,
+                                    orig: ModuleExportName::Ident(export.into()),
+                                    exported: None,
+                                    is_type_only: false,
+                                })],
+                                src: Some(Box::new(
+                                    program_to_data_url(&Program::Module(Module {
+                                        span: DUMMY_SP,
+                                        body: vec![
+                                            ModuleItem::Stmt(Stmt::Expr(ExprStmt {
+                                                expr: Box::new(Expr::Lit(Lit::Str(
+                                                    "use turbopack no side effects".into(),
+                                                ))),
+                                                span: DUMMY_SP,
+                                            })),
+                                            client_layer_import.clone().unwrap(),
+                                            stmt,
+                                        ],
+                                        shebang: None,
+                                    }))
+                                    .into(),
+                                )),
+                                span: DUMMY_SP,
+                                type_only: false,
+                                with: None,
+                            },
+                        )));
+                    }
+                }
+            }
+        }
+
         *stmts = new;
 
         self.annotations = old_annotations;
@@ -3102,3 +3160,21 @@ fn emit_error(error_kind: ServerActionsErrorKind) {
 
     HANDLER.with(|handler| handler.struct_span_err(span, &msg).emit());
 }
+
+fn program_to_data_url(program: &Program) -> String {
+    let mut output = vec![];
+    let sourcemap = Arc::new(SourceMap::default());
+    let mut emitter = Emitter {
+        cfg: Default::default(),
+        cm: sourcemap.clone(),
+        wr: Box::new(JsWriter::new(sourcemap.clone(), " ", &mut output, None)),
+        comments: None,
+    };
+
+    // println!("Emitting: {:?}", module);
+    emitter.emit_program(program).unwrap();
+    drop(emitter);
+
+    let output = String::from_utf8(output).expect("codegen generated non-utf8 output");
+    format!("data:text/javascript,{}", urlencoding::encode(&output))
+}
diff --git a/crates/next-custom-transforms/tests/errors.rs b/crates/next-custom-transforms/tests/errors.rs
@@ -6,9 +6,7 @@ use next_custom_transforms::transforms::{
     fonts::{next_font_loaders, Config as FontLoaderConfig},
     next_ssg::next_ssg,
     react_server_components::server_components,
-    server_actions::{
-        server_actions, {self},
-    },
+    server_actions::{self, server_actions, ServerActionMode},
     strip_page_exports::{next_transform_strip_page_exports, ExportFilter},
 };
 use rustc_hash::FxHashSet;
@@ -169,6 +167,7 @@ fn react_server_actions_errors(input: PathBuf) {
                         use_cache_enabled: true,
                         hash_salt: "".into(),
                         cache_kinds: FxHashSet::default(),
+                        mode: ServerActionMode::Webpack,
                     },
                     tr.comments.as_ref().clone(),
                     Default::default(),
@@ -230,6 +229,7 @@ fn use_cache_not_allowed(input: PathBuf) {
                         use_cache_enabled: false,
                         hash_salt: "".into(),
                         cache_kinds: FxHashSet::from_iter(["x".into()]),
+                        mode: ServerActionMode::Webpack,
                     },
                     tr.comments.as_ref().clone(),
                     Default::default(),
diff --git a/crates/next-custom-transforms/tests/fixture.rs b/crates/next-custom-transforms/tests/fixture.rs
@@ -18,7 +18,7 @@ use next_custom_transforms::transforms::{
     page_config::page_config_test,
     pure::pure_magic,
     react_server_components::server_components,
-    server_actions::{self, server_actions},
+    server_actions::{self, server_actions, ServerActionMode},
     shake_exports::{shake_exports, Config as ShakeExportsConfig},
     strip_page_exports::{next_transform_strip_page_exports, ExportFilter},
     warn_for_edge_runtime::warn_for_edge_runtime,
@@ -542,6 +542,11 @@ fn server_actions_fixture(input: PathBuf) {
     let output = input.parent().unwrap().join("output.js");
     let is_react_server_layer = input.iter().any(|s| s.to_str() == Some("server-graph"));
     let is_development = input.iter().any(|s| s.to_str() == Some("development"));
+    let mode = if input.iter().any(|s| s.to_str() == Some("turbopack")) {
+        ServerActionMode::Turbopack
+    } else {
+        ServerActionMode::Webpack
+    };
     test_fixture(
         syntax(),
         &|_tr| {
@@ -555,6 +560,7 @@ fn server_actions_fixture(input: PathBuf) {
                         use_cache_enabled: true,
                         hash_salt: "".into(),
                         cache_kinds: FxHashSet::from_iter(["x".into()]),
+                        mode,
                     },
                     _tr.comments.as_ref().clone(),
                     Default::default(),
@@ -590,6 +596,7 @@ fn next_font_with_directive_fixture(input: PathBuf) {
                         use_cache_enabled: true,
                         hash_salt: "".into(),
                         cache_kinds: FxHashSet::default(),
+                        mode: ServerActionMode::Webpack,
                     },
                     _tr.comments.as_ref().clone(),
                     Default::default(),
@@ -881,6 +888,11 @@ fn test_source_maps(input: PathBuf) {
     let output: PathBuf = input.parent().unwrap().join("output.js");
     let is_react_server_layer = input.iter().any(|s| s.to_str() == Some("server-graph"));
     let is_development = input.iter().any(|s| s.to_str() == Some("development"));
+    let mode = if input.iter().any(|s| s.to_str() == Some("turbopack")) {
+        ServerActionMode::Turbopack
+    } else {
+        ServerActionMode::Webpack
+    };
 
     test_fixture(
         syntax(),
@@ -895,6 +907,7 @@ fn test_source_maps(input: PathBuf) {
                         use_cache_enabled: true,
                         hash_salt: "".into(),
                         cache_kinds: FxHashSet::from_iter([]),
+                        mode,
                     },
                     _tr.comments.as_ref().clone(),
                     Default::default(),
diff --git a/crates/next-custom-transforms/tests/fixture/server-actions/client-graph/turbopack/1/input.js b/crates/next-custom-transforms/tests/fixture/server-actions/client-graph/turbopack/1/input.js
@@ -0,0 +1,9 @@
+'use server'
+
+export async function foo() {
+  console.log('action foo')
+}
+
+export async function bar() {
+  console.log('action bar')
+}
diff --git a/crates/next-custom-transforms/tests/fixture/server-actions/client-graph/turbopack/1/output.js b/crates/next-custom-transforms/tests/fixture/server-actions/client-graph/turbopack/1/output.js
