Skip to content

Commit 00d8e6e

Browse files
shudingMaxLeiter
authored andcommitted
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
1 parent 0131b7f commit 00d8e6e

File tree

46 files changed

+119
-119
lines changed

Some content is hidden

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

46 files changed

+119
-119
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -829,10 +829,10 @@ async fn insert_next_shared_aliases(
829829
);
830830

831831
import_map.insert_exact_alias(
832-
"private-next-rsc-action-proxy",
832+
"private-next-rsc-server-reference",
833833
request_to_import_mapping(
834834
project_path,
835-
"next/dist/build/webpack/loaders/next-flight-loader/action-proxy",
835+
"next/dist/build/webpack/loaders/next-flight-loader/server-reference",
836836
),
837837
);
838838
import_map.insert_exact_alias(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ impl ResolvePlugin for ExternalCjsModulesResolvePlugin {
8686
}
8787

8888
// from https://github.com/vercel/next.js/blob/8d1c619ad650f5d147207f267441caf12acd91d1/packages/next/src/build/handle-externals.ts#L188
89-
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$)");
89+
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$)");
9090

9191
if never_external_regex.is_match(&request_value.request().unwrap_or_default()) {
9292
return Ok(ResolveResultOption::none());

packages/next-swc/crates/next-custom-transforms/src/transforms/server_actions.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,19 +1045,19 @@ impl<C: Comments> VisitMut for ServerActions<C> {
10451045

10461046
if self.config.is_react_server_layer {
10471047
// Inlined actions are only allowed on the server layer.
1048-
// import { createActionProxy } from 'private-next-rsc-action-proxy'
1049-
// createActionProxy("action_id")
1048+
// import { registerServerReference } from 'private-next-rsc-server-reference'
1049+
// registerServerReference("action_id")
10501050
new.push(ModuleItem::ModuleDecl(ModuleDecl::Import(ImportDecl {
10511051
span: DUMMY_SP,
10521052
specifiers: vec![ImportSpecifier::Named(ImportNamedSpecifier {
10531053
span: DUMMY_SP,
1054-
local: quote_ident!("createActionProxy"),
1054+
local: quote_ident!("registerServerReference"),
10551055
imported: None,
10561056
is_type_only: false,
10571057
})],
10581058
src: Box::new(Str {
10591059
span: DUMMY_SP,
1060-
value: "private-next-rsc-action-proxy".into(),
1060+
value: "private-next-rsc-server-reference".into(),
10611061
raw: None,
10621062
}),
10631063
type_only: false,
@@ -1214,13 +1214,13 @@ fn annotate_ident_as_action(
12141214
file_name: &str,
12151215
export_name: String,
12161216
) -> Expr {
1217-
// Add the proxy wrapper call `createActionProxy($$id, $$bound, myAction,
1217+
// Add the proxy wrapper call `registerServerReference($$id, $$bound, myAction,
12181218
// maybe_orig_action)`.
12191219
let action_id = generate_action_id(file_name, &export_name);
12201220

12211221
let proxy_expr = Expr::Call(CallExpr {
12221222
span: DUMMY_SP,
1223-
callee: quote_ident!("createActionProxy").as_callee(),
1223+
callee: quote_ident!("registerServerReference").as_callee(),
12241224
args: vec![
12251225
// $$id
12261226
ExprOrSpread {
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__ {"6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0"} */ export async function $$ACTION_0() {}
22
export default function App() {
3-
var fn = createActionProxy("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0);
3+
var fn = registerServerReference("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0);
44
return <div>App</div>;
55
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
/* __next_internal_action_entry_do_not_use__ {"ab21efdafbe611287bc25c0462b1e0510d13e48b":"foo"} */ import { createActionProxy } from "private-next-rsc-action-proxy";
1+
/* __next_internal_action_entry_do_not_use__ {"ab21efdafbe611287bc25c0462b1e0510d13e48b":"foo"} */ import { registerServerReference } from "private-next-rsc-server-reference";
22
import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
33
export function foo() {}
44
import { ensureServerEntryExports } from "private-next-rsc-action-validate";
55
ensureServerEntryExports([
66
foo
77
]);
8-
createActionProxy("ab21efdafbe611287bc25c0462b1e0510d13e48b", foo);
8+
registerServerReference("ab21efdafbe611287bc25c0462b1e0510d13e48b", foo);
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
/* __next_internal_action_entry_do_not_use__ {"ac840dcaf5e8197cb02b7f3a43c119b7a770b272":"bar"} */ import { createActionProxy } from "private-next-rsc-action-proxy";
1+
/* __next_internal_action_entry_do_not_use__ {"ac840dcaf5e8197cb02b7f3a43c119b7a770b272":"bar"} */ import { registerServerReference } from "private-next-rsc-server-reference";
22
import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
33
'use strict';
44
export function bar() {}
55
import { ensureServerEntryExports } from "private-next-rsc-action-validate";
66
ensureServerEntryExports([
77
bar
88
]);
9-
createActionProxy("ac840dcaf5e8197cb02b7f3a43c119b7a770b272", bar);
9+
registerServerReference("ac840dcaf5e8197cb02b7f3a43c119b7a770b272", bar);
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
/* __next_internal_action_entry_do_not_use__ {"b78c261f135a7a852508c2920bd7228020ff4bd7":"x"} */ import { createActionProxy } from "private-next-rsc-action-proxy";
1+
/* __next_internal_action_entry_do_not_use__ {"b78c261f135a7a852508c2920bd7228020ff4bd7":"x"} */ import { registerServerReference } from "private-next-rsc-server-reference";
22
import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
33
export const x = 1;
44
import { ensureServerEntryExports } from "private-next-rsc-action-validate";
55
ensureServerEntryExports([
66
x
77
]);
8-
createActionProxy("b78c261f135a7a852508c2920bd7228020ff4bd7", x);
8+
registerServerReference("b78c261f135a7a852508c2920bd7228020ff4bd7", x);

packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/4/output.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* __next_internal_action_entry_do_not_use__ {} */ import { createActionProxy } from "private-next-rsc-action-proxy";
1+
/* __next_internal_action_entry_do_not_use__ {} */ import { registerServerReference } from "private-next-rsc-server-reference";
22
import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
33
export default class Component {
44
render() {

packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/5/output.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* __next_internal_action_entry_do_not_use__ {} */ import { createActionProxy } from "private-next-rsc-action-proxy";
1+
/* __next_internal_action_entry_do_not_use__ {} */ import { registerServerReference } from "private-next-rsc-server-reference";
22
import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
33
export * from 'foo';
44
import { ensureServerEntryExports } from "private-next-rsc-action-validate";
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/* __next_internal_action_entry_do_not_use__ {"6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0"} */ import { createActionProxy } from "private-next-rsc-action-proxy";
1+
/* __next_internal_action_entry_do_not_use__ {"6d53ce510b2e36499b8f56038817b9bad86cabb4":"$$ACTION_0"} */ import { registerServerReference } from "private-next-rsc-server-reference";
22
import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
3-
export default createActionProxy("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0);
3+
export default registerServerReference("6d53ce510b2e36499b8f56038817b9bad86cabb4", $$ACTION_0);
44
export async function $$ACTION_0() {}
55
import { ensureServerEntryExports } from "private-next-rsc-action-validate";
66
ensureServerEntryExports([]);

0 commit comments

Comments
 (0)