@reckona/mreact-router 0.0.164 → 0.0.166

package/src/actions.ts

@@ -43,6 +43,8 @@ const formFieldModuleId = "__mreact_module_id";
 const formFieldExportName = "__mreact_export_name";
 const formFieldNonce = "__mreact_action_nonce";
 const formFieldActionToken = "__mreact_action_token";
+const csrfTokenPlaceholder = "__mreact_action_csrf_placeholder__";
+const actionNoncePlaceholder = "__mreact_action_nonce_placeholder__";
 const actionTokenSecret = process.env.MREACT_SERVER_ACTION_SECRET ?? defaultActionTokenSecret();
 // Bounded default replay store for form-action nonces. The previous
 // implementation was an unbounded Set that grew with every successful
@@ -175,6 +177,7 @@ export interface PreparedRouteActions {
   code: string;
   csrfToken?: string;
   diagnostics?: ServerActionInferenceDiagnostic[] | undefined;
+  htmlReplacements?: readonly (readonly [string, string])[] | 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
@@ -185,6 +188,7 @@ export interface PreparedRouteActions {
 
 interface ActionReference {
   exportName: string;
+  expression?: string | undefined;
   inferred: boolean;
   moduleId: string;
 }
@@ -210,6 +214,7 @@ export async function prepareRouteServerActions(options: {
   appDir: string;
   code: string;
   formActionReferences?: readonly PreparedFormActionReference[] | undefined;
+  placeholders?: boolean | undefined;
   pageFile: string;
   request?: Request | undefined;
 }): Promise<PreparedRouteActions> {
@@ -248,10 +253,13 @@ export async function prepareRouteServerActions(options: {
   const csrfToken = existingToken ?? randomUUID();
   const csrfTokenIsNew = existingToken === undefined;
   const actionNonce = randomUUID();
+  const usePlaceholders =
+    options.placeholders === true && canUseStableFormActionPlaceholders(references);
   const lowered = lowerFormActions({
     actionNonce,
     code: options.code,
     csrfToken,
+    placeholders: usePlaceholders,
     references,
   });
 
@@ -271,9 +279,45 @@ export async function prepareRouteServerActions(options: {
     csrfTokenIsNew,
     diagnostics,
     hasFormActions: true,
+    ...(usePlaceholders
+      ? { htmlReplacements: formActionHtmlReplacements({ actionNonce, csrfToken, references }) }
+      : {}),
   };
 }
 
+export function prepareRouteServerActionPlaceholders(options: {
+  code: string;
+  formActionReferences: readonly PreparedFormActionReference[];
+}): string {
+  const references = formActionReferenceMap(options.code, options.formActionReferences);
+
+  if (references.size === 0) {
+    return options.code;
+  }
+
+  if (!canUseStableFormActionPlaceholders(references)) {
+    return options.code;
+  }
+
+  return lowerFormActions({
+    actionNonce: actionNoncePlaceholder,
+    code: options.code,
+    csrfToken: csrfTokenPlaceholder,
+    placeholders: true,
+    references,
+  });
+}
+
+function canUseStableFormActionPlaceholders(
+  references: ReadonlyMap<string, ActionReference>,
+): boolean {
+  return [...references.values()].every(
+    (reference) =>
+      reference.expression === reference.exportName &&
+      /^[A-Za-z_$][\w$]*$/u.test(reference.expression),
+  );
+}
+
 function formActionReferenceMap(
   code: string,
   references: readonly PreparedFormActionReference[],
@@ -287,6 +331,7 @@ function formActionReferenceMap(
         formActionOccurrenceKey(reference),
         {
           exportName: reference.exportName,
+          expression: reference.expression,
           inferred: reference.inferred,
           moduleId: reference.moduleId,
         },
@@ -820,6 +865,7 @@ function lowerFormActions(options: {
   actionNonce: string;
   code: string;
   csrfToken: string;
+  placeholders?: boolean | undefined;
   references: Map<string, ActionReference>;
 }): string {
   let code = options.code;
@@ -837,6 +883,7 @@ function lowerFormActions(options: {
       actionNonce: options.actionNonce,
       csrfToken: options.csrfToken,
       opening,
+      placeholders: options.placeholders === true,
       reference,
       referenceName: formReference.expression,
     });
@@ -851,6 +898,39 @@ function lowerFormActions(options: {
   return code;
 }
 
+function formActionHtmlReplacements(options: {
+  actionNonce: string;
+  csrfToken: string;
+  references: ReadonlyMap<string, ActionReference>;
+}): readonly (readonly [string, string])[] {
+  const replacements: Array<readonly [string, string]> = [
+    [csrfTokenPlaceholder, options.csrfToken],
+    [actionNoncePlaceholder, options.actionNonce],
+  ];
+  const seenTokens = new Set<string>();
+
+  for (const reference of options.references.values()) {
+    const placeholder = actionTokenPlaceholder(reference);
+
+    if (seenTokens.has(placeholder)) {
+      continue;
+    }
+
+    seenTokens.add(placeholder);
+    replacements.push([
+      placeholder,
+      formActionToken({
+        csrfToken: options.csrfToken,
+        exportName: reference.exportName,
+        moduleId: reference.moduleId,
+        nonce: options.actionNonce,
+      }),
+    ]);
+  }
+
+  return replacements;
+}
+
 function formActionOccurrenceKey(reference: {
   end: number;
   expression: string;
@@ -875,6 +955,7 @@ function lowerFormActionOpening(options: {
   actionNonce: string;
   csrfToken: string;
   opening: string;
+  placeholders: boolean;
   reference: ActionReference;
   referenceName: string;
 }): string {
@@ -897,22 +978,39 @@ function lowerFormActionOpening(options: {
   const hidden = [
     hiddenInput(formFieldModuleId, options.reference.moduleId),
     hiddenInput(formFieldExportName, options.reference.exportName),
-    hiddenInput(formCsrfFieldName, options.csrfToken),
-    hiddenInput(formFieldNonce, options.actionNonce),
+    hiddenInput(
+      formCsrfFieldName,
+      options.placeholders ? csrfTokenPlaceholder : options.csrfToken,
+    ),
+    hiddenInput(
+      formFieldNonce,
+      options.placeholders ? actionNoncePlaceholder : options.actionNonce,
+    ),
     hiddenInput(
       formFieldActionToken,
-      formActionToken({
-        csrfToken: options.csrfToken,
-        exportName: options.reference.exportName,
-        moduleId: options.reference.moduleId,
-        nonce: options.actionNonce,
-      }),
+      options.placeholders
+        ? actionTokenPlaceholder(options.reference)
+        : formActionToken({
+            csrfToken: options.csrfToken,
+            exportName: options.reference.exportName,
+            moduleId: options.reference.moduleId,
+            nonce: options.actionNonce,
+          }),
     ),
   ].join("");
 
   return `<form${attrs} method="post" action="/_mreact/actions">${hidden}`;
 }
 
+function actionTokenPlaceholder(reference: ActionReference): string {
+  return `__mreact_action_token_${createHash("sha256")
+    .update(reference.moduleId)
+    .update("\0")
+    .update(reference.exportName)
+    .digest("hex")
+    .slice(0, 16)}__`;
+}
+
 function escapeRegExp(value: string): string {
   return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }

package/src/build.ts

@@ -92,6 +92,7 @@ import { collectRouteCssFilesFromSources, collectSpecialBoundaryFiles } from "./
 import { existingRouteShellCandidates } from "./route-shells.js";
 import { sourceModuleCandidates } from "./source-modules.js";
 import { collectBuildInferredServerActions } from "./server-action-inference.js";
+import { prepareRouteServerActionPlaceholders } from "./actions.js";
 import { viteDefineCacheKey, vitePluginsCacheKey } from "./vite-plugin-cache-key.js";
 import { workspacePackageFile } from "./workspace-packages.js";
 import { prependTailwindSourceDirectives } from "./tailwind-source.js";
@@ -511,15 +512,9 @@ export async function buildApp(options: BuildAppOptions): Promise<BuildAppResult
           }),
         ),
   ]);
-  const actionRenderBundleExcludedFiles = new Set(
-    [...serverActionManifest.routeReferences.entries()]
-      .filter(([, references]) => references.length > 0)
-      .map(([file]) => file),
-  );
   const { artifacts: serverModules, sharedChunks: serverModuleSharedChunks } = await (
     shouldTrackBuildPhases === false
       ? buildServerModuleArtifacts({
-          actionRenderBundleExcludedFiles,
           bundleRequestRuntimePackages: shouldBuildAwsLambda,
           bundleCache: new Map(),
           clientRouteInferenceCache: serverClientRouteInferenceCache,
@@ -529,13 +524,13 @@ export async function buildApp(options: BuildAppOptions): Promise<BuildAppResult
           project,
           projectRoot: project.projectRoot,
           routes,
+          serverActionReferencesByFile: serverActionManifest.routeReferences,
           sourceAnalysis,
           serverTransformCache,
           vitePlugins,
         })
       : timeBuildPhase(timingSink, progressSink, "serverModules", () =>
           buildServerModuleArtifacts({
-            actionRenderBundleExcludedFiles,
             bundleRequestRuntimePackages: shouldBuildAwsLambda,
             bundleCache: new Map(),
             clientRouteInferenceCache: serverClientRouteInferenceCache,
@@ -545,6 +540,7 @@ export async function buildApp(options: BuildAppOptions): Promise<BuildAppResult
             project,
             projectRoot: project.projectRoot,
             routes,
+            serverActionReferencesByFile: serverActionManifest.routeReferences,
             sourceAnalysis,
             serverTransformCache,
             vitePlugins,
@@ -990,6 +986,16 @@ function buildSourceAnalysisForFile(
   return sourceAnalysis.byFile.get(relative(projectRoot, file).split(sep).join("/"));
 }
 
+function canUseBuildServerActionPlaceholders(
+  references: readonly BuiltServerActionExpressionReference[],
+): boolean {
+  return references.every(
+    (reference) =>
+      reference.expression === reference.exportName &&
+      /^[A-Za-z_$][\w$]*$/u.test(reference.expression),
+  );
+}
+
 async function buildPublicAssetManifest(
   project: ResolvedAppRouterProject,
   clientDir: string,
@@ -2062,7 +2068,6 @@ function routePathFromParams(route: AppRoute, params: StaticParams): string {
 }
 
 async function buildServerModuleArtifacts(options: {
-  actionRenderBundleExcludedFiles?: ReadonlySet<string> | undefined;
   bundleRequestRuntimePackages: boolean;
   bundleCache: Map<string, Promise<RouterBundleOutput>>;
   cacheDir?: string | undefined;
@@ -2073,6 +2078,7 @@ async function buildServerModuleArtifacts(options: {
   project: ResolvedAppRouterProject;
   projectRoot: string;
   routes: readonly AppRoute[];
+  serverActionReferencesByFile: ReadonlyMap<string, readonly BuiltServerActionExpressionReference[]>;
   sourceAnalysis: BuildSourceAnalysisScope;
   serverTransformCache: ServerTransformCache;
   vitePlugins?: readonly PluginOption[] | undefined;
@@ -2193,6 +2199,14 @@ async function buildServerModuleArtifacts(options: {
       const route = routeByFile.get(file);
       const routeAnalysis = options.sourceAnalysis.byRouteFile.get(file);
       const artifact: BuiltServerModuleArtifact = {};
+      const routeActionReferences = options.serverActionReferencesByFile.get(file) ?? [];
+      const renderSource =
+        routeActionReferences.length === 0
+          ? source
+          : prepareRouteServerActionPlaceholders({
+              code: source,
+              formActionReferences: routeActionReferences,
+            });
 
       if (
         requestArtifactFiles.has(file) ||
@@ -2282,8 +2296,11 @@ async function buildServerModuleArtifacts(options: {
           ? (["stream", "string"] as const)
           : (["string"] as const);
       const code =
-        routeAnalysis?.routeCode ??
-        (route === undefined ? source : stripRouteBuildExports(source, absoluteFile));
+        routeActionReferences.length === 0 && routeAnalysis !== undefined
+          ? routeAnalysis.routeCode
+          : route === undefined
+            ? renderSource
+            : stripRouteBuildExports(renderSource, absoluteFile);
       const clientInference =
         routeAnalysis === undefined
           ? await inferClientRouteModule({
@@ -2367,7 +2384,8 @@ async function buildServerModuleArtifacts(options: {
 
           const shouldWriteRenderBundle =
             options.prebundleServerComponents &&
-            options.actionRenderBundleExcludedFiles?.has(file) !== true;
+            (routeActionReferences.length === 0 ||
+              canUseBuildServerActionPlaceholders(routeActionReferences));
           const bundleCode = shouldWriteRenderBundle
             ? await buildServerComponentBundleArtifactCode({
                 clientRouteInferenceCache: options.clientRouteInferenceCache,

package/src/render.ts

@@ -47,6 +47,7 @@ import {
   type AppRouterServerActionOptions,
   type PreparedFormActionReference,
   dispatchServerActionRequest,
+  prepareRouteServerActionPlaceholders,
   prepareRouteServerActions,
 } from "./actions.js";
 import { serverActionCookie } from "./csrf.js";
@@ -76,10 +77,12 @@ import {
   hasLoaderExport,
   isStreamRouteSource,
   routeClosureMayUseAwaitBoundary,
+  stripRouteBuildExports,
+  stripRouteModuleExports,
   stripRouteClientOnlyExports,
+  stripRouteClientSource,
   stripRouteLoaderOnlyExports,
   stripRouteMetadataOnlyExports,
-  stripRouteModuleExports,
 } from "./route-source.js";
 import { emitRouterLog, logDurationMs, logNow, type AppRouterLogger } from "./logger.js";
 import {
@@ -231,6 +234,10 @@ export async function preloadBuiltRequestModules(options: {
   serverModules?: ReadonlyMap<string, BuiltServerModuleArtifact> | undefined;
   serverModuleCacheVersion: string;
   serverSourceFiles: ReadonlyMap<string, string>;
+  serverActionReferencesByFile?: ReadonlyMap<
+    string,
+    readonly PreparedFormActionReference[]
+  > | undefined;
   vitePlugins?: readonly PluginOption[] | undefined;
 }): Promise<void> {
   const clientRouteInferenceCache = createClientRouteInferenceCache();
@@ -276,21 +283,31 @@ export async function preloadBuiltRequestModules(options: {
     }
 
     if (options.includeRenderModules !== false) {
+      const actionReferences = options.serverActionReferencesByFile?.get(route.file) ?? [];
+      const analysisCode =
+        actionReferences.length === 0
+          ? code
+          : prepareRouteServerActionPlaceholders({
+              code,
+              formActionReferences: actionReferences,
+            });
       const analysis = await analyzeRouteSource({
         appDir: options.appDir,
         artifact: options.serverModules?.get(route.file)?.analysis,
-        code,
+        buildRenderCode: analysisCode !== code,
+        code: analysisCode,
         filename: route.file,
         routePath: route.path,
         clientRouteInferenceCache,
-        serverModuleCacheVersion: options.serverModuleCacheVersion,
+        serverModuleCacheVersion:
+          actionReferences.length === 0 ? options.serverModuleCacheVersion : undefined,
         serverSourceFiles: options.serverSourceFiles,
         vitePlugins: options.vitePlugins,
       });
       await preloadBuiltPageRouteModules({
         ...options,
         analysis,
-        code,
+        code: analysisCode,
         file: route.file,
       });
     }
@@ -1017,6 +1034,7 @@ async function renderAppRequestInternal(options: RenderAppRequestOptions): Promi
       appDir: options.appDir,
       code: originalCode,
       formActionReferences: options.serverActionReferencesByFile?.get(matched.route.file),
+      placeholders: true,
       pageFile: matched.route.file,
       request: options.request,
     });
@@ -1031,6 +1049,7 @@ async function renderAppRequestInternal(options: RenderAppRequestOptions): Promi
         ? originalAnalysis
         : await analyzeRouteSource({
             appDir: options.appDir,
+            buildRenderCode: preparedActions.htmlReplacements !== undefined,
             code,
             filename: matched.route.file,
             routePath: matched.route.path,
@@ -1049,7 +1068,7 @@ async function renderAppRequestInternal(options: RenderAppRequestOptions): Promi
     const dataPromise = routeAnalysis.hasLoader
       ? loadRouteDataWithInstrumentation({
           appDir: options.appDir,
-          code,
+          code: originalCode,
           context: {
             env: options.env,
             params: matched.params,
@@ -1226,13 +1245,16 @@ async function renderAppRequestInternal(options: RenderAppRequestOptions): Promi
         html = injectQueryState(html, dehydrate(queryClient));
         const response = withOptionalActionCookie(
           htmlResponse(
-            `<!DOCTYPE html>${clientNavigationHeadTags({
-              assetBaseUrl: options.assetBaseUrl,
-              currentStyleSheets: clientStyleSheets,
-              currentScript: clientRoute ? clientScript : undefined,
-              currentNavigationScript: clientRoute ? undefined : navigationScript,
-              routeScripts: options.clientScripts,
-            })}${html}`,
+            applyActionHtmlReplacements(
+              `<!DOCTYPE html>${clientNavigationHeadTags({
+                assetBaseUrl: options.assetBaseUrl,
+                currentStyleSheets: clientStyleSheets,
+                currentScript: clientRoute ? clientScript : undefined,
+                currentNavigationScript: clientRoute ? undefined : navigationScript,
+                routeScripts: options.clientScripts,
+              })}${html}`,
+              preparedActions.htmlReplacements,
+            ),
             {
               headers: responseHeadersForMetadata(metadata, options.request, {
                 "x-mreact-stream": "1",
@@ -1249,7 +1271,7 @@ async function renderAppRequestInternal(options: RenderAppRequestOptions): Promi
       let streamData: unknown;
       let streamDataPromise = dataPromise ?? Promise.resolve(undefined);
       phaseStartedAt = renderTimingPhaseStartedAt(timing);
-      if (loadingFile === undefined || routeLoaderMayReturnControlResponse(code)) {
+      if (loadingFile === undefined || routeLoaderMayReturnControlResponse(originalCode)) {
         try {
           streamData = dataPromise === undefined ? undefined : await dataPromise;
         } finally {
@@ -1508,13 +1530,16 @@ async function renderAppRequestInternal(options: RenderAppRequestOptions): Promi
 
     const response = withOptionalActionCookie(
       htmlResponse(
-        `<!DOCTYPE html>${clientNavigationHeadTags({
-          assetBaseUrl: options.assetBaseUrl,
-          currentStyleSheets: clientStyleSheets,
-          currentScript: clientRoute ? clientScript : undefined,
-          currentNavigationScript: clientRoute ? undefined : navigationScript,
-          routeScripts: options.clientScripts,
-        })}${html}`,
+        applyActionHtmlReplacements(
+          `<!DOCTYPE html>${clientNavigationHeadTags({
+            assetBaseUrl: options.assetBaseUrl,
+            currentStyleSheets: clientStyleSheets,
+            currentScript: clientRoute ? clientScript : undefined,
+            currentNavigationScript: clientRoute ? undefined : navigationScript,
+            routeScripts: options.clientScripts,
+          })}${html}`,
+          preparedActions.htmlReplacements,
+        ),
         {
           headers: responseHeadersForMetadata(metadata, options.request),
         },
@@ -1632,6 +1657,23 @@ function withOptionalActionCookie(
   return response;
 }
 
+function applyActionHtmlReplacements(
+  html: string,
+  replacements: readonly (readonly [string, string])[] | undefined,
+): string {
+  if (replacements === undefined || replacements.length === 0) {
+    return html;
+  }
+
+  let next = html;
+
+  for (const [placeholder, value] of replacements) {
+    next = next.replaceAll(placeholder, escapeHtmlAttribute(value));
+  }
+
+  return next;
+}
+
 function modulePreloadTags(script: string | undefined, assetBaseUrl: string | undefined): string {
   return script === undefined
     ? ""
@@ -2768,6 +2810,7 @@ function warnProductionDynamicServerTransform(
 async function analyzeRouteSource(options: {
   appDir: string;
   artifact?: BuiltRouteSourceAnalysisSummary | undefined;
+  buildRenderCode?: boolean | undefined;
   clientRouteInferenceCache: ClientRouteInferenceCache;
   code: string;
   define?: UserConfig["define"] | undefined;
@@ -2791,7 +2834,7 @@ async function analyzeRouteSource(options: {
     return analysis;
   }
 
-  const cacheKey = `${options.serverModuleCacheVersion ?? "dev"}\0${options.filename}\0${sourceHash}\0${viteDefineCacheKey(options.define)}\0${vitePluginsCacheKey(options.vitePlugins)}`;
+  const cacheKey = `${options.serverModuleCacheVersion ?? "dev"}\0${options.filename}\0${sourceHash}\0${options.buildRenderCode === true ? "build-render" : "render"}\0${viteDefineCacheKey(options.define)}\0${vitePluginsCacheKey(options.vitePlugins)}`;
   const cached = readRouterRuntimeCacheEntry(
     routeSourceAnalysisCache,
     cacheKey,
@@ -2838,6 +2881,7 @@ function routeSourceAnalysisFromArtifact(
 
 async function analyzeRouteSourceUncached(options: {
   appDir: string;
+  buildRenderCode?: boolean | undefined;
   clientRouteInferenceCache: ClientRouteInferenceCache;
   code: string;
   define?: UserConfig["define"] | undefined;
@@ -2846,11 +2890,14 @@ async function analyzeRouteSourceUncached(options: {
   serverSourceFiles?: ReadonlyMap<string, string> | undefined;
   vitePlugins?: readonly PluginOption[] | undefined;
 }): Promise<RouteSourceAnalysis> {
-  const routeCode = stripRouteModuleExports(options.code, options.filename);
+  const routeCode =
+    options.buildRenderCode === true
+      ? stripRouteBuildExports(options.code, options.filename)
+      : stripRouteModuleExports(options.code, options.filename);
   const clientInference = await inferClientRouteModule({
     appDir: options.appDir,
     cache: options.clientRouteInferenceCache,
-    code: routeCode,
+    code: stripRouteClientSource({ code: options.code, filename: options.filename }),
     filename: options.filename,
     routePath: options.routePath,
     vitePlugins: options.vitePlugins,
@@ -2956,6 +3003,7 @@ async function loadServerModule(
   const artifact = serverModules?.get(sourcefile)?.string;
   const codeHash = memoizedHashText(code);
   const prebuiltCode = prebuiltServerComponentModuleCode(artifact, code, codeHash);
+  const usesPrebuiltCompiledCode = artifact?.code === code;
   if (
     artifact !== undefined &&
     prebuiltServerModuleOutputMatches(artifact, code, codeHash) &&
@@ -2990,7 +3038,7 @@ async function loadServerModule(
               label: "Server component",
             }),
           ],
-    ...(prebuiltCode === undefined
+    ...(prebuiltCode === undefined && !usesPrebuiltCompiledCode
       ? {
           resolveDir: dirname(sourcefile),
           serverSourceTransform: {
@@ -3002,6 +3050,7 @@ async function loadServerModule(
           },
         }
       : {}),
+    ...(usesPrebuiltCompiledCode ? { resolveDir: dirname(sourcefile) } : {}),
     sourcefile,
     vitePlugins,
   });
@@ -3611,6 +3660,7 @@ async function loadServerStreamModule(
   const artifactCode = serverModules?.get(sourcefile)?.stream;
   const codeHash = memoizedHashText(code);
   const prebuiltCode = prebuiltServerComponentModuleCode(artifactCode, code, codeHash, outputOptions);
+  const usesPrebuiltCompiledCode = artifactCode?.code === code;
   if (
     artifactCode !== undefined &&
     prebuiltServerModuleOutputOptionsMatch(artifactCode, outputOptions) &&
@@ -3646,7 +3696,7 @@ async function loadServerStreamModule(
               label: "Server stream component",
             }),
           ],
-    ...(prebuiltCode === undefined
+    ...(prebuiltCode === undefined && !usesPrebuiltCompiledCode
       ? {
           resolveDir: dirname(sourcefile),
           serverSourceTransform: {
@@ -3658,6 +3708,7 @@ async function loadServerStreamModule(
           },
         }
       : {}),
+    ...(usesPrebuiltCompiledCode ? { resolveDir: dirname(sourcefile) } : {}),
     sourcefile,
     vitePlugins,
   });

package/src/serve.ts

@@ -358,6 +358,7 @@ async function preloadBuiltAppRuntimeWithRuntime(options: {
     serverModules: options.runtime.serverModules,
     serverModuleCacheVersion: options.runtime.serverModuleCacheVersion,
     serverSourceFiles: options.runtime.serverSourceFiles,
+    serverActionReferencesByFile: options.runtime.serverActionReferencesByFile,
     includeRenderModules: plan.includeRenderModules,
   });
 }