@rsc-kit/core 0.16.2 → 0.16.3

package/dist/vite.js

@@ -12,7 +12,7 @@
 // carry the route composition and the worker's render contract, and supplies
 // the structural config (entries, output dirs, base). @vitejs/plugin-rsc is
 // included here so it always runs before any react() layer the app adds.
-import { copyFileSync, existsSync, mkdirSync, readdirSync, readFileSync, rmSync, statSync, writeFileSync, } from "node:fs";
+import { copyFileSync, existsSync, mkdirSync, readdirSync, readFileSync, rmSync, statSync, writeFileSync, createReadStream, } from "node:fs";
 import { gzipSync } from "node:zlib";
 import { createHash } from "node:crypto";
 import { createRequire } from "node:module";
@@ -22,7 +22,7 @@ import rsc, { getPluginApi } from "@vitejs/plugin-rsc";
 import { loadEnv } from "vite";
 import { REPORT_FILE, buildReport } from "./buildReport.js";
 import { MANIFEST_PATH, manifestWarning, webManifest } from "./webManifest.js";
-import { ASSET_BASE, appAssets, headTags } from "./appAssets.js";
+import { ASSET_BASE, allAppAssets, appAssets, headTags, typeOf, } from "./appAssets.js";
 import { httpHostCalls } from "./hostCalls.js";
 // Resolved once per rscKit() call. One build runs in one process, so these are
 // module state rather than threaded through every helper.
@@ -956,13 +956,7 @@ export function declaredManifest(appDir) {
 function copyAppAssets(clientDir) {
     if (!existsSync(clientDir))
         return;
-    const all = [
-        ...(foundAssets.favicon ? [foundAssets.favicon] : []),
-        ...foundAssets.icons,
-        ...(foundAssets.appleIcon ? [foundAssets.appleIcon] : []),
-        ...(foundAssets.openGraph ? [foundAssets.openGraph] : []),
-        ...(foundAssets.twitter ? [foundAssets.twitter] : []),
-    ];
+    const all = allAppAssets(foundAssets);
     if (all.length === 0)
         return;
     for (const asset of all) {
@@ -3727,7 +3721,19 @@ export async function handleSsr(
   const html = await renderToReadableStream(root as any, {
     bootstrapScriptContent,
     nonce,
-    onError: onError ?? ((error: unknown) => { console.error('[rsc-kit:ssr]', error) }),
+    // The query-string fallback is the designed path for a stored page, and
+    // its digest is what lets the client tell it from a fault on hydration;
+    // returned here so React writes it into the document.
+    onError: onError ?? ((error: unknown) => {
+      const digest = (error as { digest?: string } | null)?.digest
+      if (digest === 'rsc-kit:search-params-fallback') {
+        // One line, not a stack: the line is the dev server saying which
+        // boundary the build will want.
+        console.error('[rsc-kit] ' + String((error as Error).message))
+        return digest
+      }
+      console.error('[rsc-kit:ssr]', error)
+    }),
   })
 
   return DEV_ORIGIN ? rewriteViteDevUrlStream(html, DEV_ORIGIN) : html
@@ -4266,6 +4272,25 @@ export function rscKit(options = {}) {
          * nothing.
          */
         configureServer(server) {
+            // The icons and share images live in app/, which nothing serves; the
+            // build copies them beside the client output. There is no output while
+            // developing, so the same hrefs the head tags carry are answered from
+            // app/ here - and the web manifest with them - or the tab has no icon
+            // and the console a 404 for a file that is right there.
+            server.middlewares.use((req, res, next) => {
+                const url = (req.url ?? "").split("?")[0];
+                if (webManifestOptions && url === MANIFEST_PATH) {
+                    res.setHeader("Content-Type", "application/manifest+json");
+                    res.end(webManifest(webManifestOptions));
+                    return;
+                }
+                const asset = allAppAssets(foundAssets).find((a) => a.href === url);
+                const file = asset ? join(sourceDir, "app", asset.file) : null;
+                if (!asset || !file || !existsSync(file))
+                    return next();
+                res.setHeader("Content-Type", typeOf(asset.file));
+                createReadStream(file).pipe(res);
+            });
             // rpc() has to reach the backend while the dev server is serving.
             //
             // A built deployment installs this itself: the server running