swift-rust 1.0.1 → 1.2.1

package/bin/build.mjs

@@ -15,7 +15,7 @@ import { join, resolve, dirname, sep } from "node:path";
 import { fileURLToPath } from "node:url";
 
 const cwd = process.cwd();
-const APP_DIR_CANDIDATES = [resolve(cwd, "app", "src"), resolve(cwd, "app")];
+const APP_DIR_CANDIDATES = [resolve(cwd, "src", "app"), resolve(cwd, "app")];
 const APP_DIR = APP_DIR_CANDIDATES.find((p) => existsSync(p)) ?? resolve(cwd, "app");
 const PUBLIC_DIR = resolve(cwd, "public");
 const OUT_DIR = resolve(cwd, ".vercel", "output");
@@ -200,6 +200,15 @@ function stripHmrScript(html) {
   return html.replace(/\s*<script src="\/_swift-rust\/hmr-client\.js"[^>]*>\s*<\/script>/g, "");
 }
 
+// The dev-time image endpoint (/_swift-rust/image) only exists while the dev
+// server runs. On Vercel the platform serves an optimizing endpoint at
+// /_vercel/image with the exact same query contract (url, w, q), so we swap the
+// path prefix at build time. The `images` config written into config.json
+// enables (and bounds) that optimizer. Handles `src`, `srcset`, and `&amp;`.
+function rewriteImageUrls(html) {
+  return html.split("/_swift-rust/image?").join("/_vercel/image?");
+}
+
 function writeStaticFile(outDir, pathname, html) {
   const rel = pathname === "/" ? "index.html" : `${pathname.replace(/^\//, "")}/index.html`;
   const outPath = join(outDir, rel);
@@ -214,6 +223,41 @@ function writeRawFile(outDir, name, contents) {
   writeFileSync(outPath, contents);
 }
 
+// Client-island hydration: a "use client" page's HTML references the dev-only
+// bundle at /_swift-rust/island.js?p=<file>. For the static export we fetch
+// that bundle, write it as a real file, and rewrite the script src to point at
+// it — so hydration works on the deployed site, not just in `bun dev`.
+const islandWritten = new Map();
+function simpleHash(s) {
+  let h = 2166136261;
+  for (let i = 0; i < s.length; i++) {
+    h ^= s.charCodeAt(i);
+    h = Math.imul(h, 16777619);
+  }
+  return (h >>> 0).toString(36);
+}
+async function localizeIslands(html) {
+  const re = /\/_swift-rust\/island\.js\?p=([^"]+)/g;
+  const found = new Set();
+  let m;
+  while ((m = re.exec(html)) !== null) found.add(m[1]);
+  if (found.size === 0) return html;
+  let out = html;
+  for (const enc of found) {
+    let staticUrl = islandWritten.get(enc);
+    if (!staticUrl) {
+      const { status, body } = await fetchRoute(`/_swift-rust/island.js?p=${enc}`);
+      if (status !== 200) continue;
+      const rel = `_swift-rust/island/${simpleHash(enc)}.js`;
+      writeRawFile(STATIC_DIR, rel, body);
+      staticUrl = `/${rel}`;
+      islandWritten.set(enc, staticUrl);
+    }
+    out = out.split(`/_swift-rust/island.js?p=${enc}`).join(staticUrl);
+  }
+  return out;
+}
+
 function writeConfigJson(outDir, _hasPublic) {
   // Build Output API v3 config. Only schema-valid fields here — unknown
   // top-level fields or route properties are rejected at "Deploying outputs".
@@ -228,6 +272,16 @@ function writeConfigJson(outDir, _hasPublic) {
     overrides: {
       "404.html": { path: "404", contentType: "text/html; charset=utf-8" },
     },
+    // Enables Vercel's image optimizer (/_vercel/image). `sizes` MUST match the
+    // widths <Image> requests (packages/image DEVICE_SIZES) or requests 400.
+    images: {
+      sizes: [640, 750, 828, 1080, 1200, 1920, 2048, 3840],
+      formats: ["image/avif", "image/webp"],
+      minimumCacheTTL: 86400,
+      // Allow optimizing local SVG assets (e.g. blog covers); sandboxed by CSP.
+      dangerouslyAllowSVG: true,
+      contentSecurityPolicy: "default-src 'self'; script-src 'none'; sandbox;",
+    },
   };
   writeFileSync(join(outDir, "config.json"), `${JSON.stringify(config, null, 2)}\n`);
 }
@@ -290,7 +344,7 @@ async function main() {
       try {
         const { status, body } = await fetchRoute(route);
         if (status === 200) {
-          const cleaned = stripHmrScript(body);
+          const cleaned = rewriteImageUrls(await localizeIslands(stripHmrScript(body)));
           writeStaticFile(STATIC_DIR, route, cleaned);
           okCount++;
           process.stdout.write(`  ${paint("green", "✓")} ${route}\n`);