@reckona/mreact-router 0.0.72 → 0.0.74

package/src/actions.ts

@@ -1,10 +1,9 @@
-import { createHmac, randomBytes, randomUUID, timingSafeEqual } from "node:crypto";
+import { createHash, createHmac, randomBytes, randomUUID, timingSafeEqual } from "node:crypto";
 import { access, readdir, readFile } from "node:fs/promises";
 import { dirname, join, relative, sep } from "node:path";
 import { fileURLToPath } from "node:url";
 import {
-  collectFormActionReferenceNames,
-  collectFormActionReferences,
+  collectFormActionExpressionReferences,
   hasModuleDirective,
 } from "@reckona/mreact-compiler";
 import {
@@ -31,6 +30,10 @@ import {
   readExistingFormCsrfToken,
   validateFormCsrf,
 } from "./csrf.js";
+import {
+  collectRuntimeInferredServerActions,
+  type ServerActionInferenceDiagnostic,
+} from "./server-action-inference.js";
 
 function isProductionEnvironment(): boolean {
   return process.env.NODE_ENV === "production";
@@ -137,6 +140,7 @@ export interface PreparedRouteActions {
   actionNonce?: string;
   code: string;
   csrfToken?: string;
+  diagnostics?: ServerActionInferenceDiagnostic[] | undefined;
   // True when the cookie should be (re)set on the response. False means
   // the incoming request already carried a valid CSRF cookie that the
   // render is reusing -- skipping Set-Cookie avoids cookie thrash across
@@ -151,11 +155,24 @@ interface ActionReference {
   moduleId: string;
 }
 
+export interface PreparedFormActionReference {
+  end: number;
+  expression: string;
+  expressionEnd: number;
+  expressionStart: number;
+  exportName: string;
+  inferred: boolean;
+  moduleId: string;
+  sourceHash: string;
+  start: number;
+}
+
 const inferredServerActionReferences = new Map<string, Map<string, Map<string, ActionReference>>>();
 
 export async function prepareRouteServerActions(options: {
   appDir: string;
   code: string;
+  formActionReferences?: readonly PreparedFormActionReference[] | undefined;
   pageFile: string;
   request?: Request | undefined;
 }): Promise<PreparedRouteActions> {
@@ -164,11 +181,20 @@ export async function prepareRouteServerActions(options: {
     return { code: options.code, hasFormActions: false };
   }
 
-  const references = await collectImportedServerActions(options);
+  const inference =
+    options.formActionReferences === undefined
+      ? await collectImportedServerActions(options)
+      : {
+          diagnostics: [],
+          references: formActionReferenceMap(options.code, options.formActionReferences),
+        };
+  const { diagnostics, references } = inference;
 
   if (references.size === 0) {
     replaceInferredServerActionReferences(options.appDir, options.pageFile, new Map());
-    return { code: options.code, hasFormActions: false };
+    return diagnostics.length === 0
+      ? { code: options.code, hasFormActions: false }
+      : { code: options.code, diagnostics, hasFormActions: false };
   }
 
   // Reuse the existing CSRF token when the browser already sent one.
@@ -189,7 +215,9 @@ export async function prepareRouteServerActions(options: {
 
   if (lowered === options.code) {
     replaceInferredServerActionReferences(options.appDir, options.pageFile, new Map());
-    return { code: options.code, hasFormActions: false };
+    return diagnostics.length === 0
+      ? { code: options.code, hasFormActions: false }
+      : { code: options.code, diagnostics, hasFormActions: false };
   }
 
   replaceInferredServerActionReferences(options.appDir, options.pageFile, references);
@@ -199,12 +227,33 @@ export async function prepareRouteServerActions(options: {
     code: lowered,
     csrfToken,
     csrfTokenIsNew,
+    diagnostics,
     hasFormActions: true,
   };
 }
 
+function formActionReferenceMap(
+  code: string,
+  references: readonly PreparedFormActionReference[],
+): Map<string, ActionReference> {
+  const sourceHash = formActionSourceHash(code);
+
+  return new Map(
+    references
+      .filter((reference) => reference.sourceHash === sourceHash)
+      .map((reference) => [
+        formActionOccurrenceKey(reference),
+        {
+          exportName: reference.exportName,
+          inferred: reference.inferred,
+          moduleId: reference.moduleId,
+        },
+      ]),
+  );
+}
+
 function hasFormActionCandidate(code: string, filename: string): boolean {
-  return collectFormActionReferenceNames({ code, filename }).length > 0;
+  return collectFormActionExpressionReferences({ code, filename }).length > 0;
 }
 
 export async function dispatchServerActionRequest(options: {
@@ -571,10 +620,10 @@ function lowerFormActions(options: {
   references: Map<string, ActionReference>;
 }): string {
   let code = options.code;
-  const formReferences = collectFormActionReferences({ code: options.code });
+  const formReferences = collectFormActionExpressionReferences({ code: options.code });
 
   for (const formReference of [...formReferences].reverse()) {
-    const reference = options.references.get(formReference.name);
+    const reference = options.references.get(formActionOccurrenceKey(formReference));
 
     if (reference === undefined) {
       continue;
@@ -586,7 +635,7 @@ function lowerFormActions(options: {
       csrfToken: options.csrfToken,
       opening,
       reference,
-      referenceName: formReference.name,
+      referenceName: formReference.expression,
     });
 
     if (loweredOpening === opening) {
@@ -599,6 +648,26 @@ function lowerFormActions(options: {
   return code;
 }
 
+function formActionOccurrenceKey(reference: {
+  end: number;
+  expression: string;
+  expressionEnd: number;
+  expressionStart: number;
+  start: number;
+}): string {
+  return [
+    reference.start,
+    reference.end,
+    reference.expressionStart,
+    reference.expressionEnd,
+    reference.expression,
+  ].join(":");
+}
+
+function formActionSourceHash(code: string): string {
+  return createHash("sha256").update(code).digest("base64url");
+}
+
 function lowerFormActionOpening(options: {
   actionNonce: string;
   csrfToken: string;
@@ -653,58 +722,19 @@ async function collectImportedServerActions(options: {
   appDir: string;
   code: string;
   pageFile: string;
-}): Promise<Map<string, ActionReference>> {
-  const references = new Map<string, ActionReference>();
-  const actionNames = new Set(
-    collectFormActionReferenceNames({ code: options.code, filename: options.pageFile }),
-  );
-
-  if (actionNames.size === 0) {
-    return references;
-  }
-
-  const imports = options.code.matchAll(
-    /^import\s+\{\s*(?<specifiers>[^}]+)\s*\}\s+from\s+["'](?<source>[^"']+)["'];?/gm,
-  );
-
-  for (const match of imports) {
-    const source = match.groups?.source;
-    const specifiers = match.groups?.specifiers;
-
-    if (source === undefined || specifiers === undefined || !source.startsWith(".")) {
-      continue;
-    }
-
-    const file = await resolveSourceFile(dirname(options.pageFile), source);
-
-    if (file === undefined) {
-      continue;
-    }
-
-    const moduleId = moduleIdForFile(options.appDir, file);
-    const inferred = !(await isUseServerFile(file));
-
-    for (const specifier of specifiers.split(",")) {
-      const [exportName, localName] = specifier.trim().split(/\s+as\s+/);
-      const imported = exportName?.trim();
-      const local = localName?.trim() ?? imported;
-
-      if (
-        imported !== undefined &&
-        imported.length > 0 &&
-        local !== undefined &&
-        actionNames.has(local)
-      ) {
-        references.set(local, {
-          exportName: imported,
-          inferred,
-          moduleId,
-        });
-      }
-    }
-  }
-
-  return references;
+}): Promise<{
+  diagnostics: ServerActionInferenceDiagnostic[];
+  references: Map<string, ActionReference>;
+}> {
+  return await collectRuntimeInferredServerActions({
+    appDir: options.appDir,
+    code: options.code,
+    fileSystem: {
+      isUseServerFile,
+      resolveSourceFile,
+    },
+    pageFile: options.pageFile,
+  });
 }
 
 function isInferredServerActionReference(options: {

package/src/build.ts

@@ -4,7 +4,6 @@ import { copyFile, cp, mkdir, readdir, readFile, rm, stat, writeFile } from "nod
 import { builtinModules } from "node:module";
 import { dirname, join, relative, sep } from "node:path";
 import {
-  collectFormActionReferenceNames,
   collectStaticImportReferences,
   collectTopLevelValueExportNames,
   formatDiagnostic,
@@ -56,6 +55,7 @@ import {
   routeClosureMayUseAwaitBoundary,
   stripRouteBuildExports,
   stripRouteClientOnlyExports,
+  stripRouteClientSource,
   stripRouteLoaderOnlyExports,
   stripRouteMetadataOnlyExports,
   stripRouteRequestOnlyExports,
@@ -67,6 +67,7 @@ import {
 import { collectRouteCssFiles } from "./route-styles.js";
 import { existingRouteShellCandidates } from "./route-shells.js";
 import { sourceModuleCandidates } from "./source-modules.js";
+import { collectBuildInferredServerActions } from "./server-action-inference.js";
 import { workspacePackageFile } from "./workspace-packages.js";
 import type { PluginOption, UserConfig } from "vite";
 
@@ -112,6 +113,7 @@ export interface BuiltServerManifest {
   prerenderedRoutes?: Record<string, BuiltPrerenderedRoute>;
   publicAssetBaseUrl?: string;
   routesDir?: string;
+  routeServerActionReferences?: Record<string, BuiltServerActionExpressionReference[]>;
   serverActionManifest?: BuiltServerActionReference[];
   serverModuleFiles?: Record<string, string>;
   serverModuleRenderFiles?: Record<string, string>;
@@ -126,6 +128,18 @@ export interface BuiltServerActionReference {
   moduleId: string;
 }
 
+export interface BuiltServerActionExpressionReference {
+  end: number;
+  exportName: string;
+  expression: string;
+  expressionEnd: number;
+  expressionStart: number;
+  inferred: boolean;
+  moduleId: string;
+  sourceHash: string;
+  start: number;
+}
+
 export interface BuiltServerModuleArtifact {
   analysis?: BuiltRouteSourceAnalysisSummary;
   loader?: BuiltServerModuleOutput;
@@ -200,7 +214,7 @@ export async function buildApp(options: BuildAppOptions): Promise<BuildAppResult
     ...new Set([...(await collectPublicAssetPaths(project.publicDir)), ...appConventionPublicAssets]),
   ].sort();
 
-  const serverActionManifest = collectBuildServerActionManifest({
+  const serverActionManifest = await collectBuildServerActionManifest({
     files,
     projectRoot: project.projectRoot,
     routes,
@@ -274,6 +288,11 @@ export async function buildApp(options: BuildAppOptions): Promise<BuildAppResult
     });
   }
 
+  const routeServerActionReferences = Object.fromEntries(
+    [...serverActionManifest.routeReferences.entries()].sort(([left], [right]) =>
+      left.localeCompare(right),
+    ),
+  );
   const serverManifest = {
     allowedSourceDirs: project.allowedSourceDirs.map((directory) =>
       relative(project.projectRoot, directory),
@@ -287,7 +306,12 @@ export async function buildApp(options: BuildAppOptions): Promise<BuildAppResult
     ...(project.publicAssetBaseUrl === undefined
       ? {}
       : { publicAssetBaseUrl: project.publicAssetBaseUrl }),
-    ...(serverActionManifest.length === 0 ? {} : { serverActionManifest }),
+    ...(Object.keys(routeServerActionReferences).length === 0
+      ? {}
+      : { routeServerActionReferences }),
+    ...(serverActionManifest.allowedActions.length === 0
+      ? {}
+      : { serverActionManifest: serverActionManifest.allowedActions }),
     ...(Object.keys(serverModuleArtifacts.files).length === 0
       ? {}
       : { serverModuleFiles: serverModuleArtifacts.files }),
@@ -588,13 +612,17 @@ function runtimePackageNameForSpecifier(specifier: string): string {
   return scope !== undefined && name !== undefined ? `${scope}/${name}` : specifier;
 }
 
-function collectBuildServerActionManifest(options: {
+async function collectBuildServerActionManifest(options: {
   files: Record<string, string>;
   projectRoot: string;
   routes: readonly AppRoute[];
   routesDir: string;
-}): BuiltServerActionReference[] {
+}): Promise<{
+  allowedActions: BuiltServerActionReference[];
+  routeReferences: Map<string, BuiltServerActionExpressionReference[]>;
+}> {
   const entries = new Map<string, BuiltServerActionReference>();
+  const routeReferences = new Map<string, BuiltServerActionExpressionReference[]>();
   const relativeRoutesDir = relative(options.projectRoot, options.routesDir);
   const routeSourceFiles = new Set(
     options.routes
@@ -616,26 +644,41 @@ function collectBuildServerActionManifest(options: {
     }
 
     if (routeSourceFiles.has(file)) {
-      for (const reference of collectBuildInferredServerActionReferences({
+      const inference = await collectBuildInferredServerActionReferences({
         file,
         files: options.files,
         relativeRoutesDir,
         source: code,
-      })) {
+      });
+
+      for (const diagnostic of inference.diagnostics) {
+        console.warn(formatServerActionInferenceDiagnostic(diagnostic));
+      }
+
+      routeReferences.set(file, inference.references);
+
+      for (const reference of inference.references) {
         const key = `${reference.moduleId}#${reference.exportName}`;
 
         if (!entries.has(key)) {
-          entries.set(key, reference);
+          entries.set(key, {
+            exportName: reference.exportName,
+            inferred: reference.inferred,
+            moduleId: reference.moduleId,
+          });
         }
       }
     }
   }
 
-  return [...entries.values()].sort((left, right) =>
-    left.moduleId === right.moduleId
-      ? left.exportName.localeCompare(right.exportName)
-      : left.moduleId.localeCompare(right.moduleId),
-  );
+  return {
+    allowedActions: [...entries.values()].sort((left, right) =>
+      left.moduleId === right.moduleId
+        ? left.exportName.localeCompare(right.exportName)
+        : left.moduleId.localeCompare(right.moduleId),
+    ),
+    routeReferences,
+  };
 }
 
 function collectBuildInferredServerActionReferences(options: {
@@ -643,54 +686,25 @@ function collectBuildInferredServerActionReferences(options: {
   files: Record<string, string>;
   relativeRoutesDir: string;
   source: string;
-}): BuiltServerActionReference[] {
-  const actionNames = collectFormActionNames(options.source);
-
-  if (actionNames.size === 0) {
-    return [];
-  }
-
-  const references: BuiltServerActionReference[] = [];
-
-  for (const match of options.source.matchAll(
-    /^import\s+\{\s*(?<specifiers>[^}]+)\s*\}\s+from\s+["'](?<source>[^"']+)["'];?/gm,
-  )) {
-    const source = match.groups?.source;
-    const specifiers = match.groups?.specifiers;
-
-    if (source === undefined || specifiers === undefined || !source.startsWith(".")) {
-      continue;
-    }
-
-    const localFile = resolveBuildLocalSourceImport(options.files, options.file, source);
-
-    if (localFile === undefined) {
-      continue;
-    }
-
-    const moduleId = moduleIdForBuildFile(localFile, options.relativeRoutesDir);
-
-    for (const specifier of specifiers.split(",")) {
-      const [exportName, localName] = specifier.trim().split(/\s+as\s+/);
-      const imported = exportName?.trim();
-      const local = localName?.trim() ?? imported;
-
-      if (
-        imported !== undefined &&
-        imported.length > 0 &&
-        local !== undefined &&
-        actionNames.has(local)
-      ) {
-        references.push({ moduleId, exportName: imported, inferred: true });
-      }
-    }
-  }
-
-  return references;
+}): Promise<{
+  diagnostics: { code: string; message: string }[];
+  references: BuiltServerActionExpressionReference[];
+}> {
+  return collectBuildInferredServerActions({
+    file: options.file,
+    files: options.files,
+    relativeRoutesDir: options.relativeRoutesDir,
+    resolveSourceImport: (importer, source) =>
+      resolveBuildLocalSourceImport(options.files, importer, source),
+    source: options.source,
+  });
 }
 
-function collectFormActionNames(code: string): Set<string> {
-  return new Set(collectFormActionReferenceNames({ code }));
+function formatServerActionInferenceDiagnostic(diagnostic: {
+  code: string;
+  message: string;
+}): string {
+  return `${diagnostic.code}: ${diagnostic.message}`;
 }
 
 function isSourceModuleFile(file: string): boolean {
@@ -1038,7 +1052,10 @@ async function buildServerModuleArtifacts(options: {
     const clientInference = await inferClientRouteModule({
       ...(route === undefined ? {} : { appDir: options.project.routesDir }),
       cache: options.clientRouteInferenceCache,
-      code: stripRouteClientOnlyExports(source),
+      code:
+        route === undefined
+          ? stripRouteClientOnlyExports(source)
+          : stripRouteClientSource({ code: source, filename: route.file }),
       filename: join(options.projectRoot, file),
       ...(route === undefined ? {} : { routePath: route.path }),
       vitePlugins: options.vitePlugins,
@@ -2467,7 +2484,7 @@ async function writeClientRouteBundles(options: {
         vitePlugins: options.vitePlugins,
       });
       const source = await readFile(route.file, "utf8");
-      const clientSource = stripRouteClientOnlyExports(source);
+      const clientSource = stripRouteClientSource({ code: source, filename: route.file });
       const navigation = detectNavigationRuntimeHint(source);
       const references = await collectClientRouteReferences({
         appDir: options.appDir,

package/src/client.ts

@@ -29,7 +29,7 @@ import {
 } from "./bundle-pipeline.js";
 import type { AppRoute } from "./routes.js";
 import { existingRouteShellCandidates } from "./route-shells.js";
-import { stripRouteClientOnlyExports } from "./route-source.js";
+import { stripRouteClientSource } from "./route-source.js";
 import { hasJsxSyntax } from "./source-jsx.js";
 import { sourceModuleCandidates } from "./source-modules.js";
 import { escapeHtmlQuotedAttribute as escapeHtmlAttribute } from "@reckona/mreact-shared/html-escape";
@@ -147,7 +147,7 @@ export async function routeToClientManifestEntry(
 
   const code = await readFile(route.file, "utf8");
   const inference = await inferClientRouteModule({
-    code: stripRouteClientOnlyExports(code),
+    code: stripRouteClientSource({ code, filename: route.file }),
     filename: route.file,
     routePath: route.path,
   });
@@ -311,9 +311,10 @@ export async function collectClientRouteReferences(options: {
     });
 
     for (const referenceFile of inference.clientReferenceSourceFiles) {
-      const code = stripRouteClientOnlyExports(
-        await readClientRouteSource({ cache, filename: referenceFile, sourceTransform }),
-      );
+      const code = stripRouteClientSource({
+        code: await readClientRouteSource({ cache, filename: referenceFile, sourceTransform }),
+        filename: referenceFile,
+      });
       await addSource({ code, filename: referenceFile });
     }
   };
@@ -327,9 +328,10 @@ export async function collectClientRouteReferences(options: {
 
   if (options.appDir !== undefined) {
     for (const shell of await clientShellFilesForPage(options.appDir, options.filename)) {
-      const code = stripRouteClientOnlyExports(
-        await readClientRouteSource({ cache, filename: shell, sourceTransform }),
-      );
+      const code = stripRouteClientSource({
+        code: await readClientRouteSource({ cache, filename: shell, sourceTransform }),
+        filename: shell,
+      });
       const moduleContext = await compilerModuleContextForSource({
         cache,
         code,
@@ -419,13 +421,14 @@ async function inferClientRouteShellModules(options: {
 }): Promise<ClientRouteInferenceResult[]> {
   return Promise.all(
     (await clientShellFilesForPage(options.appDir, options.filename)).map(async (shell) => {
-      const code = stripRouteClientOnlyExports(
-        await readClientRouteSource({
+      const code = stripRouteClientSource({
+        code: await readClientRouteSource({
           cache: options.cache,
           filename: shell,
           sourceTransform: options.sourceTransform,
         }),
-      );
+        filename: shell,
+      });
       return await inferClientRouteModuleSource({
         cache: options.cache,
         code,

package/src/index.ts

@@ -157,6 +157,7 @@ export {
 export type {
   AppRouterAllowedServerAction,
   AppRouterServerActionOptions,
+  PreparedFormActionReference,
 } from "./actions.js";
 /**
  * @deprecated Import session helpers and types from `@reckona/mreact-auth` instead.

package/src/render.ts

@@ -45,6 +45,7 @@ import type { AppRoute, RouteMatcher } from "./routes.js";
 import { appFileConventionContentType, type AppFileConvention } from "./file-conventions.js";
 import {
   type AppRouterServerActionOptions,
+  type PreparedFormActionReference,
   dispatchServerActionRequest,
   prepareRouteServerActions,
 } from "./actions.js";
@@ -148,6 +149,10 @@ export interface RenderAppRequestOptions {
   serverModuleCacheVersion?: string | undefined;
   serverSourceFiles?: ReadonlyMap<string, string> | undefined;
   serverActions?: AppRouterServerActionOptions | undefined;
+  serverActionReferencesByFile?: ReadonlyMap<
+    string,
+    readonly PreparedFormActionReference[]
+  > | undefined;
   skipMiddleware?: boolean | undefined;
   preload?: AppRouterRenderPreload | undefined;
   vitePlugins?: readonly PluginOption[] | undefined;
@@ -904,9 +909,13 @@ async function renderAppRequestInternal(options: RenderAppRequestOptions): Promi
     const preparedActions = await prepareRouteServerActions({
       appDir: options.appDir,
       code: originalCode,
+      formActionReferences: options.serverActionReferencesByFile?.get(matched.route.file),
       pageFile: matched.route.file,
       request: options.request,
     });
+    for (const diagnostic of preparedActions.diagnostics ?? []) {
+      console.warn(`${diagnostic.code}: ${diagnostic.message}`);
+    }
     finishRenderTimingPhase(timing, phaseStartedAt, "serverActionsMs");
     const code = preparedActions.code;
     phaseStartedAt = renderTimingPhaseStartedAt(timing);

package/src/route-source.ts

@@ -1,5 +1,6 @@
 import { dirname, isAbsolute, join } from "node:path";
 import {
+  collectFormActionExpressionReferences,
   collectTopLevelValueExportNames,
   collectJsxComponentRootNames,
   collectStaticImportReferences,
@@ -49,6 +50,30 @@ export function stripRouteClientOnlyExports(code: string): string {
   }));
 }
 
+export function stripRouteClientSource(input: {
+  code: string;
+  filename?: string | undefined;
+}): string {
+  return stripRouteClientFormActionExpressions({
+    code: stripRouteClientOnlyExports(input.code),
+    filename: input.filename,
+  });
+}
+
+export function stripRouteClientFormActionExpressions(input: {
+  code: string;
+  filename?: string | undefined;
+}): string {
+  const references = collectFormActionExpressionReferences(input);
+  let code = input.code;
+
+  for (const reference of [...references].reverse()) {
+    code = `${code.slice(0, reference.expressionStart)}undefined${code.slice(reference.expressionEnd)}`;
+  }
+
+  return code;
+}
+
 export function stripRouteBuildExports(code: string): string {
   return stripRouteClientOnlyExports(code);
 }

package/src/serve.ts

@@ -50,6 +50,20 @@ interface BuiltRuntime {
   prerenderedRoutes: Map<string, BuiltPrerenderedRoute>;
   routeMatcher: RouteMatcher;
   routes: readonly AppRoute[];
+  serverActionReferencesByFile: ReadonlyMap<
+    string,
+    readonly {
+      end: number;
+      expression: string;
+      expressionEnd: number;
+      expressionStart: number;
+      moduleId: string;
+      exportName: string;
+      inferred: boolean;
+      sourceHash: string;
+      start: number;
+    }[]
+  >;
   serverActionManifest?: readonly { moduleId: string; exportName: string; inferred?: boolean }[] | undefined;
   serverModuleArtifactLoads: Map<string, Promise<void>>;
   serverModuleFiles: ReadonlyMap<string, string>;
@@ -701,6 +715,12 @@ async function materializeBuiltRuntime(options: {
   const serverSourceFiles = new Map(
     Object.entries(serverManifest.files).map(([file, source]) => [join(appDir, file), source]),
   );
+  const serverActionReferencesByFile = new Map(
+    Object.entries(serverManifest.routeServerActionReferences ?? {}).map(([file, references]) => [
+      join(appDir, file),
+      references,
+    ]),
+  );
   const routeMatcher = createRouteMatcher(routes);
   const clientScripts = new Map(
     clientManifest.routes.flatMap((route) =>
@@ -752,6 +772,7 @@ async function materializeBuiltRuntime(options: {
     prerenderedRoutes,
     routeMatcher,
     routes,
+    serverActionReferencesByFile,
     ...(serverManifest.serverActionManifest === undefined
       ? {}
       : { serverActionManifest: serverManifest.serverActionManifest }),
@@ -1070,6 +1091,7 @@ function builtRenderAppRequestOptions(
     serverModules: options.runtime.serverModules,
     serverModuleCacheVersion: options.runtime.serverModuleCacheVersion,
     serverSourceFiles: options.runtime.serverSourceFiles,
+    serverActionReferencesByFile: options.runtime.serverActionReferencesByFile,
     serverActions: mergeBuiltServerActionOptions(
       options.serverActions,
       options.runtime.serverActionManifest,