From 45b18bb77e1a5bec5b3d64465526156fa51cc5b1 Mon Sep 17 00:00:00 2001 From: Shu Ding Date: Wed, 14 Feb 2024 14:09:27 +0100 Subject: [PATCH] Rename internal utility naming for clarification (#62048) `createActionProxy` isn't the accurate name here - the function doesn't return anything new but only mark the value as registered. And also, it might not be a proxy (which is implementation detail) and might not be used for Server Actions only. `registerServerReference` is a better name here. There's no functionality change in this PR, only a few renames. Closes NEXT-2490 --- .../crates/next-core/src/next_import_map.rs | 4 ++-- .../crates/next-core/src/next_server/resolve.rs | 2 +- .../src/transforms/server_actions.rs | 12 ++++++------ .../errors/server-actions/client-graph/1/output.js | 2 +- .../errors/server-actions/server-graph/1/output.js | 4 ++-- .../errors/server-actions/server-graph/2/output.js | 4 ++-- .../errors/server-actions/server-graph/3/output.js | 4 ++-- .../errors/server-actions/server-graph/4/output.js | 2 +- .../errors/server-actions/server-graph/5/output.js | 2 +- .../errors/server-actions/server-graph/6/output.js | 4 ++-- .../errors/server-actions/server-graph/7/output.js | 4 ++-- .../errors/server-actions/server-graph/8/output.js | 4 ++-- .../fixture/server-actions/server/1/output.js | 6 +++--- .../fixture/server-actions/server/10/output.js | 4 ++-- .../fixture/server-actions/server/11/output.js | 4 ++-- .../fixture/server-actions/server/12/output.js | 4 ++-- .../fixture/server-actions/server/13/output.js | 6 +++--- .../fixture/server-actions/server/14/output.js | 4 ++-- .../fixture/server-actions/server/15/output.js | 6 +++--- .../fixture/server-actions/server/16/output.js | 8 ++++---- .../fixture/server-actions/server/17/output.js | 8 ++++---- .../fixture/server-actions/server/18/output.js | 6 +++--- .../fixture/server-actions/server/19/output.js | 4 ++-- .../fixture/server-actions/server/2/output.js | 6 +++--- .../fixture/server-actions/server/20/output.js | 4 ++-- .../fixture/server-actions/server/21/output.js | 8 ++++---- .../fixture/server-actions/server/22/output.js | 10 +++++----- .../fixture/server-actions/server/23/output.js | 6 +++--- .../fixture/server-actions/server/24/output.js | 4 ++-- .../fixture/server-actions/server/25/output.js | 6 +++--- .../fixture/server-actions/server/26/output.js | 4 ++-- .../fixture/server-actions/server/27/input.js | 2 +- .../fixture/server-actions/server/27/output.js | 14 +++++++------- .../fixture/server-actions/server/28/output.js | 8 ++++---- .../fixture/server-actions/server/29/output.js | 8 ++++---- .../fixture/server-actions/server/3/output.js | 4 ++-- .../fixture/server-actions/server/4/output.js | 8 ++++---- .../fixture/server-actions/server/5/output.js | 4 ++-- .../fixture/server-actions/server/6/output.js | 4 ++-- .../fixture/server-actions/server/7/output.js | 10 +++++----- .../fixture/server-actions/server/8/output.js | 4 ++-- .../fixture/server-actions/server/9/output.js | 8 ++++---- packages/next/src/build/create-compiler-aliases.ts | 2 +- packages/next/src/build/handle-externals.ts | 2 +- .../{action-proxy.ts => server-reference.ts} | 6 +++--- packages/next/src/lib/constants.ts | 2 +- 46 files changed, 121 insertions(+), 121 deletions(-) rename packages/next/src/build/webpack/loaders/next-flight-loader/{action-proxy.ts => server-reference.ts} (59%) diff --git a/packages/next-swc/crates/next-core/src/next_import_map.rs b/packages/next-swc/crates/next-core/src/next_import_map.rs index f1e3795928c3f..e9459ecd6a721 100644 --- a/packages/next-swc/crates/next-core/src/next_import_map.rs +++ b/packages/next-swc/crates/next-core/src/next_import_map.rs @@ -799,10 +799,10 @@ async fn insert_next_shared_aliases( ); import_map.insert_exact_alias( - "private-next-rsc-action-proxy", + "private-next-rsc-server-reference", request_to_import_mapping( project_path, - "next/dist/build/webpack/loaders/next-flight-loader/action-proxy", + "next/dist/build/webpack/loaders/next-flight-loader/server-reference", ), ); import_map.insert_exact_alias( diff --git a/packages/next-swc/crates/next-core/src/next_server/resolve.rs b/packages/next-swc/crates/next-core/src/next_server/resolve.rs index 985d8e952501e..c89eb51619774 100644 --- a/packages/next-swc/crates/next-core/src/next_server/resolve.rs +++ b/packages/next-swc/crates/next-core/src/next_server/resolve.rs @@ -86,7 +86,7 @@ impl ResolvePlugin for ExternalCjsModulesResolvePlugin { } // from https://github.com/vercel/next.js/blob/8d1c619ad650f5d147207f267441caf12acd91d1/packages/next/src/build/handle-externals.ts#L188 - let never_external_regex = lazy_regex::regex!("^(?:private-next-pages\\/|next\\/(?:dist\\/pages\\/|(?:app|document|link|image|legacy\\/image|constants|dynamic|script|navigation|headers|router)$)|string-hash|private-next-rsc-action-validate|private-next-rsc-action-client-wrapper|private-next-rsc-action-proxy$)"); + let never_external_regex = lazy_regex::regex!("^(?:private-next-pages\\/|next\\/(?:dist\\/pages\\/|(?:app|document|link|image|legacy\\/image|constants|dynamic|script|navigation|headers|router)$)|string-hash|private-next-rsc-action-validate|private-next-rsc-action-client-wrapper|private-next-rsc-server-reference$)"); if never_external_regex.is_match(&request_value.request().unwrap_or_default()) { return Ok(ResolveResultOption::none()); diff --git a/packages/next-swc/crates/next-custom-transforms/src/transforms/server_actions.rs b/packages/next-swc/crates/next-custom-transforms/src/transforms/server_actions.rs index db960d912e2c5..162778a3ec3b2 100644 --- a/packages/next-swc/crates/next-custom-transforms/src/transforms/server_actions.rs +++ b/packages/next-swc/crates/next-custom-transforms/src/transforms/server_actions.rs @@ -1044,19 +1044,19 @@ impl VisitMut for ServerActions { if self.config.is_react_server_layer { // Inlined actions are only allowed on the server layer. - // import { createActionProxy } from 'private-next-rsc-action-proxy' - // createActionProxy("action_id") + // import { registerServerReference } from 'private-next-rsc-server-reference' + // registerServerReference("action_id") new.push(ModuleItem::ModuleDecl(ModuleDecl::Import(ImportDecl { span: DUMMY_SP, specifiers: vec![ImportSpecifier::Named(ImportNamedSpecifier { span: DUMMY_SP, - local: quote_ident!("createActionProxy"), + local: quote_ident!("registerServerReference"), imported: None, is_type_only: false, })], src: Box::new(Str { span: DUMMY_SP, - value: "private-next-rsc-action-proxy".into(), + value: "private-next-rsc-server-reference".into(), raw: None, }), type_only: false, @@ -1215,13 +1215,13 @@ fn annotate_ident_as_action( file_name: &str, export_name: String, ) -> Expr { - // Add the proxy wrapper call `createActionProxy($$id, $$bound, myAction, + // Add the proxy wrapper call `registerServerReference($$id, $$bound, myAction, // maybe_orig_action)`. let action_id = generate_action_id(file_name, &export_name); let proxy_expr = Expr::Call(CallExpr { span: DUMMY_SP, - callee: quote_ident!("createActionProxy").as_callee(), + callee: quote_ident!("registerServerReference").as_callee(), args: vec![ // $$id ExprOrSpread { diff --git a/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/client-graph/1/output.js b/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/client-graph/1/output.js index e9c17d048e0c3..0b804567eaaa7 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/client-graph/1/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/client-graph/1/output.js @@ -1,5 +1,5 @@ /* __next_internal_client_entry_do_not_use__ default auto */ /* __next_internal_action_entry_do_not_use__ {"6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0"} */ export async function $$ACTION_0() {} export default function App() { - var fn = createActionProxy("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0); + var fn = registerServerReference("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0); return
App
; } diff --git a/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/1/output.js b/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/1/output.js index 9e261dd7b291e..ecba6f9f39448 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/1/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/1/output.js @@ -1,8 +1,8 @@ -/* __next_internal_action_entry_do_not_use__ {"ab21efdafbe611287bc25c0462b1e0510d13e48b":"foo"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"ab21efdafbe611287bc25c0462b1e0510d13e48b":"foo"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; export function foo() {} import { ensureServerEntryExports } from "private-next-rsc-action-validate"; ensureServerEntryExports([ foo ]); -createActionProxy("ab21efdafbe611287bc25c0462b1e0510d13e48b", foo); +registerServerReference("ab21efdafbe611287bc25c0462b1e0510d13e48b", foo); diff --git a/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/2/output.js b/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/2/output.js index 97d918daabba0..1dd3034f34616 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/2/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/2/output.js @@ -1,4 +1,4 @@ -/* __next_internal_action_entry_do_not_use__ {"ac840dcaf5e8197cb02b7f3a43c119b7a770b272":"bar"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"ac840dcaf5e8197cb02b7f3a43c119b7a770b272":"bar"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; 'use strict'; export function bar() {} @@ -6,4 +6,4 @@ import { ensureServerEntryExports } from "private-next-rsc-action-validate"; ensureServerEntryExports([ bar ]); -createActionProxy("ac840dcaf5e8197cb02b7f3a43c119b7a770b272", bar); +registerServerReference("ac840dcaf5e8197cb02b7f3a43c119b7a770b272", bar); diff --git a/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/3/output.js b/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/3/output.js index c6a9e115ec00f..29d945f830519 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/3/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/3/output.js @@ -1,8 +1,8 @@ -/* __next_internal_action_entry_do_not_use__ {"b78c261f135a7a852508c2920bd7228020ff4bd7":"x"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"b78c261f135a7a852508c2920bd7228020ff4bd7":"x"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; export const x = 1; import { ensureServerEntryExports } from "private-next-rsc-action-validate"; ensureServerEntryExports([ x ]); -createActionProxy("b78c261f135a7a852508c2920bd7228020ff4bd7", x); +registerServerReference("b78c261f135a7a852508c2920bd7228020ff4bd7", x); diff --git a/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/4/output.js b/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/4/output.js index f8dc21b9d8ae5..1e4e2d5ded6f3 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/4/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/4/output.js @@ -1,4 +1,4 @@ -/* __next_internal_action_entry_do_not_use__ {} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; export default class Component { render() { diff --git a/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/5/output.js b/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/5/output.js index fe4d3fb0ac3fe..f0d232472bf84 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/5/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/5/output.js @@ -1,4 +1,4 @@ -/* __next_internal_action_entry_do_not_use__ {} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; export * from 'foo'; import { ensureServerEntryExports } from "private-next-rsc-action-validate"; diff --git a/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/6/output.js b/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/6/output.js index 3b12261603df4..8ef2648072c12 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/6/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/6/output.js @@ -1,6 +1,6 @@ -/* __next_internal_action_entry_do_not_use__ {"6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; -export default createActionProxy("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0); +export default registerServerReference("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0); export async function $$ACTION_0() {} import { ensureServerEntryExports } from "private-next-rsc-action-validate"; ensureServerEntryExports([]); diff --git a/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/7/output.js b/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/7/output.js index 8b7105a3190db..f9711506c40c6 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/7/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/7/output.js @@ -1,4 +1,4 @@ -/* __next_internal_action_entry_do_not_use__ {"6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; -const foo = createActionProxy("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0); +const foo = registerServerReference("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0); export async function $$ACTION_0() {} diff --git a/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/8/output.js b/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/8/output.js index ac8f4884a4ef1..400aef21835dc 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/8/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/8/output.js @@ -1,6 +1,6 @@ -/* __next_internal_action_entry_do_not_use__ {"6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; -const foo = createActionProxy("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0); +const foo = registerServerReference("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0); export async function $$ACTION_0() { 'use strict'; } diff --git a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/1/output.js b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/1/output.js index 083fae9175ab1..1d12a66e13ace 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/1/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/1/output.js @@ -1,8 +1,8 @@ -/* __next_internal_action_entry_do_not_use__ {"188d5d945750dc32e2c842b93c75a65763d4a922":"$$ACTION_1","6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"188d5d945750dc32e2c842b93c75a65763d4a922":"$$ACTION_1","6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; import deleteFromDb from 'db'; export function Item({ id1, id2 }) { - var deleteItem = createActionProxy("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0).bind(null, encryptActionBoundArgs("6d53ce510b2e36499b8f56038817b9bad86cabb4", [ + var deleteItem = registerServerReference("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0).bind(null, encryptActionBoundArgs("6d53ce510b2e36499b8f56038817b9bad86cabb4", [ id1, id2 ])); @@ -18,7 +18,7 @@ export default function Home() { name: 'John', test: 'test' }; - const action = createActionProxy("188d5d945750dc32e2c842b93c75a65763d4a922", $$ACTION_1).bind(null, encryptActionBoundArgs("188d5d945750dc32e2c842b93c75a65763d4a922", [ + const action = registerServerReference("188d5d945750dc32e2c842b93c75a65763d4a922", $$ACTION_1).bind(null, encryptActionBoundArgs("188d5d945750dc32e2c842b93c75a65763d4a922", [ info.name, info.test ])); diff --git a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/10/output.js b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/10/output.js index 8666bb1f6e985..871fdbb306f18 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/10/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/10/output.js @@ -1,8 +1,8 @@ -/* __next_internal_action_entry_do_not_use__ {"c18c215a6b7cdc64bf709f3a714ffdef1bf9651d":"default"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"c18c215a6b7cdc64bf709f3a714ffdef1bf9651d":"default"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; export default async function foo() {} import { ensureServerEntryExports } from "private-next-rsc-action-validate"; ensureServerEntryExports([ foo ]); -createActionProxy("c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", foo); +registerServerReference("c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", foo); diff --git a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/11/output.js b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/11/output.js index dab935ba484f6..4aac8b2676488 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/11/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/11/output.js @@ -1,8 +1,8 @@ -/* __next_internal_action_entry_do_not_use__ {"c18c215a6b7cdc64bf709f3a714ffdef1bf9651d":"default"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"c18c215a6b7cdc64bf709f3a714ffdef1bf9651d":"default"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; export default async function $$ACTION_0() {} import { ensureServerEntryExports } from "private-next-rsc-action-validate"; ensureServerEntryExports([ $$ACTION_0 ]); -createActionProxy("c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", $$ACTION_0); +registerServerReference("c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", $$ACTION_0); diff --git a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/12/output.js b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/12/output.js index 373f388b78dcb..9e5ece55cb20a 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/12/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/12/output.js @@ -1,4 +1,4 @@ -/* __next_internal_action_entry_do_not_use__ {"c18c215a6b7cdc64bf709f3a714ffdef1bf9651d":"default"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"c18c215a6b7cdc64bf709f3a714ffdef1bf9651d":"default"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; async function foo() {} export default foo; @@ -6,4 +6,4 @@ import { ensureServerEntryExports } from "private-next-rsc-action-validate"; ensureServerEntryExports([ foo ]); -createActionProxy("c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", foo); +registerServerReference("c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", foo); diff --git a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/13/output.js b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/13/output.js index c4db2124ab3cb..c958051367890 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/13/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/13/output.js @@ -1,4 +1,4 @@ -/* __next_internal_action_entry_do_not_use__ {"ac840dcaf5e8197cb02b7f3a43c119b7a770b272":"bar","c18c215a6b7cdc64bf709f3a714ffdef1bf9651d":"default"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"ac840dcaf5e8197cb02b7f3a43c119b7a770b272":"bar","c18c215a6b7cdc64bf709f3a714ffdef1bf9651d":"default"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; const foo = async function() {}; export default foo; @@ -9,5 +9,5 @@ ensureServerEntryExports([ foo, bar ]); -createActionProxy("c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", foo); -createActionProxy("ac840dcaf5e8197cb02b7f3a43c119b7a770b272", bar); +registerServerReference("c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", foo); +registerServerReference("ac840dcaf5e8197cb02b7f3a43c119b7a770b272", bar); diff --git a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/14/output.js b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/14/output.js index 1b1dbde5af657..fa283adc6262e 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/14/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/14/output.js @@ -1,4 +1,4 @@ -/* __next_internal_action_entry_do_not_use__ {"ab21efdafbe611287bc25c0462b1e0510d13e48b":"foo"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"ab21efdafbe611287bc25c0462b1e0510d13e48b":"foo"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; export async function foo() { async function bar() {} @@ -7,4 +7,4 @@ import { ensureServerEntryExports } from "private-next-rsc-action-validate"; ensureServerEntryExports([ foo ]); -createActionProxy("ab21efdafbe611287bc25c0462b1e0510d13e48b", foo); +registerServerReference("ab21efdafbe611287bc25c0462b1e0510d13e48b", foo); diff --git a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/15/output.js b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/15/output.js index 6f9c9865c243e..bec01bcac7b93 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/15/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/15/output.js @@ -1,6 +1,6 @@ -/* __next_internal_action_entry_do_not_use__ {"188d5d945750dc32e2c842b93c75a65763d4a922":"$$ACTION_1","c18c215a6b7cdc64bf709f3a714ffdef1bf9651d":"default"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"188d5d945750dc32e2c842b93c75a65763d4a922":"$$ACTION_1","c18c215a6b7cdc64bf709f3a714ffdef1bf9651d":"default"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; -export default $$ACTION_0 = createActionProxy("188d5d945750dc32e2c842b93c75a65763d4a922", $$ACTION_1); +export default $$ACTION_0 = registerServerReference("188d5d945750dc32e2c842b93c75a65763d4a922", $$ACTION_1); var $$ACTION_0; export async function $$ACTION_1(a, b) { console.log(a, b); @@ -9,4 +9,4 @@ import { ensureServerEntryExports } from "private-next-rsc-action-validate"; ensureServerEntryExports([ $$ACTION_0 ]); -createActionProxy("c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", $$ACTION_0); +registerServerReference("c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", $$ACTION_0); diff --git a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/16/output.js b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/16/output.js index 2d6955320a27a..0631a83887aab 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/16/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/16/output.js @@ -1,10 +1,10 @@ -/* __next_internal_action_entry_do_not_use__ {"188d5d945750dc32e2c842b93c75a65763d4a922":"$$ACTION_1","6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0","9878bfa39811ca7650992850a8751f9591b6a557":"$$ACTION_2"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"188d5d945750dc32e2c842b93c75a65763d4a922":"$$ACTION_1","6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0","9878bfa39811ca7650992850a8751f9591b6a557":"$$ACTION_2"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; import deleteFromDb from 'db'; const v1 = 'v1'; export function Item({ id1, id2 }) { const v2 = id2; - const deleteItem = createActionProxy("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0).bind(null, encryptActionBoundArgs("6d53ce510b2e36499b8f56038817b9bad86cabb4", [ + const deleteItem = registerServerReference("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0).bind(null, encryptActionBoundArgs("6d53ce510b2e36499b8f56038817b9bad86cabb4", [ id1, v2 ])); @@ -17,7 +17,7 @@ export async function $$ACTION_0($$ACTION_CLOSURE_BOUND) { await deleteFromDb($$ACTION_ARG_1); } const f = (x)=>{ - var g = createActionProxy("188d5d945750dc32e2c842b93c75a65763d4a922", $$ACTION_1).bind(null, encryptActionBoundArgs("188d5d945750dc32e2c842b93c75a65763d4a922", [ + var g = registerServerReference("188d5d945750dc32e2c842b93c75a65763d4a922", $$ACTION_1).bind(null, encryptActionBoundArgs("188d5d945750dc32e2c842b93c75a65763d4a922", [ x ])); }; @@ -26,7 +26,7 @@ export async function $$ACTION_1($$ACTION_CLOSURE_BOUND, y, ...z) { return $$ACTION_ARG_0 + y + z[0]; } const g = (x)=>{ - f = createActionProxy("9878bfa39811ca7650992850a8751f9591b6a557", $$ACTION_2).bind(null, encryptActionBoundArgs("9878bfa39811ca7650992850a8751f9591b6a557", [ + f = registerServerReference("9878bfa39811ca7650992850a8751f9591b6a557", $$ACTION_2).bind(null, encryptActionBoundArgs("9878bfa39811ca7650992850a8751f9591b6a557", [ x ])); }; diff --git a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/17/output.js b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/17/output.js index 740fbdfab43fd..f0318ce0ddee0 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/17/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/17/output.js @@ -1,6 +1,6 @@ -/* __next_internal_action_entry_do_not_use__ {"6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0","ab21efdafbe611287bc25c0462b1e0510d13e48b":"foo","ac840dcaf5e8197cb02b7f3a43c119b7a770b272":"bar"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0","ab21efdafbe611287bc25c0462b1e0510d13e48b":"foo","ac840dcaf5e8197cb02b7f3a43c119b7a770b272":"bar"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; -export const foo = createActionProxy("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0); +export const foo = registerServerReference("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0); export async function $$ACTION_0() {} const bar = async ()=>{}; export { bar }; @@ -9,5 +9,5 @@ ensureServerEntryExports([ foo, bar ]); -createActionProxy("ab21efdafbe611287bc25c0462b1e0510d13e48b", foo); -createActionProxy("ac840dcaf5e8197cb02b7f3a43c119b7a770b272", bar); +registerServerReference("ab21efdafbe611287bc25c0462b1e0510d13e48b", foo); +registerServerReference("ac840dcaf5e8197cb02b7f3a43c119b7a770b272", bar); diff --git a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/18/output.js b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/18/output.js index a05b92ee24856..64f30fef36004 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/18/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/18/output.js @@ -1,4 +1,4 @@ -/* __next_internal_action_entry_do_not_use__ {"6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0","9878bfa39811ca7650992850a8751f9591b6a557":"$$ACTION_2"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0","9878bfa39811ca7650992850a8751f9591b6a557":"$$ACTION_2"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; import deleteFromDb from 'db'; const v1 = 'v1'; @@ -6,7 +6,7 @@ export function Item({ id1, id2 }) { const v2 = id2; return <> - - ; } -export const action = withValidate(createActionProxy("188d5d945750dc32e2c842b93c75a65763d4a922", $$ACTION_1)); +export const action = withValidate(registerServerReference("188d5d945750dc32e2c842b93c75a65763d4a922", $$ACTION_1)); export async function $$ACTION_1() {} diff --git a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/20/output.js b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/20/output.js index bd3457e7b41a5..c12b50b3bd560 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/20/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/20/output.js @@ -1,4 +1,4 @@ -/* __next_internal_action_entry_do_not_use__ {"c18c215a6b7cdc64bf709f3a714ffdef1bf9651d":"default"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"c18c215a6b7cdc64bf709f3a714ffdef1bf9651d":"default"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; const [foo] = [ null @@ -8,4 +8,4 @@ import { ensureServerEntryExports } from "private-next-rsc-action-validate"; ensureServerEntryExports([ foo ]); -createActionProxy("c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", foo); +registerServerReference("c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", foo); diff --git a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/21/output.js b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/21/output.js index faea436604bdf..5b7bd12e50d13 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/21/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/21/output.js @@ -1,10 +1,10 @@ -/* __next_internal_action_entry_do_not_use__ {"188d5d945750dc32e2c842b93c75a65763d4a922":"$$ACTION_1","56a859f462d35a297c46a1bbd1e6a9058c104ab8":"$$ACTION_3","9878bfa39811ca7650992850a8751f9591b6a557":"$$ACTION_2"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"188d5d945750dc32e2c842b93c75a65763d4a922":"$$ACTION_1","56a859f462d35a297c46a1bbd1e6a9058c104ab8":"$$ACTION_3","9878bfa39811ca7650992850a8751f9591b6a557":"$$ACTION_2"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; import { validator, another } from 'auth'; const x = 1; export default function Page() { const y = 1; - return ; } @@ -12,7 +12,7 @@ export async function $$ACTION_1($$ACTION_CLOSURE_BOUND, z) { var [$$ACTION_ARG_0] = await decryptActionBoundArgs("188d5d945750dc32e2c842b93c75a65763d4a922", $$ACTION_CLOSURE_BOUND); return x + $$ACTION_ARG_0 + z; } -validator(createActionProxy("9878bfa39811ca7650992850a8751f9591b6a557", $$ACTION_2)); +validator(registerServerReference("9878bfa39811ca7650992850a8751f9591b6a557", $$ACTION_2)); export async function $$ACTION_2() {} -another(validator(createActionProxy("56a859f462d35a297c46a1bbd1e6a9058c104ab8", $$ACTION_3))); +another(validator(registerServerReference("56a859f462d35a297c46a1bbd1e6a9058c104ab8", $$ACTION_3))); export async function $$ACTION_3() {} diff --git a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/22/output.js b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/22/output.js index 084fe21f6f201..690e5f44d2682 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/22/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/22/output.js @@ -1,9 +1,9 @@ -/* __next_internal_action_entry_do_not_use__ {"6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0","9878bfa39811ca7650992850a8751f9591b6a557":"$$ACTION_2","c18c215a6b7cdc64bf709f3a714ffdef1bf9651d":"default","f14702b5a021dd117f7ec7a3c838f397c2046d3b":"action"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0","9878bfa39811ca7650992850a8751f9591b6a557":"$$ACTION_2","c18c215a6b7cdc64bf709f3a714ffdef1bf9651d":"default","f14702b5a021dd117f7ec7a3c838f397c2046d3b":"action"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; import { validator } from 'auth'; -export const action = validator(createActionProxy("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0)); +export const action = validator(registerServerReference("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0)); export async function $$ACTION_0() {} -export default $$ACTION_1 = validator(createActionProxy("9878bfa39811ca7650992850a8751f9591b6a557", $$ACTION_2)); +export default $$ACTION_1 = validator(registerServerReference("9878bfa39811ca7650992850a8751f9591b6a557", $$ACTION_2)); var $$ACTION_1; export async function $$ACTION_2() {} import { ensureServerEntryExports } from "private-next-rsc-action-validate"; @@ -11,5 +11,5 @@ ensureServerEntryExports([ action, $$ACTION_1 ]); -createActionProxy("f14702b5a021dd117f7ec7a3c838f397c2046d3b", action); -createActionProxy("c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", $$ACTION_1); +registerServerReference("f14702b5a021dd117f7ec7a3c838f397c2046d3b", action); +registerServerReference("c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", $$ACTION_1); diff --git a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/23/output.js b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/23/output.js index 4d8250f54d807..27ef0fa4bfd83 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/23/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/23/output.js @@ -1,11 +1,11 @@ -/* __next_internal_action_entry_do_not_use__ {"188d5d945750dc32e2c842b93c75a65763d4a922":"$$ACTION_1","6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"188d5d945750dc32e2c842b93c75a65763d4a922":"$$ACTION_1","6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; export default function Page({ foo, x, y }) { - var action = createActionProxy("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0).bind(null, encryptActionBoundArgs("6d53ce510b2e36499b8f56038817b9bad86cabb4", [ + var action = registerServerReference("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0).bind(null, encryptActionBoundArgs("6d53ce510b2e36499b8f56038817b9bad86cabb4", [ x ])); action.bind(null, foo[0], foo[1], foo.x, foo[y]); - const action2 = createActionProxy("188d5d945750dc32e2c842b93c75a65763d4a922", $$ACTION_1).bind(null, encryptActionBoundArgs("188d5d945750dc32e2c842b93c75a65763d4a922", [ + const action2 = registerServerReference("188d5d945750dc32e2c842b93c75a65763d4a922", $$ACTION_1).bind(null, encryptActionBoundArgs("188d5d945750dc32e2c842b93c75a65763d4a922", [ x ])); action2.bind(null, foo[0], foo[1], foo.x, foo[y]); diff --git a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/24/output.js b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/24/output.js index 4e5be7b14ebb4..04ce8bf12269f 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/24/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/24/output.js @@ -1,7 +1,7 @@ -/* __next_internal_action_entry_do_not_use__ {"6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; export default function Page({ foo, x, y }) { - var action = createActionProxy("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0).bind(null, encryptActionBoundArgs("6d53ce510b2e36499b8f56038817b9bad86cabb4", [ + var action = registerServerReference("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0).bind(null, encryptActionBoundArgs("6d53ce510b2e36499b8f56038817b9bad86cabb4", [ foo ])); } diff --git a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/25/output.js b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/25/output.js index 7bb149f668f25..6785d57893fc7 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/25/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/25/output.js @@ -1,4 +1,4 @@ -/* __next_internal_action_entry_do_not_use__ {"188d5d945750dc32e2c842b93c75a65763d4a922":"$$ACTION_1","6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"188d5d945750dc32e2c842b93c75a65763d4a922":"$$ACTION_1","6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; import deleteFromDb from 'db'; export function Item({ id1, id2 }) { @@ -7,7 +7,7 @@ export function Item({ id1, id2 }) { id1++; return ; })(); - var deleteItem = createActionProxy("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0).bind(null, encryptActionBoundArgs("6d53ce510b2e36499b8f56038817b9bad86cabb4", [ + var deleteItem = registerServerReference("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0).bind(null, encryptActionBoundArgs("6d53ce510b2e36499b8f56038817b9bad86cabb4", [ id1, id2 ])); @@ -26,7 +26,7 @@ export function Item2({ id1, id2 }) { id1++; temp.push(); return temp; - var deleteItem = createActionProxy("188d5d945750dc32e2c842b93c75a65763d4a922", $$ACTION_1).bind(null, encryptActionBoundArgs("188d5d945750dc32e2c842b93c75a65763d4a922", [ + var deleteItem = registerServerReference("188d5d945750dc32e2c842b93c75a65763d4a922", $$ACTION_1).bind(null, encryptActionBoundArgs("188d5d945750dc32e2c842b93c75a65763d4a922", [ id1, id2 ])); diff --git a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/26/output.js b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/26/output.js index 0ac1137e64668..fd8b22458d80f 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/26/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/26/output.js @@ -1,7 +1,7 @@ -/* __next_internal_action_entry_do_not_use__ {"6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; const noop = (action)=>action; -export const log = noop(createActionProxy("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0)); +export const log = noop(registerServerReference("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0)); export async function $$ACTION_0(data) { console.log(data); } diff --git a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/27/input.js b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/27/input.js index 02e4dc5af170b..36a038fe9d2e8 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/27/input.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/27/input.js @@ -1,5 +1,5 @@ // Rules here: -// 1. Each exported function should still be exported, but as a reference `createActionProxy(...)`. +// 1. Each exported function should still be exported, but as a reference `registerServerReference(...)`. // 2. Actual action functions should be renamed to `$$ACTION_...` and got exported. async function foo() { diff --git a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/27/output.js b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/27/output.js index 86065e1d8551e..57b02081d277c 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/27/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/27/output.js @@ -1,26 +1,26 @@ // Rules here: -// 1. Each exported function should still be exported, but as a reference `createActionProxy(...)`. +// 1. Each exported function should still be exported, but as a reference `registerServerReference(...)`. // 2. Actual action functions should be renamed to `$$ACTION_...` and got exported. -/* __next_internal_action_entry_do_not_use__ {"188d5d945750dc32e2c842b93c75a65763d4a922":"$$ACTION_1","56a859f462d35a297c46a1bbd1e6a9058c104ab8":"$$ACTION_3","6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0","9878bfa39811ca7650992850a8751f9591b6a557":"$$ACTION_2","9c0dd1f7c2b3f41d32e10f5c437de3d67ad32c6c":"$$ACTION_4"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"188d5d945750dc32e2c842b93c75a65763d4a922":"$$ACTION_1","56a859f462d35a297c46a1bbd1e6a9058c104ab8":"$$ACTION_3","6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0","9878bfa39811ca7650992850a8751f9591b6a557":"$$ACTION_2","9c0dd1f7c2b3f41d32e10f5c437de3d67ad32c6c":"$$ACTION_4"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; -var foo = createActionProxy("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0); +var foo = registerServerReference("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0); export async function $$ACTION_0() { console.log(1); } export { foo }; -export var bar = createActionProxy("188d5d945750dc32e2c842b93c75a65763d4a922", $$ACTION_1); +export var bar = registerServerReference("188d5d945750dc32e2c842b93c75a65763d4a922", $$ACTION_1); export async function $$ACTION_1() { console.log(2); } -export default createActionProxy("9878bfa39811ca7650992850a8751f9591b6a557", $$ACTION_2); +export default registerServerReference("9878bfa39811ca7650992850a8751f9591b6a557", $$ACTION_2); export async function $$ACTION_2() { console.log(3); } -export const qux = createActionProxy("56a859f462d35a297c46a1bbd1e6a9058c104ab8", $$ACTION_3); +export const qux = registerServerReference("56a859f462d35a297c46a1bbd1e6a9058c104ab8", $$ACTION_3); export async function $$ACTION_3() { console.log(4); } -export const quux = createActionProxy("9c0dd1f7c2b3f41d32e10f5c437de3d67ad32c6c", $$ACTION_4); +export const quux = registerServerReference("9c0dd1f7c2b3f41d32e10f5c437de3d67ad32c6c", $$ACTION_4); export async function $$ACTION_4() { console.log(5); } diff --git a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/28/output.js b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/28/output.js index 4287ca9b2e77e..715b8857175ab 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/28/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/28/output.js @@ -1,8 +1,8 @@ -/* __next_internal_action_entry_do_not_use__ {"188d5d945750dc32e2c842b93c75a65763d4a922":"$$ACTION_1","6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0","9878bfa39811ca7650992850a8751f9591b6a557":"$$ACTION_2"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"188d5d945750dc32e2c842b93c75a65763d4a922":"$$ACTION_1","6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0","9878bfa39811ca7650992850a8751f9591b6a557":"$$ACTION_2"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; let a, f; function Comp(b, c, ...g) { - return createActionProxy("9878bfa39811ca7650992850a8751f9591b6a557", $$ACTION_2).bind(null, encryptActionBoundArgs("9878bfa39811ca7650992850a8751f9591b6a557", [ + return registerServerReference("9878bfa39811ca7650992850a8751f9591b6a557", $$ACTION_2).bind(null, encryptActionBoundArgs("9878bfa39811ca7650992850a8751f9591b6a557", [ c, g, b @@ -24,7 +24,7 @@ export async function $$ACTION_2($$ACTION_CLOSURE_BOUND, d) { window }); console.log(a, $$ACTION_ARG_2, action2); - var action2 = createActionProxy("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0).bind(null, encryptActionBoundArgs("6d53ce510b2e36499b8f56038817b9bad86cabb4", [ + var action2 = registerServerReference("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0).bind(null, encryptActionBoundArgs("6d53ce510b2e36499b8f56038817b9bad86cabb4", [ $$ACTION_ARG_0, d, f, @@ -32,7 +32,7 @@ export async function $$ACTION_2($$ACTION_CLOSURE_BOUND, d) { ])); return [ action2, - createActionProxy("188d5d945750dc32e2c842b93c75a65763d4a922", $$ACTION_1).bind(null, encryptActionBoundArgs("188d5d945750dc32e2c842b93c75a65763d4a922", [ + registerServerReference("188d5d945750dc32e2c842b93c75a65763d4a922", $$ACTION_1).bind(null, encryptActionBoundArgs("188d5d945750dc32e2c842b93c75a65763d4a922", [ action2, $$ACTION_ARG_0, d diff --git a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/29/output.js b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/29/output.js index 4addc633d84a5..24cbb90c77261 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/29/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/29/output.js @@ -1,6 +1,6 @@ -/* __next_internal_action_entry_do_not_use__ {"28baf972d345b86b747ad0df73d75a0088a42214":"dec","6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0","c18c215a6b7cdc64bf709f3a714ffdef1bf9651d":"default"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"28baf972d345b86b747ad0df73d75a0088a42214":"dec","6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0","c18c215a6b7cdc64bf709f3a714ffdef1bf9651d":"default"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; -export const dec = createActionProxy("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0); +export const dec = registerServerReference("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0); export async function $$ACTION_0(value) { return value - 1; } @@ -11,5 +11,5 @@ ensureServerEntryExports([ dec, dec ]); -createActionProxy("28baf972d345b86b747ad0df73d75a0088a42214", dec); -createActionProxy("c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", dec); \ No newline at end of file +registerServerReference("28baf972d345b86b747ad0df73d75a0088a42214", dec); +registerServerReference("c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", dec); \ No newline at end of file diff --git a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/3/output.js b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/3/output.js index 7bde2d0604efd..6062a67476b01 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/3/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/3/output.js @@ -1,5 +1,5 @@ // app/send.ts -/* __next_internal_action_entry_do_not_use__ {"e10665baac148856374b2789aceb970f66fec33e":"myAction"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"e10665baac148856374b2789aceb970f66fec33e":"myAction"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; export async function myAction(a, b, c) { console.log('a'); @@ -8,4 +8,4 @@ import { ensureServerEntryExports } from "private-next-rsc-action-validate"; ensureServerEntryExports([ myAction ]); -createActionProxy("e10665baac148856374b2789aceb970f66fec33e", myAction); +registerServerReference("e10665baac148856374b2789aceb970f66fec33e", myAction); diff --git a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/4/output.js b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/4/output.js index 06a5bfa7ac9a6..8762942d45d1b 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/4/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/4/output.js @@ -1,4 +1,4 @@ -/* __next_internal_action_entry_do_not_use__ {"1ab723c80dcca470e0410b4b2a2fc2bf21f41476":"c","6e7bc104e4d6e7fda190c4a51be969cfd0be6d6d":"a","d1f7eb64271d7c601dfef7d4d7053de1c2ca4338":"b"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"1ab723c80dcca470e0410b4b2a2fc2bf21f41476":"c","6e7bc104e4d6e7fda190c4a51be969cfd0be6d6d":"a","d1f7eb64271d7c601dfef7d4d7053de1c2ca4338":"b"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; export async function a() {} export async function b() {} @@ -13,6 +13,6 @@ ensureServerEntryExports([ b, c ]); -createActionProxy("6e7bc104e4d6e7fda190c4a51be969cfd0be6d6d", a); -createActionProxy("d1f7eb64271d7c601dfef7d4d7053de1c2ca4338", b); -createActionProxy("1ab723c80dcca470e0410b4b2a2fc2bf21f41476", c); +registerServerReference("6e7bc104e4d6e7fda190c4a51be969cfd0be6d6d", a); +registerServerReference("d1f7eb64271d7c601dfef7d4d7053de1c2ca4338", b); +registerServerReference("1ab723c80dcca470e0410b4b2a2fc2bf21f41476", c); diff --git a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/5/output.js b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/5/output.js index b2b5eb3c9352c..294e584035451 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/5/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/5/output.js @@ -1,10 +1,10 @@ -/* __next_internal_action_entry_do_not_use__ {"6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; import deleteFromDb from 'db'; const v1 = 'v1'; export function Item({ id1, id2, id3, id4 }) { const v2 = id2; - var deleteItem = createActionProxy("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0).bind(null, encryptActionBoundArgs("6d53ce510b2e36499b8f56038817b9bad86cabb4", [ + var deleteItem = registerServerReference("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0).bind(null, encryptActionBoundArgs("6d53ce510b2e36499b8f56038817b9bad86cabb4", [ id1, v2, id3, diff --git a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/6/output.js b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/6/output.js index 488d0c2c7c2fa..bb1de432edb98 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/6/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/6/output.js @@ -1,4 +1,4 @@ -/* __next_internal_action_entry_do_not_use__ {"6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; import f, { f1, f2 } from 'foo'; const f3 = 1; @@ -19,7 +19,7 @@ export function y(p, [p1, { p2 }], ...p3) { if (true) { const f8 = 1; } - var action = createActionProxy("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0).bind(null, encryptActionBoundArgs("6d53ce510b2e36499b8f56038817b9bad86cabb4", [ + var action = registerServerReference("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0).bind(null, encryptActionBoundArgs("6d53ce510b2e36499b8f56038817b9bad86cabb4", [ f2, f11, p, diff --git a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/7/output.js b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/7/output.js index c4bb17515a058..1a8d3ff5e9cec 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/7/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/7/output.js @@ -1,8 +1,8 @@ -/* __next_internal_action_entry_do_not_use__ {"188d5d945750dc32e2c842b93c75a65763d4a922":"$$ACTION_1","56a859f462d35a297c46a1bbd1e6a9058c104ab8":"$$ACTION_3","6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0","9c0dd1f7c2b3f41d32e10f5c437de3d67ad32c6c":"$$ACTION_4"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"188d5d945750dc32e2c842b93c75a65763d4a922":"$$ACTION_1","56a859f462d35a297c46a1bbd1e6a9058c104ab8":"$$ACTION_3","6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0","9c0dd1f7c2b3f41d32e10f5c437de3d67ad32c6c":"$$ACTION_4"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; import deleteFromDb from 'db'; export function Item1(product, foo, bar) { - const a = createActionProxy("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0).bind(null, encryptActionBoundArgs("6d53ce510b2e36499b8f56038817b9bad86cabb4", [ + const a = registerServerReference("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0).bind(null, encryptActionBoundArgs("6d53ce510b2e36499b8f56038817b9bad86cabb4", [ product.id, product?.foo, product.bar.baz, @@ -17,7 +17,7 @@ export async function $$ACTION_0($$ACTION_CLOSURE_BOUND) { await deleteFromDb($$ACTION_ARG_3.id, $$ACTION_ARG_3?.foo, $$ACTION_ARG_3.bar.baz, $$ACTION_ARG_3[$$ACTION_ARG_4, $$ACTION_ARG_5]); } export function Item2(product, foo, bar) { - var deleteItem2 = createActionProxy("188d5d945750dc32e2c842b93c75a65763d4a922", $$ACTION_1).bind(null, encryptActionBoundArgs("188d5d945750dc32e2c842b93c75a65763d4a922", [ + var deleteItem2 = registerServerReference("188d5d945750dc32e2c842b93c75a65763d4a922", $$ACTION_1).bind(null, encryptActionBoundArgs("188d5d945750dc32e2c842b93c75a65763d4a922", [ product.id, product?.foo, product.bar.baz, @@ -32,7 +32,7 @@ export async function $$ACTION_1($$ACTION_CLOSURE_BOUND) { await deleteFromDb($$ACTION_ARG_3.id, $$ACTION_ARG_3?.foo, $$ACTION_ARG_3.bar.baz, $$ACTION_ARG_3[$$ACTION_ARG_4, $$ACTION_ARG_5]); } export function Item3(product, foo, bar) { - const deleteItem3 = createActionProxy("56a859f462d35a297c46a1bbd1e6a9058c104ab8", $$ACTION_3).bind(null, encryptActionBoundArgs("56a859f462d35a297c46a1bbd1e6a9058c104ab8", [ + const deleteItem3 = registerServerReference("56a859f462d35a297c46a1bbd1e6a9058c104ab8", $$ACTION_3).bind(null, encryptActionBoundArgs("56a859f462d35a297c46a1bbd1e6a9058c104ab8", [ product.id, product?.foo, product.bar.baz, @@ -47,7 +47,7 @@ export async function $$ACTION_3($$ACTION_CLOSURE_BOUND) { await deleteFromDb($$ACTION_ARG_3.id, $$ACTION_ARG_3?.foo, $$ACTION_ARG_3.bar.baz, $$ACTION_ARG_3[$$ACTION_ARG_4, $$ACTION_ARG_5]); } export function Item4(product, foo, bar) { - const deleteItem4 = createActionProxy("9c0dd1f7c2b3f41d32e10f5c437de3d67ad32c6c", $$ACTION_4).bind(null, encryptActionBoundArgs("9c0dd1f7c2b3f41d32e10f5c437de3d67ad32c6c", [ + const deleteItem4 = registerServerReference("9c0dd1f7c2b3f41d32e10f5c437de3d67ad32c6c", $$ACTION_4).bind(null, encryptActionBoundArgs("9c0dd1f7c2b3f41d32e10f5c437de3d67ad32c6c", [ product.id, product?.foo, product.bar.baz, diff --git a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/8/output.js b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/8/output.js index 20cd837d2f823..48ab4c0b8f84e 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/8/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/8/output.js @@ -1,6 +1,6 @@ -/* __next_internal_action_entry_do_not_use__ {"6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; -var myAction = createActionProxy("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0); +var myAction = registerServerReference("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0); export async function $$ACTION_0(a, b, c) { // comment 'use strict'; diff --git a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/9/output.js b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/9/output.js index 9d61cc907880f..f9bf82a68ed6f 100644 --- a/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/9/output.js +++ b/packages/next-swc/crates/next-custom-transforms/tests/fixture/server-actions/server/9/output.js @@ -1,5 +1,5 @@ // app/send.ts -/* __next_internal_action_entry_do_not_use__ {"050e3854b72b19e3c7e3966a67535543a90bf7e0":"baz","ab21efdafbe611287bc25c0462b1e0510d13e48b":"foo","c18c215a6b7cdc64bf709f3a714ffdef1bf9651d":"default"} */ import { createActionProxy } from "private-next-rsc-action-proxy"; +/* __next_internal_action_entry_do_not_use__ {"050e3854b72b19e3c7e3966a67535543a90bf7e0":"baz","ab21efdafbe611287bc25c0462b1e0510d13e48b":"foo","c18c215a6b7cdc64bf709f3a714ffdef1bf9651d":"default"} */ import { registerServerReference } from "private-next-rsc-server-reference"; import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption"; async function foo() {} export { foo }; @@ -13,6 +13,6 @@ ensureServerEntryExports([ bar, qux ]); -createActionProxy("ab21efdafbe611287bc25c0462b1e0510d13e48b", foo); -createActionProxy("050e3854b72b19e3c7e3966a67535543a90bf7e0", bar); -createActionProxy("c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", qux); +registerServerReference("ab21efdafbe611287bc25c0462b1e0510d13e48b", foo); +registerServerReference("050e3854b72b19e3c7e3966a67535543a90bf7e0", bar); +registerServerReference("c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", qux); diff --git a/packages/next/src/build/create-compiler-aliases.ts b/packages/next/src/build/create-compiler-aliases.ts index f86f8daad6877..2a8a1fa226da5 100644 --- a/packages/next/src/build/create-compiler-aliases.ts +++ b/packages/next/src/build/create-compiler-aliases.ts @@ -148,7 +148,7 @@ export function createWebpackAliases({ 'next/dist/build/webpack/loaders/next-flight-loader/action-client-wrapper', [RSC_ACTION_PROXY_ALIAS]: - 'next/dist/build/webpack/loaders/next-flight-loader/action-proxy', + 'next/dist/build/webpack/loaders/next-flight-loader/server-reference', [RSC_ACTION_ENCRYPTION_ALIAS]: 'next/dist/server/app-render/action-encryption', diff --git a/packages/next/src/build/handle-externals.ts b/packages/next/src/build/handle-externals.ts index 5c29fac1ae05f..5f486d57f947a 100644 --- a/packages/next/src/build/handle-externals.ts +++ b/packages/next/src/build/handle-externals.ts @@ -197,7 +197,7 @@ export function makeExternalHandler({ } const notExternalModules = - /^(?:private-next-pages\/|next\/(?:dist\/pages\/|(?:app|document|link|image|legacy\/image|constants|dynamic|script|navigation|headers|router)$)|string-hash|private-next-rsc-action-validate|private-next-rsc-action-client-wrapper|private-next-rsc-action-proxy$)/ + /^(?:private-next-pages\/|next\/(?:dist\/pages\/|(?:app|document|link|image|legacy\/image|constants|dynamic|script|navigation|headers|router)$)|string-hash|private-next-rsc-action-validate|private-next-rsc-action-client-wrapper|private-next-rsc-server-reference$)/ if (notExternalModules.test(request)) { return } diff --git a/packages/next/src/build/webpack/loaders/next-flight-loader/action-proxy.ts b/packages/next/src/build/webpack/loaders/next-flight-loader/server-reference.ts similarity index 59% rename from packages/next/src/build/webpack/loaders/next-flight-loader/action-proxy.ts rename to packages/next/src/build/webpack/loaders/next-flight-loader/server-reference.ts index 9e442cfa4effc..52d2f6cab8d3b 100644 --- a/packages/next/src/build/webpack/loaders/next-flight-loader/action-proxy.ts +++ b/packages/next/src/build/webpack/loaders/next-flight-loader/server-reference.ts @@ -1,5 +1,5 @@ /* eslint-disable import/no-extraneous-dependencies */ -import { registerServerReference } from 'react-server-dom-webpack/server.edge' +import { registerServerReference as flightRegisterServerReference } from 'react-server-dom-webpack/server.edge' const SERVER_REFERENCE_TAG = Symbol.for('react.server.reference') @@ -7,11 +7,11 @@ function isServerReference(reference: any) { return reference && reference.$$typeof === SERVER_REFERENCE_TAG } -export function createActionProxy(id: string, action: any) { +export function registerServerReference(id: string, action: any) { // Avoid registering the same action twice if (isServerReference(action)) { return action } - return registerServerReference(action, id, null) + return flightRegisterServerReference(action, id, null) } diff --git a/packages/next/src/lib/constants.ts b/packages/next/src/lib/constants.ts index f5ffc618f40e2..cf14815da178f 100644 --- a/packages/next/src/lib/constants.ts +++ b/packages/next/src/lib/constants.ts @@ -40,7 +40,7 @@ export const ROOT_DIR_ALIAS = 'private-next-root-dir' export const APP_DIR_ALIAS = 'private-next-app-dir' export const RSC_MOD_REF_PROXY_ALIAS = 'private-next-rsc-mod-ref-proxy' export const RSC_ACTION_VALIDATE_ALIAS = 'private-next-rsc-action-validate' -export const RSC_ACTION_PROXY_ALIAS = 'private-next-rsc-action-proxy' +export const RSC_ACTION_PROXY_ALIAS = 'private-next-rsc-server-reference' export const RSC_ACTION_ENCRYPTION_ALIAS = 'private-next-rsc-action-encryption' export const RSC_ACTION_CLIENT_WRAPPER_ALIAS = 'private-next-rsc-action-client-wrapper'