mirror of
https://github.com/cloudflare/vinext.git
synced 2026-09-14 19:04:59 +08:00
de33c3e5a0
* fix(build): inline ../-relative font assets in OG routes
The vinext:og-inline-fetch-assets plugin only matched paths starting
with "./" (e.g. "./font.ttf"), but Next.js test fixtures for OG custom
fonts use "../"-relative paths like "../../../assets/typewr__.ttf".
Without the inline, at runtime:
- Cloudflare Workers: import.meta.url is "worker" (not a URL), so
new URL("../../../assets/...", import.meta.url) throws TypeError.
- Node.js: fetch() does not support file:// URLs, so the inlined
file:// URL produced by the import-meta-url plugin fails.
Fix: relax the regex from `\.\/[^"']+` to `\.[^"']+` so any
dot-relative path (./x, ../x, ../../x, etc.) is inlined as base64.
Apply the same fix to the readFileSync(fileURLToPath(...)) pattern.
Failing tests addressed:
- test/e2e/og-routes-custom-font: should render og with custom font
for app routes (edge runtime fetch + Node.js fs.promises.readFile)
- test/e2e/app-dir/metadata-font: should handle custom fonts in both
edge and nodejs runtime
* fix(build): inline OG font assets when a formatter adds a trailing comma
The vinext:og-inline-fetch-assets regex only matched the single-line,
comma-less form of `fetch(new URL(...)).then((res) => res.arrayBuffer())`.
When a formatter (Prettier `trailingComma: "all"`, oxfmt) wraps the call
across lines it appends a trailing comma:
.then((res) =>
res.arrayBuffer(),
)
which no longer matched, so the font was left as a runtime fetch. On
Cloudflare Workers `import.meta.url` is "worker", so
`new URL("../...", "worker")` throws "TypeError: Invalid URL" and the OG
route returns 500 — even though the ../-relative path itself was already
supported. Relax both `.then(...)` alternatives with an optional `,?`.
Add real e2e coverage (`/api/og-custom-font`) mirroring Next.js'
og-routes-custom-font fixture: an edge OG route that loads
assets/noto-sans.ttf via
`fetch(new URL("../../../assets/noto-sans.ttf", import.meta.url))`. It
runs in tests/e2e/og-image.spec.ts across the app-router (Node dev),
cloudflare-dev and cloudflare-workers (workerd) projects, with the route
and font added to both the app-basic fixture and the app-router-cloudflare
example. Also adds a unit test for the formatted/trailing-comma shape in
tests/og-inline.test.ts.
* fix(build): inline OG font assets with a semicolon-terminated block body
Follow-up from the /bigbonk review on PR #1866: the block-body alternative
of the og-inline-fetch-assets regex ended `…\.arrayBuffer\(\)\s*\}?\s*,?\s*\)`
with no allowance for a `;` before `}`, so formatter output such as
.then((res) => {
return res.arrayBuffer();
})
.then(function (res) { return res.arrayBuffer(); })
was left as a runtime fetch — which throws "Invalid URL" on Workers
(import.meta.url === "worker"). Add `;?` before the block-body `}` and unit
tests for the arrow- and function-expression block-body forms.
261 lines
12 KiB
TypeScript
261 lines
12 KiB
TypeScript
import { describe, it, expect, vi, beforeAll, afterAll, afterEach } from "vite-plus/test";
|
|
import vinext from "../packages/vinext/src/index.js";
|
|
import type { Plugin } from "vite-plus";
|
|
import fs from "node:fs";
|
|
import fsp from "node:fs/promises";
|
|
import os from "node:os";
|
|
import path from "node:path";
|
|
|
|
// ── Helpers ───────────────────────────────────────────────────
|
|
|
|
/** Unwrap a Vite plugin hook that may use the object-with-filter format */
|
|
function unwrapHook(hook: any): Function {
|
|
return typeof hook === "function" ? hook : hook?.handler;
|
|
}
|
|
|
|
/**
|
|
* Create a fresh vinext:og-inline-fetch-assets plugin instance.
|
|
* Each call gets an independent cache so tests do not share state.
|
|
*/
|
|
function createOgInlinePlugin(command: "serve" | "build" = "serve"): Plugin {
|
|
const plugins = vinext() as Plugin[];
|
|
const plugin = plugins.find((p) => p.name === "vinext:og-inline-fetch-assets");
|
|
if (!plugin) throw new Error("vinext:og-inline-fetch-assets plugin not found");
|
|
const configResolved = unwrapHook(plugin.configResolved);
|
|
configResolved?.call(plugin, { command });
|
|
return plugin;
|
|
}
|
|
|
|
// ── Test fixture setup ────────────────────────────────────────
|
|
|
|
let tmpDir: string;
|
|
const fontContent = Buffer.from("fake-font-data-for-testing");
|
|
const fontBase64 = fontContent.toString("base64");
|
|
|
|
beforeAll(async () => {
|
|
tmpDir = await fsp.mkdtemp(path.join(os.tmpdir(), "og-inline-test-"));
|
|
await fsp.writeFile(path.join(tmpDir, "noto-sans.ttf"), fontContent);
|
|
});
|
|
|
|
afterAll(async () => {
|
|
await fsp.rm(tmpDir, { recursive: true, force: true });
|
|
});
|
|
|
|
// ── Tests ─────────────────────────────────────────────────────
|
|
|
|
describe("vinext:og-inline-fetch-assets plugin", () => {
|
|
afterEach(() => vi.restoreAllMocks());
|
|
|
|
it("exists in the plugin array", () => {
|
|
const plugin = createOgInlinePlugin();
|
|
expect(plugin.name).toBe("vinext:og-inline-fetch-assets");
|
|
expect(plugin.enforce).toBe("pre");
|
|
});
|
|
|
|
// ── Guard clause ──────────────────────────────────────────
|
|
|
|
it("returns null when code has no import.meta.url", async () => {
|
|
const plugin = createOgInlinePlugin();
|
|
const transform = unwrapHook(plugin.transform);
|
|
const code = `import fs from 'node:fs';\nconst x = 1;`;
|
|
const result = await transform.call(plugin, code, "/app/og.tsx");
|
|
expect(result).toBeNull();
|
|
});
|
|
|
|
// ── Pattern 1: fetch ─────────────────────────────────────
|
|
|
|
it("transforms fetch(new URL(..., import.meta.url)).then(r => r.arrayBuffer())", async () => {
|
|
const plugin = createOgInlinePlugin();
|
|
const transform = unwrapHook(plugin.transform);
|
|
const code = `const data = fetch(new URL("./noto-sans.ttf", import.meta.url)).then((res) => res.arrayBuffer());`;
|
|
const moduleId = path.join(tmpDir, "og.tsx");
|
|
|
|
const result = await transform.call(plugin, code, moduleId);
|
|
expect(result).not.toBeNull();
|
|
// The font's base64 contents must be inlined and the runtime fetch eliminated.
|
|
expect(result.code).toContain(fontBase64);
|
|
expect(result.code).not.toContain("fetch(");
|
|
});
|
|
|
|
it("transforms fetch(new URL(..., import.meta.url)) with ../-relative path", async () => {
|
|
// Fixtures like og-routes-custom-font and metadata-font use paths such as
|
|
// "../../../assets/typewr__.ttf" (three levels up from the route file to
|
|
// the project-root assets/ directory). The plugin must resolve these just
|
|
// as it does ./-relative paths.
|
|
const plugin = createOgInlinePlugin();
|
|
const transform = unwrapHook(plugin.transform);
|
|
// Module lives at tmpDir/app/app/og/route.tsx → font is three levels up
|
|
const routeDir = path.join(tmpDir, "app", "app", "og");
|
|
await fsp.mkdir(routeDir, { recursive: true });
|
|
const code = `const data = fetch(new URL("../../../noto-sans.ttf", import.meta.url)).then((res) => res.arrayBuffer());`;
|
|
const moduleId = path.join(routeDir, "route.tsx");
|
|
|
|
const result = await transform.call(plugin, code, moduleId);
|
|
expect(result).not.toBeNull();
|
|
expect(result.code).toContain(fontBase64);
|
|
expect(result.code).not.toContain("fetch(");
|
|
});
|
|
|
|
it("transforms fetch().then() that a formatter wrapped across lines with a trailing comma", async () => {
|
|
// Real-world regression: formatters (Prettier `trailingComma: "all"`, oxfmt)
|
|
// wrap a long fetch().then() across multiple lines and add a trailing comma:
|
|
// const font = await fetch(new URL("../../../assets/noto-sans.ttf", import.meta.url)).then(
|
|
// (res) => res.arrayBuffer(),
|
|
// );
|
|
// The earlier regex only matched the single-line, comma-less form, so formatted
|
|
// source was left as a runtime fetch — which throws "Invalid URL" on Workers
|
|
// (import.meta.url === "worker") and returns a 500. See the /api/og-custom-font
|
|
// e2e in tests/e2e/og-image.spec.ts.
|
|
const plugin = createOgInlinePlugin();
|
|
const transform = unwrapHook(plugin.transform);
|
|
const code = [
|
|
`const font = await fetch(new URL("./noto-sans.ttf", import.meta.url)).then((res) =>`,
|
|
` res.arrayBuffer(),`,
|
|
`);`,
|
|
].join("\n");
|
|
const moduleId = path.join(tmpDir, "og.tsx");
|
|
|
|
const result = await transform.call(plugin, code, moduleId);
|
|
expect(result).not.toBeNull();
|
|
expect(result.code).toContain(fontBase64);
|
|
expect(result.code).not.toContain("fetch(");
|
|
});
|
|
|
|
it("transforms a block-body .then() callback whose return ends with a semicolon", async () => {
|
|
// Formatters terminate a block-body `return` with a semicolon:
|
|
// .then((res) => {
|
|
// return res.arrayBuffer();
|
|
// })
|
|
// The block-body alternative must tolerate the `;` before `}` (and a trailing
|
|
// comma). Without `;?` this stayed a runtime fetch → "Invalid URL" on Workers.
|
|
const plugin = createOgInlinePlugin();
|
|
const transform = unwrapHook(plugin.transform);
|
|
const code = [
|
|
`const font = await fetch(new URL("./noto-sans.ttf", import.meta.url)).then((res) => {`,
|
|
` return res.arrayBuffer();`,
|
|
`});`,
|
|
].join("\n");
|
|
const moduleId = path.join(tmpDir, "og.tsx");
|
|
|
|
const result = await transform.call(plugin, code, moduleId);
|
|
expect(result).not.toBeNull();
|
|
expect(result.code).toContain(fontBase64);
|
|
expect(result.code).not.toContain("fetch(");
|
|
});
|
|
|
|
it("transforms a function-expression .then() callback whose return ends with a semicolon", async () => {
|
|
// Same as above but with a `function (res) { ... }` callback instead of an arrow.
|
|
const plugin = createOgInlinePlugin();
|
|
const transform = unwrapHook(plugin.transform);
|
|
const code = `const font = await fetch(new URL("./noto-sans.ttf", import.meta.url)).then(function (res) { return res.arrayBuffer(); });`;
|
|
const moduleId = path.join(tmpDir, "og.tsx");
|
|
|
|
const result = await transform.call(plugin, code, moduleId);
|
|
expect(result).not.toBeNull();
|
|
expect(result.code).toContain(fontBase64);
|
|
expect(result.code).not.toContain("fetch(");
|
|
});
|
|
|
|
// ── Pattern 2: readFileSync ──────────────────────────────
|
|
|
|
it("transforms fs.readFileSync(fileURLToPath(new URL(..., import.meta.url)))", async () => {
|
|
const plugin = createOgInlinePlugin();
|
|
const transform = unwrapHook(plugin.transform);
|
|
const code = `const buf = fs.readFileSync(fileURLToPath(new URL("./noto-sans.ttf", import.meta.url)));`;
|
|
const moduleId = path.join(tmpDir, "og.tsx");
|
|
|
|
const result = await transform.call(plugin, code, moduleId);
|
|
expect(result).not.toBeNull();
|
|
// Font contents inlined as base64 and the runtime fs read eliminated.
|
|
expect(result.code).toContain(fontBase64);
|
|
expect(result.code).not.toContain("readFileSync");
|
|
});
|
|
|
|
it("transforms fs.readFileSync(fileURLToPath(new URL(..., import.meta.url))) with ../-relative path", async () => {
|
|
// Same pattern as above but with a ../ path traversal — mirrors metadata-font fixtures.
|
|
const plugin = createOgInlinePlugin();
|
|
const transform = unwrapHook(plugin.transform);
|
|
const routeDir = path.join(tmpDir, "app", "font");
|
|
await fsp.mkdir(routeDir, { recursive: true });
|
|
const code = `const buf = fs.readFileSync(fileURLToPath(new URL("../../noto-sans.ttf", import.meta.url)));`;
|
|
const moduleId = path.join(routeDir, "opengraph-image.tsx");
|
|
|
|
const result = await transform.call(plugin, code, moduleId);
|
|
expect(result).not.toBeNull();
|
|
expect(result.code).toContain(fontBase64);
|
|
expect(result.code).not.toContain("readFileSync");
|
|
});
|
|
|
|
// ── File not found ───────────────────────────────────────
|
|
|
|
it("silently skips when the referenced file does not exist", async () => {
|
|
const plugin = createOgInlinePlugin();
|
|
const transform = unwrapHook(plugin.transform);
|
|
const code = `const data = fetch(new URL("./nonexistent.ttf", import.meta.url)).then((res) => res.arrayBuffer());`;
|
|
const moduleId = path.join(tmpDir, "og.tsx");
|
|
|
|
const result = await transform.call(plugin, code, moduleId);
|
|
// No file found → no replacement → returns null
|
|
expect(result).toBeNull();
|
|
});
|
|
|
|
// ── Async assertion ──────────────────────────────────────
|
|
|
|
it("returns a Promise (hook is async)", () => {
|
|
const plugin = createOgInlinePlugin();
|
|
const transform = unwrapHook(plugin.transform);
|
|
const code = `const data = fetch(new URL("./noto-sans.ttf", import.meta.url)).then((res) => res.arrayBuffer());`;
|
|
const moduleId = path.join(tmpDir, "og.tsx");
|
|
|
|
const result = transform.call(plugin, code, moduleId);
|
|
expect(result).toBeInstanceOf(Promise);
|
|
return result;
|
|
});
|
|
|
|
// ── Build cache hit ──────────────────────────────────────
|
|
|
|
it("reads the file only once for repeated build transforms (cache hit)", async () => {
|
|
const readFileSpy = vi.spyOn(fs.promises, "readFile");
|
|
|
|
const plugin = createOgInlinePlugin("build");
|
|
const transform = unwrapHook(plugin.transform);
|
|
const code = `const buf = fs.readFileSync(fileURLToPath(new URL("./noto-sans.ttf", import.meta.url)));`;
|
|
const moduleId = path.join(tmpDir, "og.tsx");
|
|
|
|
// First call — should read from disk
|
|
await transform.call(plugin, code, moduleId);
|
|
|
|
// Second call — should use cache
|
|
await transform.call(plugin, code, moduleId);
|
|
|
|
// Exactly once: first call reads from disk, second call hits the build cache.
|
|
const calls = readFileSpy.mock.calls.filter(
|
|
(call) => call[0] === path.join(tmpDir, "noto-sans.ttf"),
|
|
);
|
|
expect(calls.length).toBe(1);
|
|
});
|
|
|
|
// ── Dev mode stays fresh ─────────────────────────────────
|
|
|
|
it("does not cache asset contents across serve transforms", async () => {
|
|
const devFontPath = path.join(tmpDir, "dev-font.ttf");
|
|
const initialFontBase64 = Buffer.from("dev-font-v1").toString("base64");
|
|
const updatedFontBase64 = Buffer.from("dev-font-v2").toString("base64");
|
|
await fsp.writeFile(devFontPath, Buffer.from("dev-font-v1"));
|
|
|
|
const plugin = createOgInlinePlugin("serve");
|
|
const transform = unwrapHook(plugin.transform);
|
|
const code = `const buf = fs.readFileSync(fileURLToPath(new URL("./dev-font.ttf", import.meta.url)));`;
|
|
const moduleId = path.join(tmpDir, "og.tsx");
|
|
|
|
const firstResult = await transform.call(plugin, code, moduleId);
|
|
expect(firstResult.code).toContain(initialFontBase64);
|
|
|
|
await fsp.writeFile(devFontPath, Buffer.from("dev-font-v2"));
|
|
|
|
const secondResult = await transform.call(plugin, code, moduleId);
|
|
expect(secondResult.code).toContain(updatedFontBase64);
|
|
expect(secondResult.code).not.toContain(initialFontBase64);
|
|
});
|
|
});
|