swift-rust 1.1.0 → 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);
@@ -263,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`);
 }
@@ -325,7 +344,7 @@ async function main() {
       try {
         const { status, body } = await fetchRoute(route);
         if (status === 200) {
-          const cleaned = await localizeIslands(stripHmrScript(body));
+          const cleaned = rewriteImageUrls(await localizeIslands(stripHmrScript(body)));
           writeStaticFile(STATIC_DIR, route, cleaned);
           okCount++;
           process.stdout.write(`  ${paint("green", "✓")} ${route}\n`);

package/bin/dev-server.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { existsSync, statSync, readFileSync, readdirSync, writeFileSync, unlinkSync, watch as fsWatch } from "node:fs";
-import { join, resolve, extname, relative, dirname, sep } from "node:path";
+import { join, resolve, extname, relative, dirname, basename, sep } from "node:path";
 import { pathToFileURL } from "node:url";
 import { performance } from "node:perf_hooks";
 import { errorOverlayHTML as renderErrorOverlay } from "./error-overlay.mjs";
@@ -17,7 +17,7 @@ function getArg(name, fallback) {
   return fallback;
 }
 
-const port = parseInt(getArg("port", process.env.PORT || "3000"), 10);
+const port = parseInt(getArg("port", process.env.PORT || "3210"), 10);
 const hostname = getArg("hostname", "0.0.0.0");
 
 const c = {
@@ -36,7 +36,7 @@ const useColor = process.stdout.isTTY !== false && !process.env.NO_COLOR;
 const paint = (color, s) => (useColor ? `${c[color]}${s}${c.reset}` : s);
 
 const VERSION = "0.1.0";
-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 SWIFT_RUST_CONFIG = resolve(cwd, "swift-rust.config.json");
@@ -617,6 +617,7 @@ function mergeMetadata(...metas) {
     if (m.description) out.description = m.description;
     if (m.keywords) out.keywords = m.keywords;
     if (m.openGraph) out.openGraph = { ...(out.openGraph || {}), ...m.openGraph };
+    if (m.twitter) out.twitter = { ...(out.twitter || {}), ...m.twitter };
   }
   return out;
 }
@@ -641,6 +642,24 @@ function metadataToHead(meta) {
       for (const img of meta.openGraph.images) {
         const url = typeof img === "string" ? img : img.url;
         if (url) parts.push(`<meta property="og:image" content="${escapeHtml(url)}" />`);
+        if (typeof img === "object" && img) {
+          if (img.width) parts.push(`<meta property="og:image:width" content="${escapeHtml(img.width)}" />`);
+          if (img.height) parts.push(`<meta property="og:image:height" content="${escapeHtml(img.height)}" />`);
+          if (img.alt) parts.push(`<meta property="og:image:alt" content="${escapeHtml(img.alt)}" />`);
+        }
+      }
+    }
+  }
+  if (meta.twitter) {
+    if (meta.twitter.card) parts.push(`<meta name="twitter:card" content="${escapeHtml(meta.twitter.card)}" />`);
+    if (meta.twitter.site) parts.push(`<meta name="twitter:site" content="${escapeHtml(meta.twitter.site)}" />`);
+    if (meta.twitter.creator) parts.push(`<meta name="twitter:creator" content="${escapeHtml(meta.twitter.creator)}" />`);
+    if (meta.twitter.title) parts.push(`<meta name="twitter:title" content="${escapeHtml(meta.twitter.title)}" />`);
+    if (meta.twitter.description) parts.push(`<meta name="twitter:description" content="${escapeHtml(meta.twitter.description)}" />`);
+    if (meta.twitter.images) {
+      for (const img of meta.twitter.images) {
+        const url = typeof img === "string" ? img : img.url;
+        if (url) parts.push(`<meta name="twitter:image" content="${escapeHtml(url)}" />`);
       }
     }
   }
@@ -796,10 +815,12 @@ function warnRoutingFile(file, msg) {
 function validateRoutingConventions() {
   const names = [...SPECIAL_FILES, "page"];
   const appRel = relative(cwd, APP_DIR) || "app";
-  const usesSrc = APP_DIR.endsWith(`${sep}src`);
-  const scan = (dir, label) => {
+  const srcRoot = dirname(APP_DIR);
+  const usesSrc = basename(APP_DIR) === "app" && basename(srcRoot) === "src";
+  const scan = (dir, label, allow = []) => {
     if (!existsSync(dir) || resolve(dir) === resolve(APP_DIR)) return;
     for (const name of names) {
+      if (allow.includes(name)) continue;
       const f = findFile(dir, name);
       if (f) {
         warnRoutingFile(
@@ -811,7 +832,8 @@ function validateRoutingConventions() {
     }
   };
   scan(cwd, "the project root");
-  if (usesSrc) scan(dirname(APP_DIR), `"app/" (outside "src/")`);
+  // proxy.ts is allowed to live at the src/ root (sibling of src/app).
+  if (usesSrc) scan(srcRoot, `"src/" (outside "app/")`, ["proxy"]);
 }
 
 // ── RFC 0001 route pipeline: config → schema → guard → loader/action ────────
@@ -902,7 +924,16 @@ async function runRoutePipeline(route, ctx) {
 
   // proxy.ts — phase 1, outer → inner. Cheap, data-free interception
   // (Next.js calls this "proxy"; "middleware" is accepted with a warning).
-  for (const { file } of collectRouteFiles(chain, "proxy")) {
+  // When using a src/ directory, a root proxy lives at src/proxy.ts (sibling
+  // of src/app), so it runs before any in-app proxy.
+  const proxyFiles = [];
+  const srcRoot = dirname(APP_DIR);
+  if (basename(APP_DIR) === "app" && basename(srcRoot) === "src") {
+    const rootProxy = findFile(srcRoot, "proxy");
+    if (rootProxy) proxyFiles.push({ file: rootProxy, dir: srcRoot });
+  }
+  proxyFiles.push(...collectRouteFiles(chain, "proxy"));
+  for (const { file } of proxyFiles) {
     const mod = await loadModuleFresh(file);
     const fn = mod.default ?? mod.proxy;
     if (typeof fn === "function") {

package/bin/error-overlay.mjs

@@ -113,8 +113,8 @@ function classifyError(message) {
         "The dev server could not bind to the requested port, " +
         "or it ran out of system resources.",
       suggestions: [
-        "Close any other process using this port (usually 3000)",
-        "Run with --port 3001 to use a different port",
+        "Close any other process using this port (usually 3210)",
+        "Run with --port <number> to use a different port",
         "Check disk space with `df -h`",
       ],
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swift-rust",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "description": "The full-stack React framework powered with Rust + Bun. TSX-first, Rust rendering, 10x faster than Next.js, single binary deploy.",
   "license": "MIT",
   "homepage": "https://swift-rust.dev",
@@ -22,6 +22,7 @@
   "types": "./dist/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
+    "./tsconfig.base.json": "./tsconfig.base.json",
     ".": {
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js"
@@ -74,7 +75,8 @@
     "dist",
     "bin",
     "scripts",
-    "native"
+    "native",
+    "tsconfig.base.json"
   ],
   "scripts": {
     "build": "tsc -p tsconfig.json",

package/tsconfig.base.json

@@ -0,0 +1,21 @@
+{
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "display": "swift-rust base",
+  "compilerOptions": {
+    "target": "ES2022",
+    "lib": ["ES2023", "DOM", "DOM.Iterable"],
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "moduleDetection": "force",
+    "jsx": "react-jsx",
+    "allowJs": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "strict": true,
+    "noUncheckedIndexedAccess": true,
+    "forceConsistentCasingInFileNames": true,
+    "noEmit": true
+  }
+}