use re-export

Author: shuding

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

@@ -20,24 +20,17 @@ function nextFlightActionEntryLoader(this: any) {
     .flat()
 
   return `
-const actions = {
 ${individualActions
-  .map(([id, path, name]) => {
-    return `'${id}': () => import(/* webpackMode: "eager" */ ${JSON.stringify(
-      path
-    )}).then(mod => mod[${JSON.stringify(name)}]),`
+  .map(([_, path]) => {
+    return `import(/* webpackMode: "eager" */ ${JSON.stringify(path)});`
   })
   .join('\n')}
-}
 
-// Using CJS to avoid this to be tree-shaken away due to unused exports.
-module.exports = {
 ${individualActions
-  .map(([id]) => {
-    return `  '${id}': actions['${id}'](),`
+  .map(([id, path, name]) => {
+    return `export { ${name} as "${id}" } from ${JSON.stringify(path)}`
   })
   .join('\n')}
-}
 `
 }
 

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

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