Skip to content

Commit bd9bdfb

Browse files
unstubbablekdy1
unstubbable
authored and
kdy1
committed
Unwrap registerServerReference function (#70563)
In the same vein as #69190, where we already unwrapped `createServerReference`, we now also unwrap `registerServerReference`, which is required for React to select the right call stack frame when generating source locations for server actions (see facebook/react#30741). Whereas unwrapping of `createServerReference` was required for server actions that are imported into client components, unwrapping `registerServerReference` is needed for server actions that are passed from server components to client components. This does not fully enable the source mapping just yet. For this to work end-to-end, the next step is to generate proper spans in the SWC transform, which will be done in the next PR.
1 parent b41d4fd commit bd9bdfb

File tree

47 files changed

+89
-93
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+89
-93
lines changed

‎crates/next-custom-transforms/src/transforms/server_actions.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1626,7 +1626,6 @@ impl<C: Comments> VisitMut for ServerActions<C> {
16261626
if (self.has_action || self.has_cache) && self.config.is_react_server_layer {
16271627
// Inlined actions are only allowed on the server layer.
16281628
// import { registerServerReference } from 'private-next-rsc-server-reference'
1629-
// registerServerReference("action_id")
16301629
new.push(ModuleItem::ModuleDecl(ModuleDecl::Import(ImportDecl {
16311630
span: DUMMY_SP,
16321631
specifiers: vec![ImportSpecifier::Named(ImportNamedSpecifier {
@@ -1825,21 +1824,22 @@ fn annotate_ident_as_server_reference(
18251824
bound: Vec<Option<ExprOrSpread>>,
18261825
action_id: String,
18271826
) -> Expr {
1828-
// Add the proxy wrapper call `registerServerReference($$id, $$bound, myAction,
1829-
// maybe_orig_action)`.
1830-
1827+
// registerServerReference(reference, id, null)
18311828
let proxy_expr = Expr::Call(CallExpr {
18321829
span: DUMMY_SP,
18331830
callee: quote_ident!("registerServerReference").as_callee(),
18341831
args: vec![
1835-
// $$id
1832+
ExprOrSpread {
1833+
spread: None,
1834+
expr: Box::new(Expr::Ident(ident)),
1835+
},
18361836
ExprOrSpread {
18371837
spread: None,
18381838
expr: Box::new(action_id.clone().into()),
18391839
},
18401840
ExprOrSpread {
18411841
spread: None,
1842-
expr: Box::new(Expr::Ident(ident)),
1842+
expr: Box::new(Expr::Lit(Lit::Null(Null { span: DUMMY_SP }))),
18431843
},
18441844
],
18451845
..Default::default()

‎crates/next-custom-transforms/tests/errors/server-actions/client-graph/1/output.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* __next_internal_client_entry_do_not_use__ default auto */ /* __next_internal_action_entry_do_not_use__ {"6a88810ecce4a4e8b59d53b8327d7e98bbf251d7":"$$RSC_SERVER_ACTION_0"} */ export default function App() {
2-
var fn = registerServerReference("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", $$RSC_SERVER_ACTION_0);
2+
var fn = registerServerReference($$RSC_SERVER_ACTION_0, "6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", null);
33
return <div>App</div>;
44
}
55
export async function $$RSC_SERVER_ACTION_0() {}

‎crates/next-custom-transforms/tests/errors/server-actions/server-graph/1/output.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ import { ensureServerEntryExports } from "private-next-rsc-action-validate";
55
ensureServerEntryExports([
66
foo
77
]);
8-
registerServerReference("ab21efdafbe611287bc25c0462b1e0510d13e48b", foo);
8+
registerServerReference(foo, "ab21efdafbe611287bc25c0462b1e0510d13e48b", null);

‎crates/next-custom-transforms/tests/errors/server-actions/server-graph/2/output.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ import { ensureServerEntryExports } from "private-next-rsc-action-validate";
66
ensureServerEntryExports([
77
bar
88
]);
9-
registerServerReference("ac840dcaf5e8197cb02b7f3a43c119b7a770b272", bar);
9+
registerServerReference(bar, "ac840dcaf5e8197cb02b7f3a43c119b7a770b272", null);

‎crates/next-custom-transforms/tests/errors/server-actions/server-graph/3/output.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ import { ensureServerEntryExports } from "private-next-rsc-action-validate";
55
ensureServerEntryExports([
66
x
77
]);
8-
registerServerReference("b78c261f135a7a852508c2920bd7228020ff4bd7", x);
8+
registerServerReference(x, "b78c261f135a7a852508c2920bd7228020ff4bd7", null);

‎crates/next-custom-transforms/tests/errors/server-actions/server-graph/6/output.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __next_internal_action_entry_do_not_use__ {"6a88810ecce4a4e8b59d53b8327d7e98bbf251d7":"$$RSC_SERVER_ACTION_0"} */ import { registerServerReference } from "private-next-rsc-server-reference";
22
import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
3-
export default registerServerReference("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", $$RSC_SERVER_ACTION_0);
3+
export default registerServerReference($$RSC_SERVER_ACTION_0, "6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", null);
44
export async function $$RSC_SERVER_ACTION_0() {}
55
import { ensureServerEntryExports } from "private-next-rsc-action-validate";
66
ensureServerEntryExports([]);

‎crates/next-custom-transforms/tests/errors/server-actions/server-graph/7/output.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
/* __next_internal_action_entry_do_not_use__ {"6a88810ecce4a4e8b59d53b8327d7e98bbf251d7":"$$RSC_SERVER_ACTION_0"} */ import { registerServerReference } from "private-next-rsc-server-reference";
22
import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
3-
const foo = registerServerReference("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", $$RSC_SERVER_ACTION_0);
3+
const foo = registerServerReference($$RSC_SERVER_ACTION_0, "6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", null);
44
export async function $$RSC_SERVER_ACTION_0() {}

‎crates/next-custom-transforms/tests/errors/server-actions/server-graph/8/output.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __next_internal_action_entry_do_not_use__ {"6a88810ecce4a4e8b59d53b8327d7e98bbf251d7":"$$RSC_SERVER_ACTION_0"} */ import { registerServerReference } from "private-next-rsc-server-reference";
22
import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
3-
const foo = registerServerReference("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", $$RSC_SERVER_ACTION_0);
3+
const foo = registerServerReference($$RSC_SERVER_ACTION_0, "6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", null);
44
export async function $$RSC_SERVER_ACTION_0() {
55
'use strict';
66
}

‎crates/next-custom-transforms/tests/fixture/server-actions/server/1/output.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
33
import deleteFromDb from 'db';
44
export function Item({ id1, id2 }) {
5-
var deleteItem = registerServerReference("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", $$RSC_SERVER_ACTION_0).bind(null, encryptActionBoundArgs("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", [
5+
var deleteItem = registerServerReference($$RSC_SERVER_ACTION_0, "6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", null).bind(null, encryptActionBoundArgs("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", [
66
id1,
77
id2
88
]));
@@ -18,7 +18,7 @@ export default function Home() {
1818
name: 'John',
1919
test: 'test'
2020
};
21-
const action = registerServerReference("90b5db271335765a4b0eab01f044b381b5ebd5cd", $$RSC_SERVER_ACTION_1).bind(null, encryptActionBoundArgs("90b5db271335765a4b0eab01f044b381b5ebd5cd", [
21+
const action = registerServerReference($$RSC_SERVER_ACTION_1, "90b5db271335765a4b0eab01f044b381b5ebd5cd", null).bind(null, encryptActionBoundArgs("90b5db271335765a4b0eab01f044b381b5ebd5cd", [
2222
info.name,
2323
info.test
2424
]));

‎crates/next-custom-transforms/tests/fixture/server-actions/server/10/output.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ import { ensureServerEntryExports } from "private-next-rsc-action-validate";
55
ensureServerEntryExports([
66
foo
77
]);
8-
registerServerReference("c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", foo);
8+
registerServerReference(foo, "c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", null);

‎crates/next-custom-transforms/tests/fixture/server-actions/server/11/output.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ import { ensureServerEntryExports } from "private-next-rsc-action-validate";
55
ensureServerEntryExports([
66
$$RSC_SERVER_ACTION_0
77
]);
8-
registerServerReference("c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", $$RSC_SERVER_ACTION_0);
8+
registerServerReference($$RSC_SERVER_ACTION_0, "c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", null);

‎crates/next-custom-transforms/tests/fixture/server-actions/server/12/output.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ import { ensureServerEntryExports } from "private-next-rsc-action-validate";
66
ensureServerEntryExports([
77
foo
88
]);
9-
registerServerReference("c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", foo);
9+
registerServerReference(foo, "c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", null);

‎crates/next-custom-transforms/tests/fixture/server-actions/server/13/output.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ ensureServerEntryExports([
99
foo,
1010
bar
1111
]);
12-
registerServerReference("c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", foo);
13-
registerServerReference("ac840dcaf5e8197cb02b7f3a43c119b7a770b272", bar);
12+
registerServerReference(foo, "c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", null);
13+
registerServerReference(bar, "ac840dcaf5e8197cb02b7f3a43c119b7a770b272", null);

‎crates/next-custom-transforms/tests/fixture/server-actions/server/14/output.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ import { ensureServerEntryExports } from "private-next-rsc-action-validate";
77
ensureServerEntryExports([
88
foo
99
]);
10-
registerServerReference("ab21efdafbe611287bc25c0462b1e0510d13e48b", foo);
10+
registerServerReference(foo, "ab21efdafbe611287bc25c0462b1e0510d13e48b", null);

‎crates/next-custom-transforms/tests/fixture/server-actions/server/15/output.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __next_internal_action_entry_do_not_use__ {"90b5db271335765a4b0eab01f044b381b5ebd5cd":"$$RSC_SERVER_ACTION_1","c18c215a6b7cdc64bf709f3a714ffdef1bf9651d":"default"} */ import { registerServerReference } from "private-next-rsc-server-reference";
22
import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
3-
export default $$RSC_SERVER_ACTION_0 = registerServerReference("90b5db271335765a4b0eab01f044b381b5ebd5cd", $$RSC_SERVER_ACTION_1);
3+
export default $$RSC_SERVER_ACTION_0 = registerServerReference($$RSC_SERVER_ACTION_1, "90b5db271335765a4b0eab01f044b381b5ebd5cd", null);
44
var $$RSC_SERVER_ACTION_0;
55
export async function $$RSC_SERVER_ACTION_1(a, b) {
66
console.log(a, b);
@@ -9,4 +9,4 @@ import { ensureServerEntryExports } from "private-next-rsc-action-validate";
99
ensureServerEntryExports([
1010
$$RSC_SERVER_ACTION_0
1111
]);
12-
registerServerReference("c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", $$RSC_SERVER_ACTION_0);
12+
registerServerReference($$RSC_SERVER_ACTION_0, "c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", null);

‎crates/next-custom-transforms/tests/fixture/server-actions/server/16/output.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import deleteFromDb from 'db';
44
const v1 = 'v1';
55
export function Item({ id1, id2 }) {
66
const v2 = id2;
7-
const deleteItem = registerServerReference("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", $$RSC_SERVER_ACTION_0).bind(null, encryptActionBoundArgs("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", [
7+
const deleteItem = registerServerReference($$RSC_SERVER_ACTION_0, "6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", null).bind(null, encryptActionBoundArgs("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", [
88
id1,
99
v2
1010
]));
@@ -17,7 +17,7 @@ export async function $$RSC_SERVER_ACTION_0($$ACTION_CLOSURE_BOUND) {
1717
await deleteFromDb($$ACTION_ARG_1);
1818
}
1919
const f = (x)=>{
20-
var g = registerServerReference("90b5db271335765a4b0eab01f044b381b5ebd5cd", $$RSC_SERVER_ACTION_1).bind(null, encryptActionBoundArgs("90b5db271335765a4b0eab01f044b381b5ebd5cd", [
20+
var g = registerServerReference($$RSC_SERVER_ACTION_1, "90b5db271335765a4b0eab01f044b381b5ebd5cd", null).bind(null, encryptActionBoundArgs("90b5db271335765a4b0eab01f044b381b5ebd5cd", [
2121
x
2222
]));
2323
};
@@ -26,7 +26,7 @@ export async function $$RSC_SERVER_ACTION_1($$ACTION_CLOSURE_BOUND, y, ...z) {
2626
return $$ACTION_ARG_0 + y + z[0];
2727
}
2828
const g = (x)=>{
29-
f = registerServerReference("1c36b06e398c97abe5d5d7ae8c672bfddf4e1b91", $$RSC_SERVER_ACTION_2).bind(null, encryptActionBoundArgs("1c36b06e398c97abe5d5d7ae8c672bfddf4e1b91", [
29+
f = registerServerReference($$RSC_SERVER_ACTION_2, "1c36b06e398c97abe5d5d7ae8c672bfddf4e1b91", null).bind(null, encryptActionBoundArgs("1c36b06e398c97abe5d5d7ae8c672bfddf4e1b91", [
3030
x
3131
]));
3232
};

‎crates/next-custom-transforms/tests/fixture/server-actions/server/17/output.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __next_internal_action_entry_do_not_use__ {"6a88810ecce4a4e8b59d53b8327d7e98bbf251d7":"$$RSC_SERVER_ACTION_0","ab21efdafbe611287bc25c0462b1e0510d13e48b":"foo","ac840dcaf5e8197cb02b7f3a43c119b7a770b272":"bar"} */ import { registerServerReference } from "private-next-rsc-server-reference";
22
import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
3-
export const foo = registerServerReference("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", $$RSC_SERVER_ACTION_0);
3+
export const foo = registerServerReference($$RSC_SERVER_ACTION_0, "6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", null);
44
export async function $$RSC_SERVER_ACTION_0() {}
55
const bar = async ()=>{};
66
export { bar };
@@ -9,5 +9,5 @@ ensureServerEntryExports([
99
foo,
1010
bar
1111
]);
12-
registerServerReference("ab21efdafbe611287bc25c0462b1e0510d13e48b", foo);
13-
registerServerReference("ac840dcaf5e8197cb02b7f3a43c119b7a770b272", bar);
12+
registerServerReference(foo, "ab21efdafbe611287bc25c0462b1e0510d13e48b", null);
13+
registerServerReference(bar, "ac840dcaf5e8197cb02b7f3a43c119b7a770b272", null);

‎crates/next-custom-transforms/tests/fixture/server-actions/server/18/output.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ const v1 = 'v1';
55
export function Item({ id1, id2 }) {
66
const v2 = id2;
77
return <>
8-
<Button action={registerServerReference("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", $$RSC_SERVER_ACTION_0).bind(null, encryptActionBoundArgs("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", [
8+
<Button action={registerServerReference($$RSC_SERVER_ACTION_0, "6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", null).bind(null, encryptActionBoundArgs("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", [
99
id1,
1010
v2
1111
]))}>
1212
Delete
1313
</Button>
14-
<Button action={registerServerReference("1c36b06e398c97abe5d5d7ae8c672bfddf4e1b91", $$RSC_SERVER_ACTION_2).bind(null, encryptActionBoundArgs("1c36b06e398c97abe5d5d7ae8c672bfddf4e1b91", [
14+
<Button action={registerServerReference($$RSC_SERVER_ACTION_2, "1c36b06e398c97abe5d5d7ae8c672bfddf4e1b91", null).bind(null, encryptActionBoundArgs("1c36b06e398c97abe5d5d7ae8c672bfddf4e1b91", [
1515
id1,
1616
v2
1717
]))}>

‎crates/next-custom-transforms/tests/fixture/server-actions/server/19/output.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
33
export function Item({ value }) {
44
return <>
5-
<Button action={registerServerReference("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", $$RSC_SERVER_ACTION_0).bind(null, encryptActionBoundArgs("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", [
5+
<Button action={registerServerReference($$RSC_SERVER_ACTION_0, "6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", null).bind(null, encryptActionBoundArgs("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", [
66
value
77
]))}>
88
Multiple

‎crates/next-custom-transforms/tests/fixture/server-actions/server/2/output.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/* __next_internal_action_entry_do_not_use__ {"6a88810ecce4a4e8b59d53b8327d7e98bbf251d7":"$$RSC_SERVER_ACTION_0","90b5db271335765a4b0eab01f044b381b5ebd5cd":"$$RSC_SERVER_ACTION_1"} */ import { registerServerReference } from "private-next-rsc-server-reference";
22
import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
3-
var myAction = registerServerReference("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", $$RSC_SERVER_ACTION_0);
3+
var myAction = registerServerReference($$RSC_SERVER_ACTION_0, "6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", null);
44
export async function $$RSC_SERVER_ACTION_0(a, b, c) {
55
console.log('a');
66
}
77
export default function Page() {
88
return <Button action={myAction}>Delete</Button>;
99
}
10-
export const action = withValidate(registerServerReference("90b5db271335765a4b0eab01f044b381b5ebd5cd", $$RSC_SERVER_ACTION_1));
10+
export const action = withValidate(registerServerReference($$RSC_SERVER_ACTION_1, "90b5db271335765a4b0eab01f044b381b5ebd5cd", null));
1111
export async function $$RSC_SERVER_ACTION_1() {}

‎crates/next-custom-transforms/tests/fixture/server-actions/server/20/output.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ import { ensureServerEntryExports } from "private-next-rsc-action-validate";
88
ensureServerEntryExports([
99
foo
1010
]);
11-
registerServerReference("c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", foo);
11+
registerServerReference(foo, "c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", null);

‎crates/next-custom-transforms/tests/fixture/server-actions/server/21/output.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ import { validator, another } from 'auth';
44
const x = 1;
55
export default function Page() {
66
const y = 1;
7-
return <Foo action={validator(registerServerReference("90b5db271335765a4b0eab01f044b381b5ebd5cd", $$RSC_SERVER_ACTION_1).bind(null, encryptActionBoundArgs("90b5db271335765a4b0eab01f044b381b5ebd5cd", [
7+
return <Foo action={validator(registerServerReference($$RSC_SERVER_ACTION_1, "90b5db271335765a4b0eab01f044b381b5ebd5cd", null).bind(null, encryptActionBoundArgs("90b5db271335765a4b0eab01f044b381b5ebd5cd", [
88
y
99
])))}/>;
1010
}
1111
export async function $$RSC_SERVER_ACTION_1($$ACTION_CLOSURE_BOUND, z) {
1212
var [$$ACTION_ARG_0] = await decryptActionBoundArgs("90b5db271335765a4b0eab01f044b381b5ebd5cd", $$ACTION_CLOSURE_BOUND);
1313
return x + $$ACTION_ARG_0 + z;
1414
}
15-
validator(registerServerReference("1c36b06e398c97abe5d5d7ae8c672bfddf4e1b91", $$RSC_SERVER_ACTION_2));
15+
validator(registerServerReference($$RSC_SERVER_ACTION_2, "1c36b06e398c97abe5d5d7ae8c672bfddf4e1b91", null));
1616
export async function $$RSC_SERVER_ACTION_2() {}
17-
another(validator(registerServerReference("9ed0cc47abc4e1c64320cf42b74ae60b58c40f00", $$RSC_SERVER_ACTION_3)));
17+
another(validator(registerServerReference($$RSC_SERVER_ACTION_3, "9ed0cc47abc4e1c64320cf42b74ae60b58c40f00", null)));
1818
export async function $$RSC_SERVER_ACTION_3() {}

‎crates/next-custom-transforms/tests/fixture/server-actions/server/22/output.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
/* __next_internal_action_entry_do_not_use__ {"1c36b06e398c97abe5d5d7ae8c672bfddf4e1b91":"$$RSC_SERVER_ACTION_2","6a88810ecce4a4e8b59d53b8327d7e98bbf251d7":"$$RSC_SERVER_ACTION_0","c18c215a6b7cdc64bf709f3a714ffdef1bf9651d":"default","f14702b5a021dd117f7ec7a3c838f397c2046d3b":"action"} */ import { registerServerReference } from "private-next-rsc-server-reference";
22
import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
33
import { validator } from 'auth';
4-
export const action = validator(registerServerReference("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", $$RSC_SERVER_ACTION_0));
4+
export const action = validator(registerServerReference($$RSC_SERVER_ACTION_0, "6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", null));
55
export async function $$RSC_SERVER_ACTION_0() {}
6-
export default $$RSC_SERVER_ACTION_1 = validator(registerServerReference("1c36b06e398c97abe5d5d7ae8c672bfddf4e1b91", $$RSC_SERVER_ACTION_2));
6+
export default $$RSC_SERVER_ACTION_1 = validator(registerServerReference($$RSC_SERVER_ACTION_2, "1c36b06e398c97abe5d5d7ae8c672bfddf4e1b91", null));
77
var $$RSC_SERVER_ACTION_1;
88
export async function $$RSC_SERVER_ACTION_2() {}
99
import { ensureServerEntryExports } from "private-next-rsc-action-validate";
1010
ensureServerEntryExports([
1111
action,
1212
$$RSC_SERVER_ACTION_1
1313
]);
14-
registerServerReference("f14702b5a021dd117f7ec7a3c838f397c2046d3b", action);
15-
registerServerReference("c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", $$RSC_SERVER_ACTION_1);
14+
registerServerReference(action, "f14702b5a021dd117f7ec7a3c838f397c2046d3b", null);
15+
registerServerReference($$RSC_SERVER_ACTION_1, "c18c215a6b7cdc64bf709f3a714ffdef1bf9651d", null);

‎crates/next-custom-transforms/tests/fixture/server-actions/server/23/output.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/* __next_internal_action_entry_do_not_use__ {"6a88810ecce4a4e8b59d53b8327d7e98bbf251d7":"$$RSC_SERVER_ACTION_0","90b5db271335765a4b0eab01f044b381b5ebd5cd":"$$RSC_SERVER_ACTION_1"} */ import { registerServerReference } from "private-next-rsc-server-reference";
22
import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
33
export default function Page({ foo, x, y }) {
4-
var action = registerServerReference("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", $$RSC_SERVER_ACTION_0).bind(null, encryptActionBoundArgs("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", [
4+
var action = registerServerReference($$RSC_SERVER_ACTION_0, "6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", null).bind(null, encryptActionBoundArgs("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", [
55
x
66
]));
77
action.bind(null, foo[0], foo[1], foo.x, foo[y]);
8-
const action2 = registerServerReference("90b5db271335765a4b0eab01f044b381b5ebd5cd", $$RSC_SERVER_ACTION_1).bind(null, encryptActionBoundArgs("90b5db271335765a4b0eab01f044b381b5ebd5cd", [
8+
const action2 = registerServerReference($$RSC_SERVER_ACTION_1,"90b5db271335765a4b0eab01f044b381b5ebd5cd", null).bind(null, encryptActionBoundArgs("90b5db271335765a4b0eab01f044b381b5ebd5cd", [
99
x
1010
]));
1111
action2.bind(null, foo[0], foo[1], foo.x, foo[y]);

‎crates/next-custom-transforms/tests/fixture/server-actions/server/24/output.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* __next_internal_action_entry_do_not_use__ {"6a88810ecce4a4e8b59d53b8327d7e98bbf251d7":"$$RSC_SERVER_ACTION_0"} */ import { registerServerReference } from "private-next-rsc-server-reference";
22
import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
33
export default function Page({ foo, x, y }) {
4-
var action = registerServerReference("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", $$RSC_SERVER_ACTION_0).bind(null, encryptActionBoundArgs("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", [
4+
var action = registerServerReference($$RSC_SERVER_ACTION_0, "6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", null).bind(null, encryptActionBoundArgs("6a88810ecce4a4e8b59d53b8327d7e98bbf251d7", [
55
foo
66
]));
77
}

0 commit comments

Comments
 (0)