@jami-studio/core 0.92.36 → 0.92.38

package/corpus/templates/assets/server/lib/image-processing.ts

@@ -7,41 +7,201 @@ import type {
 } from "../../shared/api.js";
 import { aspectRatioValue } from "./preset-skeleton.js";
 
+/**
+ * True when the error means the sharp native module cannot run in this
+ * runtime (e.g. the Cloudflare Pages worker build stubs `sharp` with a
+ * throwing proxy, and serverless Linux builds can fail to load the native
+ * binary). Used to degrade gracefully instead of failing the whole upload.
+ */
+function isSharpUnavailableError(error: unknown): boolean {
+  const message = error instanceof Error ? error.message : String(error);
+  return /sharp unavailable|Could not load the "?sharp"? module/i.test(
+    message,
+  );
+}
+
+/**
+ * Pure-JS dimension sniffing for the upload formats the app accepts.
+ * Fallback path for runtimes where sharp is unavailable (workerd); parses
+ * container headers only — no decoding.
+ */
+export function sniffImageDimensions(data: Uint8Array): {
+  width: number | null;
+  height: number | null;
+  mimeType: string | null;
+} {
+  const none = { width: null, height: null, mimeType: null };
+  if (data.length < 16) return none;
+  // PNG: IHDR width/height are big-endian uint32 at offsets 16/20.
+  if (
+    data[0] === 0x89 &&
+    data[1] === 0x50 &&
+    data[2] === 0x4e &&
+    data[3] === 0x47
+  ) {
+    if (data.length < 24) return { ...none, mimeType: "image/png" };
+    const view = new DataView(data.buffer, data.byteOffset, data.byteLength);
+    return {
+      width: view.getUint32(16),
+      height: view.getUint32(20),
+      mimeType: "image/png",
+    };
+  }
+  // JPEG: walk segment markers to the first SOF frame header.
+  if (data[0] === 0xff && data[1] === 0xd8 && data[2] === 0xff) {
+    const view = new DataView(data.buffer, data.byteOffset, data.byteLength);
+    let offset = 2;
+    while (offset + 9 < data.length) {
+      if (data[offset] !== 0xff) {
+        offset += 1;
+        continue;
+      }
+      const marker = data[offset + 1];
+      // Standalone markers without length payloads.
+      if (marker === 0xd8 || (marker >= 0xd0 && marker <= 0xd7)) {
+        offset += 2;
+        continue;
+      }
+      const isSof =
+        marker >= 0xc0 &&
+        marker <= 0xcf &&
+        marker !== 0xc4 &&
+        marker !== 0xc8 &&
+        marker !== 0xcc;
+      if (isSof) {
+        return {
+          height: view.getUint16(offset + 5),
+          width: view.getUint16(offset + 7),
+          mimeType: "image/jpeg",
+        };
+      }
+      const length = view.getUint16(offset + 2);
+      if (length < 2) break;
+      offset += 2 + length;
+    }
+    return { ...none, mimeType: "image/jpeg" };
+  }
+  // WebP: RIFF container; VP8/VP8L/VP8X chunks carry dimensions.
+  if (
+    Buffer.from(data.subarray(0, 4)).toString("ascii") === "RIFF" &&
+    Buffer.from(data.subarray(8, 12)).toString("ascii") === "WEBP" &&
+    data.length >= 30
+  ) {
+    const chunk = Buffer.from(data.subarray(12, 16)).toString("ascii");
+    const view = new DataView(data.buffer, data.byteOffset, data.byteLength);
+    if (chunk === "VP8X") {
+      return {
+        width: 1 + (data[24] | (data[25] << 8) | (data[26] << 16)),
+        height: 1 + (data[27] | (data[28] << 8) | (data[29] << 16)),
+        mimeType: "image/webp",
+      };
+    }
+    if (chunk === "VP8L" && data[20] === 0x2f) {
+      const bits = view.getUint32(21, true);
+      return {
+        width: (bits & 0x3fff) + 1,
+        height: ((bits >> 14) & 0x3fff) + 1,
+        mimeType: "image/webp",
+      };
+    }
+    if (chunk === "VP8 ") {
+      // Lossy keyframe: 3-byte frame tag then 9d 01 2a start code.
+      if (data[23] === 0x9d && data[24] === 0x01 && data[25] === 0x2a) {
+        return {
+          width: view.getUint16(26, true) & 0x3fff,
+          height: view.getUint16(28, true) & 0x3fff,
+          mimeType: "image/webp",
+        };
+      }
+      return { ...none, mimeType: "image/webp" };
+    }
+    return { ...none, mimeType: "image/webp" };
+  }
+  // AVIF: scan for the `ispe` (image spatial extents) property box —
+  // version/flags(4) width(4) height(4) big-endian after the fourcc.
+  if (
+    Buffer.from(data.subarray(4, 12)).toString("ascii").includes("ftyp") &&
+    Buffer.from(data.subarray(8, 12)).toString("ascii") === "avif"
+  ) {
+    const view = new DataView(data.buffer, data.byteOffset, data.byteLength);
+    const limit = Math.min(data.length - 16, 65536);
+    for (let i = 12; i < limit; i++) {
+      if (
+        data[i] === 0x69 && // i
+        data[i + 1] === 0x73 && // s
+        data[i + 2] === 0x70 && // p
+        data[i + 3] === 0x65 // e
+      ) {
+        return {
+          width: view.getUint32(i + 8),
+          height: view.getUint32(i + 12),
+          mimeType: "image/avif",
+        };
+      }
+    }
+    return { ...none, mimeType: "image/avif" };
+  }
+  return none;
+}
+
 export async function imageInfo(buffer: Buffer): Promise<{
   width: number | null;
   height: number | null;
   mimeType: string;
   sizeBytes: number;
 }> {
-  const img = sharp(buffer, { failOn: "none" });
-  const meta = await img.metadata();
-  const format = meta.format === "jpeg" ? "jpeg" : meta.format || "png";
-  return {
-    width: meta.width ?? null,
-    height: meta.height ?? null,
-    mimeType:
-      format === "jpg" || format === "jpeg" ? "image/jpeg" : `image/${format}`,
-    sizeBytes: buffer.byteLength,
-  };
+  try {
+    const img = sharp(buffer, { failOn: "none" });
+    const meta = await img.metadata();
+    const format = meta.format === "jpeg" ? "jpeg" : meta.format || "png";
+    return {
+      width: meta.width ?? null,
+      height: meta.height ?? null,
+      mimeType:
+        format === "jpg" || format === "jpeg"
+          ? "image/jpeg"
+          : `image/${format}`,
+      sizeBytes: buffer.byteLength,
+    };
+  } catch (error) {
+    if (!isSharpUnavailableError(error)) throw error;
+    // Passthrough-for-originals: header-parse dimensions so uploads keep
+    // working on runtimes without sharp. Callers fall back to the declared
+    // mime type when the sniffer returns null.
+    const sniffed = sniffImageDimensions(buffer);
+    return {
+      width: sniffed.width,
+      height: sniffed.height,
+      mimeType: sniffed.mimeType ?? "",
+      sizeBytes: buffer.byteLength,
+    };
+  }
 }
 
 export async function makeThumbnail(buffer: Buffer): Promise<{
   buffer: Buffer;
   mimeType: string;
-}> {
-  return {
-    buffer: await sharp(buffer, { failOn: "none" })
-      .rotate()
-      .resize({
-        width: 640,
-        height: 640,
-        fit: "inside",
-        withoutEnlargement: true,
-      })
-      .webp({ quality: 82 })
-      .toBuffer(),
-    mimeType: "image/webp",
-  };
+} | null> {
+  try {
+    return {
+      buffer: await sharp(buffer, { failOn: "none" })
+        .rotate()
+        .resize({
+          width: 640,
+          height: 640,
+          fit: "inside",
+          withoutEnlargement: true,
+        })
+        .webp({ quality: 82 })
+        .toBuffer(),
+      mimeType: "image/webp",
+    };
+  } catch (error) {
+    if (!isSharpUnavailableError(error)) throw error;
+    // No thumbnail on runtimes without sharp — readers already fall back to
+    // the original asset when `thumbnailObjectKey` is null.
+    return null;
+  }
 }
 
 export async function extractDominantColors(buffer: Buffer): Promise<string[]> {

package/corpus/templates/calendar/app/root.tsx

@@ -239,7 +239,10 @@ export default function Root() {
     }),
   );
   const location = useLocation();
-  const loaderData = useLoaderData<typeof loader>();
+  // Static-shell serverless deployments never run the root loader (the
+  // client manifest strips hasLoader), so loader data can be null at
+  // hydration — fall back exactly like Layout does.
+  const loaderData = useLoaderData<typeof loader>() ?? DEFAULT_LOADER_DATA;
   const isPublicPath = isPublicBookingPath(location.pathname);
 
   return (

package/corpus/templates/clips/app/root.tsx

@@ -379,7 +379,10 @@ function AppContent() {
  */
 export default function Root() {
   const location = useLocation();
-  const loaderData = useLoaderData<typeof loader>();
+  // Static-shell serverless deployments never run the root loader (the
+  // client manifest strips hasLoader), so loader data can be null at
+  // hydration — fall back exactly like Layout does.
+  const loaderData = useLoaderData<typeof loader>() ?? DEFAULT_LOADER_DATA;
   const [queryClient] = useState(() => createAgentNativeQueryClient());
   return (
     <AppToolkitProvider>

package/corpus/templates/content/app/root.tsx

@@ -547,7 +547,10 @@ export default function Root() {
   const [queryClient] = useState(() => createAgentNativeQueryClient());
   const [cmdkOpen, setCmdkOpen] = useState(false);
   const location = useLocation();
-  const loaderData = useLoaderData<typeof loader>();
+  // Static-shell serverless deployments never run the root loader (the
+  // client manifest strips hasLoader), so loader data can be null at
+  // hydration — fall back exactly like Layout does.
+  const loaderData = useLoaderData<typeof loader>() ?? DEFAULT_LOADER_DATA;
   useCommandMenuShortcut(
     useCallback(() => setCmdkOpen(true), []),
     {

package/dist/deploy/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/deploy/build.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/deploy/build.ts"],"names":[],"mappings":"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"}

package/dist/deploy/build.js

@@ -1501,7 +1501,14 @@ export function generateCloudflarePagesStaticShellFromManifest(manifest, basePat
     const encodedInitialState = rootRoute.hasLoader
         ? DEFAULT_ROOT_LOADER_REACT_ROUTER_TURBO_STREAM
         : EMPTY_REACT_ROUTER_TURBO_STREAM;
-    return `<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"/><link rel="manifest" href="/manifest.json"/><link rel="icon" type="image/svg+xml" href="/favicon.svg"/>${modulePreloads}${stylesheets}</head><body><div style="display:flex;align-items:center;justify-content:center;height:100vh;width:100%"><svg role="status" aria-label="Loading" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" style="animation:an-spin 1s linear infinite;opacity:0.7"><path d="M21 12a9 9 0 1 1-6.219-8.56"></path></svg><style>@keyframes an-spin { to { transform: rotate(360deg) } } @media (prefers-color-scheme: dark) { html { background: #09090b; color: #fafafa } }</style></div><script>window.__reactRouterContext = ${JSON.stringify(context)};window.__reactRouterContext.stream = new ReadableStream({start(controller){window.__reactRouterContext.streamController = controller;}}).pipeThrough(new TextEncoderStream());</script><script type="module" async="">${routeModuleScript}</script><!--$--><script>window.__reactRouterContext.streamController.enqueue(${JSON.stringify(encodedInitialState)});</script><!--$--><script>window.__reactRouterContext.streamController.close();</script><!--/$--><!--/$--></body></html>`;
+    // Match the <html> attributes the root route renders during hydration with
+    // the embedded default root-loader state (locale/dir), so recovering from
+    // the fallback shell does not add an attribute mismatch on top of the
+    // structural one.
+    const htmlTag = rootRoute.hasLoader
+        ? '<html lang="en-US" dir="ltr" data-locale="en-US">'
+        : '<html lang="en">';
+    return `<!DOCTYPE html>${htmlTag}<head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"/><link rel="manifest" href="/manifest.json"/><link rel="icon" type="image/svg+xml" href="/favicon.svg"/>${modulePreloads}${stylesheets}</head><body><div style="display:flex;align-items:center;justify-content:center;height:100vh;width:100%"><svg role="status" aria-label="Loading" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" style="animation:an-spin 1s linear infinite;opacity:0.7"><path d="M21 12a9 9 0 1 1-6.219-8.56"></path></svg><style>@keyframes an-spin { to { transform: rotate(360deg) } } @media (prefers-color-scheme: dark) { html { background: #09090b; color: #fafafa } }</style></div><script>window.__reactRouterContext = ${JSON.stringify(context)};window.__reactRouterContext.stream = new ReadableStream({start(controller){window.__reactRouterContext.streamController = controller;}}).pipeThrough(new TextEncoderStream());</script><script type="module" async="">${routeModuleScript}</script><!--$--><script>window.__reactRouterContext.streamController.enqueue(${JSON.stringify(encodedInitialState)});</script><!--$--><script>window.__reactRouterContext.streamController.close();</script><!--/$--><!--/$--></body></html>`;
 }
 function writeCloudflarePagesStaticShell({ serverDir, distDir, tmpDir, }) {
     const serverEntry = path.join(serverDir, "index.js");
@@ -1513,32 +1520,118 @@ function writeCloudflarePagesStaticShell({ serverDir, distDir, tmpDir, }) {
     const basePath = normalizeConfiguredAppBasePath();
     fs.writeFileSync(renderScript, `
 import fs from "node:fs";
-import { createRequire } from "node:module";
+import Module, { createRequire } from "node:module";
 import { pathToFileURL } from "node:url";
 
 const cwd = ${JSON.stringify(cwd)};
 const serverEntry = ${JSON.stringify(serverEntry)};
 const outFile = ${JSON.stringify(outFile)};
 const basePath = ${JSON.stringify(basePath)};
+// The framework package's own module URL: bundled server chunks can import
+// packages (yjs, prosemirror-*) that are transitive framework dependencies
+// and not resolvable from the app directory under strict pnpm layouts. When
+// app-relative resolution fails, retry from the framework's own context.
+const frameworkParentUrl = ${JSON.stringify(import.meta.url)};
+
+if (typeof Module.registerHooks === "function") {
+  Module.registerHooks({
+    resolve(specifier, context, nextResolve) {
+      try {
+        return nextResolve(specifier, context);
+      } catch (error) {
+        if (context?.parentURL && context.parentURL !== frameworkParentUrl) {
+          try {
+            return nextResolve(specifier, { ...context, parentURL: frameworkParentUrl });
+          } catch {}
+        }
+        throw error;
+      }
+    },
+  });
+}
 
 const requireFromApp = createRequire(cwd + "/package.json");
 const reactRouterEntry = requireFromApp.resolve("react-router");
 const { createRequestHandler } = await import(pathToFileURL(reactRouterEntry).href);
 const serverBuild = await import(pathToFileURL(serverEntry).href);
 const handler = createRequestHandler(serverBuild, "production");
-const pathname = basePath ? basePath + "/" : "/";
-const response = await handler(
-  new Request(new URL(pathname, "https://agent-native.local"), {
-    headers: { "X-React-Router-SPA-Mode": "yes" },
-  }),
-);
-const html = await response.text();
 
-if (!html || !html.includes("__reactRouterContext") || !html.includes("entry.client")) {
-  throw new Error("React Router did not render a usable Cloudflare Pages static shell");
+const origin = "https://agent-native.local";
+const normalizedBase = basePath ? basePath.replace(/\\/+$/, "") : "";
+
+function isUsable(html) {
+  return Boolean(
+    html && html.includes("__reactRouterContext") && html.includes("entry.client"),
+  );
 }
 
-fs.writeFileSync(outFile, html);
+// Render a path, following same-origin redirects (index routes commonly
+// redirect "/" to the real landing page). Server builds compiled with an
+// unprefixed router basename ("/") emit redirect targets that still carry
+// the mount prefix — strip it before re-requesting.
+async function renderPath(startPath) {
+  let pathname = startPath;
+  let response;
+  for (let hop = 0; hop < 5; hop++) {
+    response = await handler(
+      new Request(new URL(pathname, origin), {
+        headers: { "X-React-Router-SPA-Mode": "yes" },
+      }),
+    );
+    if (response.status < 300 || response.status >= 400) break;
+    const location = response.headers.get("location");
+    if (!location) break;
+    const target = new URL(location, new URL(pathname, origin));
+    if (target.origin !== origin) break;
+    let nextPath = target.pathname;
+    if (
+      normalizedBase &&
+      (nextPath === normalizedBase || nextPath.startsWith(normalizedBase + "/")) &&
+      !(startPath === normalizedBase + "/" || startPath.startsWith(normalizedBase + "/"))
+    ) {
+      nextPath = nextPath.slice(normalizedBase.length) || "/";
+    }
+    if (nextPath === pathname) break;
+    pathname = nextPath;
+  }
+  const html = await response.text();
+  return { pathname, status: response.status, html };
+}
+
+// Route matching varies per template: some builds register routes under the
+// mount prefix, others compile with basename "/" and rely on the worker
+// entry stripping the prefix. Try both shapes and prefer a 2xx render;
+// otherwise keep the first usable render of any status (apps without an
+// index route ship their root-boundary render as the shell).
+const candidates = normalizedBase ? [normalizedBase + "/", "/"] : ["/"];
+let best = null;
+for (const candidate of candidates) {
+  let result;
+  try {
+    result = await renderPath(candidate);
+  } catch (error) {
+    console.warn("[deploy] Static shell render threw at " + candidate + ": " + (error && error.message ? error.message : error));
+    continue;
+  }
+  if (!isUsable(result.html)) continue;
+  if (result.status >= 200 && result.status < 300) {
+    best = result;
+    break;
+  }
+  if (!best) best = result;
+}
+
+if (!best) {
+  throw new Error(
+    "React Router did not render a usable Cloudflare Pages static shell for any of: " +
+      candidates.join(", "),
+  );
+}
+
+console.log(
+  "[deploy] Static shell rendered from " + best.pathname + " (status " + best.status + ").",
+);
+fs.writeFileSync(outFile, best.html);
 process.exit(0);
 `);
     try {