Unverified Commit a47d92f5 authored by Shu Ding's avatar Shu Ding Committed by GitHub

Fix default export of server action utility aliases (#54254)

Similar to #54004, this PR changes `private-next-rsc-action-validate`
and `private-next-rsc-action-client-wrapper` to export named values
instead of default values. In #54230 (currently broken), the Server
Action file was bundled via Vite/Rollup as an external dependency so
we're not doing the ESM interoperation correctly.

Closes #54230.
parent 24cd55c0
...@@ -898,13 +898,16 @@ impl<C: Comments> VisitMut for ServerActions<C> { ...@@ -898,13 +898,16 @@ impl<C: Comments> VisitMut for ServerActions<C> {
// wrapped by a reference creation call. // wrapped by a reference creation call.
let create_ref_ident = private_ident!("createServerReference"); let create_ref_ident = private_ident!("createServerReference");
if !self.config.is_server { if !self.config.is_server {
// import createServerReference from 'private-next-rsc-action-client-wrapper' // import { createServerReference } from
// 'private-next-rsc-action-client-wrapper'
// createServerReference("action_id") // createServerReference("action_id")
new.push(ModuleItem::ModuleDecl(ModuleDecl::Import(ImportDecl { new.push(ModuleItem::ModuleDecl(ModuleDecl::Import(ImportDecl {
span: DUMMY_SP, span: DUMMY_SP,
specifiers: vec![ImportSpecifier::Default(ImportDefaultSpecifier { specifiers: vec![ImportSpecifier::Named(ImportNamedSpecifier {
span: DUMMY_SP, span: DUMMY_SP,
local: create_ref_ident.clone(), local: create_ref_ident.clone(),
imported: None,
is_type_only: false,
})], })],
src: Box::new(Str { src: Box::new(Str {
span: DUMMY_SP, span: DUMMY_SP,
...@@ -986,9 +989,11 @@ impl<C: Comments> VisitMut for ServerActions<C> { ...@@ -986,9 +989,11 @@ impl<C: Comments> VisitMut for ServerActions<C> {
let ensure_ident = private_ident!("ensureServerEntryExports"); let ensure_ident = private_ident!("ensureServerEntryExports");
new.push(ModuleItem::ModuleDecl(ModuleDecl::Import(ImportDecl { new.push(ModuleItem::ModuleDecl(ModuleDecl::Import(ImportDecl {
span: DUMMY_SP, span: DUMMY_SP,
specifiers: vec![ImportSpecifier::Default(ImportDefaultSpecifier { specifiers: vec![ImportSpecifier::Named(ImportNamedSpecifier {
span: DUMMY_SP, span: DUMMY_SP,
local: ensure_ident.clone(), local: ensure_ident.clone(),
imported: None,
is_type_only: false,
})], })],
src: Box::new(Str { src: Box::new(Str {
span: DUMMY_SP, span: DUMMY_SP,
...@@ -1056,7 +1061,7 @@ impl<C: Comments> VisitMut for ServerActions<C> { ...@@ -1056,7 +1061,7 @@ impl<C: Comments> VisitMut for ServerActions<C> {
); );
// import { createActionProxy } from 'private-next-rsc-action-proxy' // import { createActionProxy } from 'private-next-rsc-action-proxy'
// createServerReference("action_id") // createActionProxy("action_id")
new.push(ModuleItem::ModuleDecl(ModuleDecl::Import(ImportDecl { new.push(ModuleItem::ModuleDecl(ModuleDecl::Import(ImportDecl {
span: DUMMY_SP, span: DUMMY_SP,
specifiers: vec![ImportSpecifier::Named(ImportNamedSpecifier { specifiers: vec![ImportSpecifier::Named(ImportNamedSpecifier {
......
/* __next_internal_action_entry_do_not_use__ foo */ import { createActionProxy } from "private-next-rsc-action-proxy"; /* __next_internal_action_entry_do_not_use__ foo */ import { createActionProxy } from "private-next-rsc-action-proxy";
export function foo() {} export function foo() {}
import ensureServerEntryExports from "private-next-rsc-action-validate"; import { ensureServerEntryExports } from "private-next-rsc-action-validate";
ensureServerEntryExports([ ensureServerEntryExports([
foo foo
]); ]);
......
/* __next_internal_action_entry_do_not_use__ bar */ import { createActionProxy } from "private-next-rsc-action-proxy"; /* __next_internal_action_entry_do_not_use__ bar */ import { createActionProxy } from "private-next-rsc-action-proxy";
'use strict'; 'use strict';
export function bar() {} export function bar() {}
import ensureServerEntryExports from "private-next-rsc-action-validate"; import { ensureServerEntryExports } from "private-next-rsc-action-validate";
ensureServerEntryExports([ ensureServerEntryExports([
bar bar
]); ]);
......
/* __next_internal_action_entry_do_not_use__ x */ import { createActionProxy } from "private-next-rsc-action-proxy"; /* __next_internal_action_entry_do_not_use__ x */ import { createActionProxy } from "private-next-rsc-action-proxy";
export const x = 1; export const x = 1;
import ensureServerEntryExports from "private-next-rsc-action-validate"; import { ensureServerEntryExports } from "private-next-rsc-action-validate";
ensureServerEntryExports([ ensureServerEntryExports([
x x
]); ]);
......
...@@ -4,5 +4,5 @@ export default class Component { ...@@ -4,5 +4,5 @@ export default class Component {
return null; return null;
} }
} }
import ensureServerEntryExports from "private-next-rsc-action-validate"; import { ensureServerEntryExports } from "private-next-rsc-action-validate";
ensureServerEntryExports([]); ensureServerEntryExports([]);
/* __next_internal_action_entry_do_not_use__ */ import { createActionProxy } from "private-next-rsc-action-proxy"; /* __next_internal_action_entry_do_not_use__ */ import { createActionProxy } from "private-next-rsc-action-proxy";
export * from 'foo'; export * from 'foo';
import ensureServerEntryExports from "private-next-rsc-action-validate"; import { ensureServerEntryExports } from "private-next-rsc-action-validate";
ensureServerEntryExports([]); ensureServerEntryExports([]);
/* __next_internal_action_entry_do_not_use__ */ import { createActionProxy } from "private-next-rsc-action-proxy"; /* __next_internal_action_entry_do_not_use__ */ import { createActionProxy } from "private-next-rsc-action-proxy";
export default (()=>{}); export default (()=>{});
import ensureServerEntryExports from "private-next-rsc-action-validate"; import { ensureServerEntryExports } from "private-next-rsc-action-validate";
ensureServerEntryExports([]); ensureServerEntryExports([]);
// app/send.ts // app/send.ts
/* __next_internal_action_entry_do_not_use__ myAction,default */ import { createActionProxy } from "private-next-rsc-action-proxy"; /* __next_internal_action_entry_do_not_use__ myAction,default */ import { createActionProxy } from "private-next-rsc-action-proxy";
import createServerReference from "private-next-rsc-action-client-wrapper"; import { createServerReference } from "private-next-rsc-action-client-wrapper";
export var myAction = createServerReference("e10665baac148856374b2789aceb970f66fec33e"); export var myAction = createServerReference("e10665baac148856374b2789aceb970f66fec33e");
export default createServerReference("c18c215a6b7cdc64bf709f3a714ffdef1bf9651d"); export default createServerReference("c18c215a6b7cdc64bf709f3a714ffdef1bf9651d");
// app/send.ts // app/send.ts
/* __next_internal_action_entry_do_not_use__ foo */ import { createActionProxy } from "private-next-rsc-action-proxy"; /* __next_internal_action_entry_do_not_use__ foo */ import { createActionProxy } from "private-next-rsc-action-proxy";
import createServerReference from "private-next-rsc-action-client-wrapper"; import { createServerReference } from "private-next-rsc-action-client-wrapper";
export var foo = createServerReference("ab21efdafbe611287bc25c0462b1e0510d13e48b"); export var foo = createServerReference("ab21efdafbe611287bc25c0462b1e0510d13e48b");
/* __next_internal_action_entry_do_not_use__ sampleFunction,sampleFunction2,sampleFunction3,sampleFunction4 */ import { createActionProxy } from "private-next-rsc-action-proxy"; /* __next_internal_action_entry_do_not_use__ sampleFunction,sampleFunction2,sampleFunction3,sampleFunction4 */ import { createActionProxy } from "private-next-rsc-action-proxy";
import createServerReference from "private-next-rsc-action-client-wrapper"; import { createServerReference } from "private-next-rsc-action-client-wrapper";
export var sampleFunction = createServerReference("bd336abe00c3c59da66acb696fc8e151d8e54ea4"); export var sampleFunction = createServerReference("bd336abe00c3c59da66acb696fc8e151d8e54ea4");
export var sampleFunction2 = createServerReference("a0c73dd6f5af839e3335c6b19262ecb86cca6af4"); export var sampleFunction2 = createServerReference("a0c73dd6f5af839e3335c6b19262ecb86cca6af4");
export var sampleFunction3 = createServerReference("d4f2e95bc745b6500b439c0847003511748c8ece"); export var sampleFunction3 = createServerReference("d4f2e95bc745b6500b439c0847003511748c8ece");
......
/* __next_internal_action_entry_do_not_use__ bar */ import { createActionProxy } from "private-next-rsc-action-proxy"; /* __next_internal_action_entry_do_not_use__ bar */ import { createActionProxy } from "private-next-rsc-action-proxy";
import createServerReference from "private-next-rsc-action-client-wrapper"; import { createServerReference } from "private-next-rsc-action-client-wrapper";
export var bar = createServerReference("ac840dcaf5e8197cb02b7f3a43c119b7a770b272"); export var bar = createServerReference("ac840dcaf5e8197cb02b7f3a43c119b7a770b272");
/* __next_internal_action_entry_do_not_use__ default */ import { createActionProxy } from "private-next-rsc-action-proxy"; /* __next_internal_action_entry_do_not_use__ default */ import { createActionProxy } from "private-next-rsc-action-proxy";
export default async function foo() {} export default async function foo() {}
import ensureServerEntryExports from "private-next-rsc-action-validate"; import { ensureServerEntryExports } from "private-next-rsc-action-validate";
ensureServerEntryExports([ ensureServerEntryExports([
foo foo
]); ]);
......
/* __next_internal_action_entry_do_not_use__ default */ import { createActionProxy } from "private-next-rsc-action-proxy"; /* __next_internal_action_entry_do_not_use__ default */ import { createActionProxy } from "private-next-rsc-action-proxy";
export default async function $$ACTION_0() {} export default async function $$ACTION_0() {}
import ensureServerEntryExports from "private-next-rsc-action-validate"; import { ensureServerEntryExports } from "private-next-rsc-action-validate";
ensureServerEntryExports([ ensureServerEntryExports([
$$ACTION_0 $$ACTION_0
]); ]);
......
/* __next_internal_action_entry_do_not_use__ default */ import { createActionProxy } from "private-next-rsc-action-proxy"; /* __next_internal_action_entry_do_not_use__ default */ import { createActionProxy } from "private-next-rsc-action-proxy";
async function foo() {} async function foo() {}
export default foo; export default foo;
import ensureServerEntryExports from "private-next-rsc-action-validate"; import { ensureServerEntryExports } from "private-next-rsc-action-validate";
ensureServerEntryExports([ ensureServerEntryExports([
foo foo
]); ]);
......
...@@ -3,7 +3,7 @@ const foo = async function() {}; ...@@ -3,7 +3,7 @@ const foo = async function() {};
export default foo; export default foo;
const bar = async function() {}; const bar = async function() {};
export { bar }; export { bar };
import ensureServerEntryExports from "private-next-rsc-action-validate"; import { ensureServerEntryExports } from "private-next-rsc-action-validate";
ensureServerEntryExports([ ensureServerEntryExports([
foo, foo,
bar bar
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
export async function foo() { export async function foo() {
async function bar() {} async function bar() {}
} }
import ensureServerEntryExports from "private-next-rsc-action-validate"; import { ensureServerEntryExports } from "private-next-rsc-action-validate";
ensureServerEntryExports([ ensureServerEntryExports([
foo foo
]); ]);
......
...@@ -3,7 +3,7 @@ export default $$ACTION_0 = async (a, b)=>{ ...@@ -3,7 +3,7 @@ export default $$ACTION_0 = async (a, b)=>{
console.log(a, b); console.log(a, b);
}; };
var $$ACTION_0; var $$ACTION_0;
import ensureServerEntryExports from "private-next-rsc-action-validate"; import { ensureServerEntryExports } from "private-next-rsc-action-validate";
ensureServerEntryExports([ ensureServerEntryExports([
$$ACTION_0 $$ACTION_0
]); ]);
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
export const foo = async ()=>{}; export const foo = async ()=>{};
const bar = async ()=>{}; const bar = async ()=>{};
export { bar }; export { bar };
import ensureServerEntryExports from "private-next-rsc-action-validate"; import { ensureServerEntryExports } from "private-next-rsc-action-validate";
ensureServerEntryExports([ ensureServerEntryExports([
foo, foo,
bar bar
......
...@@ -3,7 +3,7 @@ const [foo] = [ ...@@ -3,7 +3,7 @@ const [foo] = [
null null
]; ];
export default foo; export default foo;
import ensureServerEntryExports from "private-next-rsc-action-validate"; import { ensureServerEntryExports } from "private-next-rsc-action-validate";
ensureServerEntryExports([ ensureServerEntryExports([
foo foo
]); ]);
......
...@@ -3,7 +3,7 @@ import { validator } from 'auth'; ...@@ -3,7 +3,7 @@ import { validator } from 'auth';
export const action = validator(async ()=>{}); export const action = validator(async ()=>{});
export default $$ACTION_0 = validator(async ()=>{}); export default $$ACTION_0 = validator(async ()=>{});
var $$ACTION_0; var $$ACTION_0;
import ensureServerEntryExports from "private-next-rsc-action-validate"; import { ensureServerEntryExports } from "private-next-rsc-action-validate";
ensureServerEntryExports([ ensureServerEntryExports([
action, action,
$$ACTION_0 $$ACTION_0
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
export async function myAction(a, b, c) { export async function myAction(a, b, c) {
console.log('a'); console.log('a');
} }
import ensureServerEntryExports from "private-next-rsc-action-validate"; import { ensureServerEntryExports } from "private-next-rsc-action-validate";
ensureServerEntryExports([ ensureServerEntryExports([
myAction myAction
]); ]);
......
...@@ -6,7 +6,7 @@ function d() {} ...@@ -6,7 +6,7 @@ function d() {}
function Foo() { function Foo() {
async function e() {} async function e() {}
} }
import ensureServerEntryExports from "private-next-rsc-action-validate"; import { ensureServerEntryExports } from "private-next-rsc-action-validate";
ensureServerEntryExports([ ensureServerEntryExports([
a, a,
b, b,
......
...@@ -6,7 +6,7 @@ async function bar() {} ...@@ -6,7 +6,7 @@ async function bar() {}
export { bar as baz }; export { bar as baz };
async function qux() {} async function qux() {}
export { qux as default }; export { qux as default };
import ensureServerEntryExports from "private-next-rsc-action-validate"; import { ensureServerEntryExports } from "private-next-rsc-action-validate";
ensureServerEntryExports([ ensureServerEntryExports([
foo, foo,
bar, bar,
......
...@@ -5,12 +5,12 @@ import { callServer } from 'next/dist/client/app-call-server' ...@@ -5,12 +5,12 @@ import { callServer } from 'next/dist/client/app-call-server'
// A noop wrapper to let the Flight client create the server reference. // A noop wrapper to let the Flight client create the server reference.
// See also: https://github.com/facebook/react/pull/26632 // See also: https://github.com/facebook/react/pull/26632
export default function (id: string) { export function createServerReference(id: string) {
// Since we're using the Edge build of Flight client for SSR [1], here we need to // Since we're using the Edge build of Flight client for SSR [1], here we need to
// also use the same Edge build to create the reference. For the client bundle, // also use the same Edge build to create the reference. For the client bundle,
// we use the default and let Webpack to resolve it to the correct version. // we use the default and let Webpack to resolve it to the correct version.
// 1: https://github.com/vercel/next.js/blob/16eb80b0b0be13f04a6407943664b5efd8f3d7d0/packages/next/src/server/app-render/use-flight-response.tsx#L24-L26 // 1: https://github.com/vercel/next.js/blob/16eb80b0b0be13f04a6407943664b5efd8f3d7d0/packages/next/src/server/app-render/use-flight-response.tsx#L24-L26
const { createServerReference } = ( const { createServerReference: createServerReferenceImpl } = (
typeof window === 'undefined' typeof window === 'undefined'
? // eslint-disable-next-line import/no-extraneous-dependencies ? // eslint-disable-next-line import/no-extraneous-dependencies
require('react-server-dom-webpack/client.edge') require('react-server-dom-webpack/client.edge')
...@@ -18,5 +18,5 @@ export default function (id: string) { ...@@ -18,5 +18,5 @@ export default function (id: string) {
require('react-server-dom-webpack/client') require('react-server-dom-webpack/client')
) as typeof import('react-server-dom-webpack/client') ) as typeof import('react-server-dom-webpack/client')
return createServerReference(id, callServer) return createServerReferenceImpl(id, callServer)
} }
export default function ensureServerEntryExports(actions: any[]) { // This function ensures that all the exported values are valid server actions,
// during the runtime. By definition all actions are required to be async
// functions, but here we can only check that they are functions.
export function ensureServerEntryExports(actions: any[]) {
for (let i = 0; i < actions.length; i++) { for (let i = 0; i < actions.length; i++) {
const action = actions[i] const action = actions[i]
if (typeof action !== 'function') { if (typeof action !== 'function') {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment