Skip to content

Write HTML. Render video. Built for agents.

fix(cli): check, snapshot and Studio read project text as UTF-8 (#5843)

Miguel Ángel6d357ff0d8db
diff --git a/packages/cli/src/commands/play.test.ts b/packages/cli/src/commands/play.test.ts
index 7af3fccf99..b8528038c1 100644
--- a/packages/cli/src/commands/play.test.ts
+++ b/packages/cli/src/commands/play.test.ts
@@ -216,6 +216,26 @@ describe("registerCompositionRoute", () => {
expect(await ranged.text()).toBe("<svg");
});
+ it("serves a same-size, same-mtime JSON edit fresh, labelled UTF-8", async () => {
+ const project = tmpProject();
+ const data = join(project.dir, "data.json");
+ const pinned = new Date("2026-01-01T00:00:00Z");
+ writeFileSync(data, '{"value":1}');
+ utimesSync(data, pinned, pinned);
+ const app = await buildApp(project, false);
+ const first = await app.request("/composition/data.json");
+ expect(first.headers.get("Content-Type")).toBe("application/json; charset=utf-8");
+ const etag = first.headers.get("ETag") ?? "";
+
+ writeFileSync(data, '{"value":2}');
+ utimesSync(data, pinned, pinned);
+ const edited = await app.request("/composition/data.json", {
+ headers: { "If-None-Match": etag },
+ });
+ expect(edited.status).toBe(200);
+ expect(await edited.text()).toBe('{"value":2}');
+ });
+
it("answers a Range request on a plain asset with 206 + the requested byte slice", async () => {
const project = tmpProject();
writeFileSync(join(project.dir, "clip.mp4"), Buffer.from("0123456789", "utf-8"));
diff --git a/packages/cli/src/commands/play.ts b/packages/cli/src/commands/play.ts
index ec1dc48e71..2b955e692f 100644
--- a/packages/cli/src/commands/play.ts
+++ b/packages/cli/src/commands/play.ts
@@ -238,10 +238,11 @@ export async function registerCompositionRoute(
const contentType = assetContentType(filePath);
// Edited text is caught by a content hash; an mtime tag can repeat for a same-size rewrite.
+ const mediaType = contentType.split(";")[0]!.trim();
const isText =
- contentType.startsWith("text/") ||
- contentType === "application/json" ||
- contentType === "image/svg+xml";
+ mediaType.startsWith("text/") ||
+ mediaType === "application/json" ||
+ mediaType === "image/svg+xml";
if (isText && !ctx.req.header("Range")) {
return revalidatedResponse(
readFileSync(filePath, "utf-8"),
diff --git a/packages/cli/src/server/studioServer.file-race.test.ts b/packages/cli/src/server/studioServer.file-race.test.ts
index 18f74b0cce..384ce2b974 100644
--- a/packages/cli/src/server/studioServer.file-race.test.ts
+++ b/packages/cli/src/server/studioServer.file-race.test.ts
@@ -152,7 +152,7 @@ describe("Studio bundle file reads", () => {
// while the hand-authored public/ files keep revalidating. Cache policy
// itself is owned by studioServer.staticAssets.test.ts.
it.each([
- ["assets/main.js", "text/javascript", "public, max-age=31536000, immutable"],
+ ["assets/main.js", "text/javascript; charset=utf-8", "public, max-age=31536000, immutable"],
["icons/logo.svg", "image/svg+xml", "no-store"],
["favicon.svg", "image/svg+xml", "no-store"],
])("preserves %s MIME and cache headers", async (name, mime, cacheControl) => {
@@ -190,7 +190,7 @@ describe("Studio bundle file reads", () => {
};
const response = await server.app.request("/api/runtime.js");
expect(response.status).toBe(200);
- expect(response.headers.get("content-type")).toBe("text/javascript");
+ expect(response.headers.get("content-type")).toBe("text/javascript; charset=utf-8");
expect(response.headers.get("cache-control")).toBe("no-store");
expect(await response.text()).toBe("checked runtime");
expectClosed();
diff --git a/packages/cli/src/server/studioServer.ts b/packages/cli/src/server/studioServer.ts
index da920e7ff2..6937390639 100644
--- a/packages/cli/src/server/studioServer.ts
+++ b/packages/cli/src/server/studioServer.ts
@@ -889,7 +889,7 @@ export function createStudioServer(options: StudioServerOptions): StudioServer {
(await loadRuntimeSource()) ?? readBundleFile(runtimePath)?.toString("utf-8") ?? null;
if (!runtimeSource) return c.text("runtime not available", 404);
return c.body(runtimeSource, 200, {
- "Content-Type": "text/javascript",
+ "Content-Type": getMimeType("runtime.js"),
"Cache-Control": "no-store",
});
};
diff --git a/packages/cli/src/utils/staticProjectServer.charset.browser.test.ts b/packages/cli/src/utils/staticProjectServer.charset.browser.test.ts
new file mode 100644
index 0000000000..c83c2e1813
--- /dev/null
+++ b/packages/cli/src/utils/staticProjectServer.charset.browser.test.ts
@@ -0,0 +1,39 @@
+import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { expect, it } from "vitest";
+import { openSettledCompositionPage } from "../capture/captureCompositionFrame.js";
+import { serveStaticProjectHtml } from "./staticProjectServer.js";
+
+// Past Chrome's 1024-byte prescan and outside <head>, a <meta charset> is ignored; the page must still be UTF-8.
+const HTML = `<!doctype html><html><head><style>p{margin:0}/*${"x".repeat(2048)}*/</style></head><body>
+<meta charset="UTF-8" />
+<div data-composition-id="main" data-width="320" data-height="180" data-duration="1">
+<p id="raw">Café è ù ✓</p></div>
+<script>window.__renderReady = true;</script></body></html>`;
+
+it("shows accented text as written when the page's meta charset is not in its head", async () => {
+ const projectDir = mkdtempSync(join(tmpdir(), "hf-charset-"));
+ writeFileSync(join(projectDir, "index.html"), HTML);
+ const server = await serveStaticProjectHtml(projectDir, HTML);
+ try {
+ const { browser, page } = await openSettledCompositionPage(HTML, server.url, {
+ renderReadyTimeoutMs: 5_000,
+ renderReadyWarningSuffix: "test",
+ browserGpuMode: "software",
+ });
+ try {
+ expect(
+ await page.evaluate(() => ({
+ charset: document.characterSet,
+ raw: document.getElementById("raw")?.textContent,
+ })),
+ ).toEqual({ charset: "UTF-8", raw: "Café è ù ✓" });
+ } finally {
+ await browser.close();
+ }
+ } finally {
+ await server.close();
+ rmSync(projectDir, { recursive: true, force: true });
+ }
+}, 90_000);
diff --git a/packages/cli/src/utils/staticProjectServer.test.ts b/packages/cli/src/utils/staticProjectServer.test.ts
index 49cec4c265..2992bd8958 100644
--- a/packages/cli/src/utils/staticProjectServer.test.ts
+++ b/packages/cli/src/utils/staticProjectServer.test.ts
@@ -238,6 +238,17 @@ describe("serveStaticProjectHtml asset roots", () => {
expect(await res.text()).toBe("PIXELS");
});
+ it("labels the page and its scripts UTF-8 so text without a meta charset is not misread", async () => {
+ const projectDir = mk();
+ writeFileSync(join(projectDir, "scene.js"), 'document.title = "太阳系";');
+ server = await serveStaticProjectHtml(projectDir, "<h1>太阳系科普动画</h1>");
+
+ const page = await fetch(server.url);
+ const script = await fetch(`${server.url}scene.js`);
+ expect(page.headers.get("content-type")).toBe("text/html; charset=utf-8");
+ expect(script.headers.get("content-type")).toBe("text/javascript; charset=utf-8");
+ });
+
it("prefers the project dir over an asset root for the same path", async () => {
const projectDir = mk();
const assetDir = mk();
diff --git a/packages/cli/src/utils/staticProjectServer.ts b/packages/cli/src/utils/staticProjectServer.ts
index f6804b004d..c91d3e0028 100644
--- a/packages/cli/src/utils/staticProjectServer.ts
+++ b/packages/cli/src/utils/staticProjectServer.ts
@@ -270,7 +270,7 @@ export async function serveStaticProjectHtml(
const server = createServer((req, res) => {
const url = req.url ?? "/";
if (url === "/" || url === "/index.html") {
- res.writeHead(200, { "Content-Type": "text/html" });
+ res.writeHead(200, { "Content-Type": getMimeType("index.html") });
res.end(servedHtml);
return;
}
diff --git a/packages/studio-server/src/helpers/mime.ts b/packages/studio-server/src/helpers/mime.ts
index 2a47807331..3394f35795 100644
--- a/packages/studio-server/src/helpers/mime.ts
+++ b/packages/studio-server/src/helpers/mime.ts
@@ -1,9 +1,9 @@
export const MIME_TYPES: Record<string, string> = {
- ".html": "text/html",
- ".css": "text/css",
- ".js": "text/javascript",
- ".mjs": "text/javascript",
- ".json": "application/json",
+ ".html": "text/html; charset=utf-8",
+ ".css": "text/css; charset=utf-8",
+ ".js": "text/javascript; charset=utf-8",
+ ".mjs": "text/javascript; charset=utf-8",
+ ".json": "application/json; charset=utf-8",
".svg": "image/svg+xml",
".png": "image/png",
".jpg": "image/jpeg",