@reckona/mreact-router 0.0.165 → 0.0.167

package/dist/build.js

@@ -21,6 +21,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";
@@ -184,12 +185,8 @@ export async function buildApp(options) {
                 routesDir: project.routesDir,
             })),
     ]);
-    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,
@@ -199,12 +196,12 @@ export async function buildApp(options) {
             project,
             projectRoot: project.projectRoot,
             routes,
+            serverActionReferencesByFile: serverActionManifest.routeReferences,
             sourceAnalysis,
             serverTransformCache,
             vitePlugins,
         })
         : timeBuildPhase(timingSink, progressSink, "serverModules", () => buildServerModuleArtifacts({
-            actionRenderBundleExcludedFiles,
             bundleRequestRuntimePackages: shouldBuildAwsLambda,
             bundleCache: new Map(),
             clientRouteInferenceCache: serverClientRouteInferenceCache,
@@ -214,6 +211,7 @@ export async function buildApp(options) {
             project,
             projectRoot: project.projectRoot,
             routes,
+            serverActionReferencesByFile: serverActionManifest.routeReferences,
             sourceAnalysis,
             serverTransformCache,
             vitePlugins,
@@ -560,6 +558,10 @@ function analyzeBuildSource(source, filename) {
 function buildSourceAnalysisForFile(sourceAnalysis, projectRoot, file) {
     return sourceAnalysis.byFile.get(relative(projectRoot, file).split(sep).join("/"));
 }
+function canUseBuildServerActionPlaceholders(references) {
+    return references.every((reference) => reference.expression === reference.exportName &&
+        /^[A-Za-z_$][\w$]*$/u.test(reference.expression));
+}
 async function buildPublicAssetManifest(project, clientDir) {
     const [publicAssetPaths, appConventionPublicAssets] = await Promise.all([
         collectPublicAssetPaths(project.publicDir),
@@ -1355,6 +1357,13 @@ async function buildServerModuleArtifacts(options) {
         const route = routeByFile.get(file);
         const routeAnalysis = options.sourceAnalysis.byRouteFile.get(file);
         const artifact = {};
+        const routeActionReferences = options.serverActionReferencesByFile.get(file) ?? [];
+        const renderSource = routeActionReferences.length === 0
+            ? source
+            : prepareRouteServerActionPlaceholders({
+                code: source,
+                formActionReferences: routeActionReferences,
+            });
         if (requestArtifactFiles.has(file) ||
             loaderArtifactFiles.has(file) ||
             metadataArtifactFiles.has(file)) {
@@ -1429,8 +1438,11 @@ async function buildServerModuleArtifacts(options) {
         const serverOutputs = streamRoute || (route === undefined && closureUsesAwait)
             ? ["stream", "string"]
             : ["string"];
-        const code = routeAnalysis?.routeCode ??
-            (route === undefined ? source : stripRouteBuildExports(source, absoluteFile));
+        const code = routeActionReferences.length === 0 && routeAnalysis !== undefined
+            ? routeAnalysis.routeCode
+            : route === undefined
+                ? renderSource
+                : stripRouteBuildExports(renderSource, absoluteFile);
         const clientInference = routeAnalysis === undefined
             ? await inferClientRouteModule({
                 ...(route === undefined ? {} : { appDir: options.project.routesDir }),
@@ -1490,7 +1502,8 @@ async function buildServerModuleArtifacts(options) {
                 return undefined;
             }
             const shouldWriteRenderBundle = options.prebundleServerComponents &&
-                options.actionRenderBundleExcludedFiles?.has(file) !== true;
+                (routeActionReferences.length === 0 ||
+                    canUseBuildServerActionPlaceholders(routeActionReferences));
             const bundleCode = shouldWriteRenderBundle
                 ? await buildServerComponentBundleArtifactCode({
                     clientRouteInferenceCache: options.clientRouteInferenceCache,