simplify action entrypoint

Author: shuding

packages/next/src/build/webpack/loaders/next-flight-action-entry-loader.ts

@@ -30,16 +30,11 @@ ${individualActions
   .join('\n')}
 }
 
-async function endpoint(id, ...args) {
-  const action = await actions[id]()
-  return action.apply(null, args)
-}
-
 // Using CJS to avoid this to be tree-shaken away due to unused exports.
 module.exports = {
 ${individualActions
   .map(([id]) => {
-    return `  '${id}': endpoint.bind(null, '${id}'),`
+    return `  '${id}': actions['${id}'](),`
   })
   .join('\n')}
 }

packages/next/src/server/app-render/action-handler.ts

@@ -870,7 +870,7 @@ export async function handleAction({
         }
       }
 
-      const actionHandler = (
+      const actionHandler = await (
         await ComponentMod.__next_app__.require(actionModId)
       )[
         // `actionId` must exist if we got here, as otherwise we would have thrown an error above

test/e2e/app-dir/actions/app-action.test.ts

@@ -828,6 +828,21 @@ describe('app-dir action handling', () => {
     ).toBe(true)
   })
 
+  it('should keep action instances identical', async () => {
+    const logs: string[] = []
+    next.on('stdout', (log) => {
+      logs.push(log)
+    })
+
+    const browser = await next.browser('/identity')
+
+    await browser.elementByCss('button').click()
+
+    await retry(() => {
+      expect(logs.join('')).toContain('result: true')
+    })
+  })
+
   it.each(['node', 'edge'])(
     'should forward action request to a worker that contains the action handler (%s)',
     async (runtime) => {

test/e2e/app-dir/actions/app/identity/client.js

@@ -0,0 +1,13 @@
+'use client'
+
+export function Client({ foo, b }) {
+  return (
+    <button
+      onClick={() => {
+        foo(b)
+      }}
+    >
+      Trigger
+    </button>
+  )
+}

test/e2e/app-dir/actions/app/identity/page.js

@@ -0,0 +1,14 @@
+import { Client } from './client'
+
+export default async function Page() {
+  async function b() {
+    'use server'
+  }
+
+  async function foo(a) {
+    'use server'
+    console.log('result:', a === b)
+  }
+
+  return <Client foo={foo} b={b} />
+}