@rsc-kit/core 0.30.26 → 0.30.28

package/dist/vite.js

@@ -23,6 +23,7 @@ import rsc, { getPluginApi } from "@vitejs/plugin-rsc";
 import { loadEnv, parseAst } from "vite";
 import { stampDisplayNames } from "./stableNames.js";
 import { REPORT_FILE, buildReport } from "./buildReport.js";
+import { edgeShells, pprMarker } from "./edgeShells.js";
 import { MANIFEST_PATH, manifestWarning, webManifest } from "./webManifest.js";
 import { ASSET_BASE, allAppAssets, assetFile, appAssets, headTags, shareImageUrls, typeOf, } from "./appAssets.js";
 import { reactCacheImports } from "./reactCache.js";
@@ -1764,6 +1765,7 @@ async function prerenderAfterBundles(bundle, staticDir, assetsDir, knownActions
     const collected = [];
     let refusal = null;
     let results;
+    const build = await engine.buildId?.();
     try {
         results = await prerender({
             engine,
@@ -1774,7 +1776,7 @@ async function prerenderAfterBundles(bundle, staticDir, assetsDir, knownActions
             // them, and replayed against a different bundle React finds the
             // wrong name in every slot. Unstamped - which is what every build
             // before this one wrote - the host cannot tell and resumes anyway.
-            version: await engine.buildId?.(),
+            version: build,
             serviceWorker: offline,
             stylesheet: inlineStylesheets === false
                 ? undefined
@@ -1972,6 +1974,8 @@ ${legend(counted)}
             .filter((r) => existsSync(join(staticDir, pathKeyOf(r.url) + ".html")))
             .map((r) => r.url),
         results,
+        shells: edgeShells(results, manifest.routes),
+        build,
     };
 }
 /**
@@ -3276,7 +3280,7 @@ import { prerenderedBeside } from ${JSON.stringify(join(packageDir, "files"))}
 import { observeServed } from ${JSON.stringify(join(packageDir, "served"))}
 import { renderToReadableStream, decodeReply, decodeAction, decodeFormState, loadServerAction } from '@vitejs/plugin-rsc/rsc'
 import { isQuery, queryCacheControl, isQueryValidationError, queryRefusal } from ${JSON.stringify(join(packageDir, "query"))}
-import { isActionValidationError, isActionRefusal, isClientBuilt } from ${JSON.stringify(join(packageDir, "action"))}
+import { isActionValidationError, isActionRefusal, isClientBuilt, turnedAwayStatus } from ${JSON.stringify(join(packageDir, "action"))}
 import { forgetCached } from ${JSON.stringify(join(packageDir, "cache"))}
 import { noteFallback as noteCaughtRead } from ${JSON.stringify(join(packageDir, "request"))}
 import { isOutdatedOptimizedDep, outdatedDepResponse } from ${JSON.stringify(join(packageDir, "devReload"))}
@@ -5281,7 +5285,8 @@ export async function handleAction(
   // abort(429, ...), Rsc::refuse) it throws a refusal whose message was written
   // for the person asking. Its message is the result's serverError, which is
   // where a form's formError reads. Its data is not sent: there is no
-  // .refusal(schema) on a plain function to check it against.
+  // .refusal(schema) on a plain function to check it against. Turned away -
+  // 401, 403, 404 - is answered the same way.
   let result: unknown
 
   try {
@@ -5301,6 +5306,12 @@ export async function handleAction(
       // Marked for the same reason: a stub awaited directly rejects with the
       // fields, so a caller does not take a refusal of its input for its result.
       result = { validationErrors: error.errors, __rscRefused: 422 }
+    } else if (turnedAwayStatus(error) !== null) {
+      // Not signed in, not allowed, or no such record - Refuse(404), abort(403),
+      // a notFound() of the action's own. Each message was written for the
+      // person, and an action has no not-found page to show instead. Rethrown,
+      // it was a 500 and "Something went wrong." on every action it reached.
+      result = { serverError: (error as Error).message, __rscRefused: turnedAwayStatus(error) }
     } else {
       throw error
     }
@@ -8066,7 +8077,7 @@ export function rscKit(options = {}) {
             const staticDir = clientOut
                 ? join(dirname(clientOut), "server", NITRO_STATIC_DIR)
                 : join(outDir, NITRO_STATIC_DIR);
-            const { frozen, results } = await prerenderAfterBundles(bundle, staticDir, clientOut ?? publicAssetsDir, builder ? knownActionsOf(builder.config, projectRoot) : []);
+            const { frozen, results, shells, build } = await prerenderAfterBundles(bundle, staticDir, clientOut ?? publicAssetsDir, builder ? knownActionsOf(builder.config, projectRoot) : []);
             // The same pages once more, as a module. A Worker has no filesystem, and
             // until this existed every Cloudflare deploy rendered its "static" pages
             // live, silently - the reader found no directory and fell through. The
@@ -8102,6 +8113,9 @@ export function rscKit(options = {}) {
             // after the prerender, and an export taken any earlier left them out.
             if (output === "export")
                 await exportAfterPrerender(results, staticDir, clientOut ?? publicAssetsDir);
+            if (shells.left.length) {
+                log(`ppr: not listed for an edge in ppr.json, so served by the origin: ${shells.left.join("; ")}`);
+            }
             // What this build produced, where a deploy can read it without parsing
             // vite.config.ts - which can turn export on through RSC_OUTPUT, or
             // compute it - or knowing where rsc-kit keeps things inside .output.
@@ -8115,6 +8129,20 @@ export function rscKit(options = {}) {
                         ...compileStep(projectRoot),
                         ...(buildCommands().length ? { commands: buildCommands().map((c) => c.name) } : {}),
                     }, null, 2) + "\n");
+                // The PPR contract's marker: the pages an edge may answer from a
+                // cached shell, and the build both endpoints will say they belong to.
+                // Written by every server build, with an empty list when there is no
+                // PPR page, so a platform can tell "none" from "an rsc-kit too old to
+                // say". Not by an export, which has no origin to resume against.
+                const marker = join(dirname(clientOut), "ppr.json");
+                if (output !== "export" && build) {
+                    writeFileSync(marker, JSON.stringify(pprMarker(build, shells.shells), null, 2) + "\n");
+                }
+                else {
+                    // One left by an earlier server build would promise an origin that
+                    // is not there.
+                    rmSync(marker, { force: true });
+                }
             }
         },
         configResolved(config) {