mirror of
https://github.com/cloudflare/vinext.git
synced 2026-09-14 19:04:59 +08:00
d504f022b0
* fix(assets): default assetsDir to _next/static (Next.js parity) Closes #1337. Supersedes #1383. vinext's default `assetsDir` was Vite's historical `assets/`, so URL emission (`/_next/static/...` via `resolveAssetUrlPrefix("")`) and on-disk layout (`dist/client/assets/...`) disagreed in the empty-`assetPrefix` case. The `build.assetsDir` and `experimental.renderBuiltUrl` Vite overrides only applied when `assetPrefix` was configured, leaving the no-prefix branch serving from a different path than the URL contract Next.js's client runtime and test harness assert against. This commit flips the default to Next.js's canonical layout: - `resolveAssetsDir("")` returns `_next/static` (was `assets`) - `build.assetsDir` is now set unconditionally from `resolveAssetsDir` - Vite's default `base + assetsDir` composition produces correct URLs in the no-prefix case; `renderBuiltUrl` stays gated on `assetPrefix` because it's only needed for the configured cases - Drops the legacy `/assets/` branches in prod-server (3 sites) and static-file-cache (hard cutover — see PR description for rationale) - Updates `_headers` generation, precompress default, fonts plugin `DEFAULT_ASSETS_DIR` to match the new default With the layout aligned, invalid `_next/static/*` requests naturally return plain-text `404 + "Not Found"` from the static-file layer instead of falling through to the page renderer (which would produce an HTML 404 with bootstrap scripts and CSS). This replaces #1383's parity short-circuit with the natural code path: - Node prod-server (App + Pages branches): missing asset under `resolveAppRouterAssetPath` returns `text/plain; charset=utf-8` 404 - Cloudflare worker entry: `isNextStaticPath` recognises asset-shape after ASSETS-binding misses; returns `notFoundStaticAssetResponse` Mirrors Next.js: packages/next/src/server/lib/router-server.ts. Adds `tests/invalid-static-asset-404.test.ts` (3 App Router + 3 Pages Router cases — no prefix / basePath / assetPrefix) ported from Next.js e2e suites. Updates 11 source files + 12 test files; 914+ tests pass in the touched suites (asset-prefix, app-router, pages-router, deploy, font-google, static-file-cache, serve-static, precompress, features, routing, isr-cache, build-optimization, app-rsc/ssr, standalone, middleware, shims). Ported from Next.js: - test/e2e/invalid-static-asset-404-app/*.test.ts - test/e2e/invalid-static-asset-404-pages/*.test.ts * fix(e2e): update cloudflare-pages-router hydration spec for _next/static * PR #1411 approved. Clean fix, 2 nits. Co-authored-by: james-elicx <james-elicx@users.noreply.github.com> * refactor(assets): derive isHashed checks from ASSET_PREFIX_URL_DIR Replace hardcoded '_next/static' string literals in runtime code paths with the ASSET_PREFIX_URL_DIR constant so the asset URL convention has a single source of truth. - server/prod-server.ts isHashed: pathname.includes(`/${ASSET_PREFIX_URL_DIR}/`) - server/prod-server.ts public-dir guard: startsWith(`/${ASSET_PREFIX_URL_DIR}/`) - server/static-file-cache.ts isHashed: both startsWith + includes derived - plugins/fonts.ts DEFAULT_ASSETS_DIR = ASSET_PREFIX_URL_DIR Behavioural no-op — the constant is '_next/static' so the resolved strings are identical. Centralises the URL contract so future changes to ASSET_PREFIX_URL_DIR (or a refactor that derives it from build config) flow through to every consumer. Doc-comment references to '_next/static' left in place — they describe the canonical value for human readers and are not code paths. --------- Co-authored-by: ask-bonk[bot] <ask-bonk[bot]@users.noreply.github.com> Co-authored-by: james-elicx <james-elicx@users.noreply.github.com>
322 lines
13 KiB
TypeScript
322 lines
13 KiB
TypeScript
/**
|
|
* Tests for the startup metadata cache used by the production server.
|
|
*
|
|
* StaticFileCache walks dist/client/ once at server startup, caches file
|
|
* metadata (path, size, content-type, cache-control, etag, precompressed
|
|
* variant paths), and serves lookups from memory with zero filesystem calls.
|
|
*/
|
|
import { describe, it, expect, beforeEach, afterEach } from "vite-plus/test";
|
|
import fsp from "node:fs/promises";
|
|
import path from "node:path";
|
|
import os from "node:os";
|
|
import zlib from "node:zlib";
|
|
import { StaticFileCache } from "../packages/vinext/src/server/static-file-cache.js";
|
|
|
|
/** Create a temp directory that mimics dist/client/ structure. */
|
|
async function setupClientDir(): Promise<string> {
|
|
const dir = path.join(
|
|
os.tmpdir(),
|
|
`vinext-cache-${Date.now()}-${Math.random().toString(36).slice(2)}`,
|
|
);
|
|
await fsp.mkdir(dir, { recursive: true });
|
|
return dir;
|
|
}
|
|
|
|
async function writeFile(
|
|
clientDir: string,
|
|
relativePath: string,
|
|
content: string | Buffer,
|
|
): Promise<void> {
|
|
const fullPath = path.join(clientDir, relativePath);
|
|
await fsp.mkdir(path.dirname(fullPath), { recursive: true });
|
|
await fsp.writeFile(fullPath, content);
|
|
}
|
|
|
|
describe("StaticFileCache", () => {
|
|
let clientDir: string;
|
|
|
|
beforeEach(async () => {
|
|
clientDir = await setupClientDir();
|
|
});
|
|
|
|
afterEach(async () => {
|
|
await fsp.rm(clientDir, { recursive: true, force: true });
|
|
});
|
|
|
|
// ── Creation and scanning ──────────────────────────────────────
|
|
|
|
it("creates a cache by scanning the client directory", async () => {
|
|
await writeFile(clientDir, "_next/static/app-abc123.js", "const x = 1;");
|
|
const cache = await StaticFileCache.create(clientDir);
|
|
|
|
expect(cache).toBeDefined();
|
|
});
|
|
|
|
it("handles empty client directory", async () => {
|
|
const cache = await StaticFileCache.create(clientDir);
|
|
|
|
expect(cache.lookup("/_next/static/nope.js")).toBeUndefined();
|
|
});
|
|
|
|
it("handles non-existent client directory gracefully", async () => {
|
|
const cache = await StaticFileCache.create(path.join(clientDir, "does-not-exist"));
|
|
|
|
expect(cache.lookup("/anything")).toBeUndefined();
|
|
});
|
|
|
|
// ── Lookup ─────────────────────────────────────────────────────
|
|
|
|
it("returns cached metadata for an existing file", async () => {
|
|
await writeFile(clientDir, "_next/static/index-abc123.js", "const x = 1;");
|
|
|
|
const cache = await StaticFileCache.create(clientDir);
|
|
const entry = cache.lookup("/_next/static/index-abc123.js");
|
|
|
|
expect(entry).toBeDefined();
|
|
expect(entry!.original.headers["Content-Type"]).toBe("application/javascript");
|
|
expect(entry!.original.headers["Content-Length"]).toBe("12"); // "const x = 1;"
|
|
expect(entry!.original.path).toBe(path.join(clientDir, "_next/static/index-abc123.js"));
|
|
});
|
|
|
|
it("returns undefined for non-existent files", async () => {
|
|
await writeFile(clientDir, "_next/static/real-abc123.js", "x");
|
|
|
|
const cache = await StaticFileCache.create(clientDir);
|
|
|
|
expect(cache.lookup("/_next/static/missing-xyz789.js")).toBeUndefined();
|
|
});
|
|
|
|
it("sets immutable cache-control for hashed assets under /assets/", async () => {
|
|
await writeFile(clientDir, "_next/static/bundle-abc123.js", "x".repeat(100));
|
|
|
|
const cache = await StaticFileCache.create(clientDir);
|
|
const entry = cache.lookup("/_next/static/bundle-abc123.js");
|
|
|
|
expect(entry!.original.headers["Cache-Control"]).toBe("public, max-age=31536000, immutable");
|
|
});
|
|
|
|
it("sets short cache-control for non-hashed files", async () => {
|
|
await writeFile(clientDir, "favicon.ico", "icon-data");
|
|
|
|
const cache = await StaticFileCache.create(clientDir);
|
|
const entry = cache.lookup("/favicon.ico");
|
|
|
|
expect(entry!.original.headers["Cache-Control"]).toBe("public, max-age=3600");
|
|
});
|
|
|
|
it("generates weak etag from filename hash for hashed assets", async () => {
|
|
await writeFile(clientDir, "_next/static/app-abc123.css", ".body { margin: 0; }");
|
|
|
|
const cache = await StaticFileCache.create(clientDir);
|
|
const entry = cache.lookup("/_next/static/app-abc123.css");
|
|
|
|
// Hashed assets use the content hash from the filename
|
|
expect(entry!.etag).toBe('W/"abc123"');
|
|
});
|
|
|
|
it("falls back to mtime etag for non-hashed files", async () => {
|
|
await writeFile(clientDir, "favicon.ico", "icon");
|
|
|
|
const cache = await StaticFileCache.create(clientDir);
|
|
const entry = cache.lookup("/favicon.ico");
|
|
|
|
expect(entry!.etag).toMatch(/^W\/"\d+-\d+"$/);
|
|
});
|
|
|
|
it("falls back to mtime etag for assets without hash suffix", async () => {
|
|
await writeFile(clientDir, "_next/static/logo.svg", "<svg></svg>");
|
|
|
|
const cache = await StaticFileCache.create(clientDir);
|
|
const entry = cache.lookup("/_next/static/logo.svg");
|
|
|
|
// No hash in filename — falls back to mtime-based ETag
|
|
expect(entry!.etag).toMatch(/^W\/"\d+-\d+"$/);
|
|
});
|
|
|
|
it("does not treat non-hash suffixes as hashed asset etags", async () => {
|
|
await writeFile(clientDir, "_next/static/my-library-v2.0.0.js", "export {};");
|
|
|
|
const cache = await StaticFileCache.create(clientDir);
|
|
const entry = cache.lookup("/_next/static/my-library-v2.0.0.js");
|
|
|
|
expect(entry!.etag).toMatch(/^W\/"\d+-\d+"$/);
|
|
});
|
|
|
|
// ── Precompressed variants ─────────────────────────────────────
|
|
|
|
it("detects brotli precompressed variant", async () => {
|
|
const content = "const x = 1;\n".repeat(200);
|
|
await writeFile(clientDir, "_next/static/app-abc123.js", content);
|
|
// Simulate build-time precompression
|
|
const brContent = zlib.brotliCompressSync(Buffer.from(content));
|
|
await writeFile(clientDir, "_next/static/app-abc123.js.br", brContent);
|
|
|
|
const cache = await StaticFileCache.create(clientDir);
|
|
const entry = cache.lookup("/_next/static/app-abc123.js");
|
|
|
|
expect(entry!.br?.path).toBe(path.join(clientDir, "_next/static/app-abc123.js.br"));
|
|
expect(entry!.br?.headers["Content-Length"]).toBe(String(brContent.length));
|
|
});
|
|
|
|
it("detects gzip precompressed variant", async () => {
|
|
const content = "body { margin: 0; }\n".repeat(200);
|
|
await writeFile(clientDir, "_next/static/styles-def456.css", content);
|
|
const gzContent = zlib.gzipSync(Buffer.from(content));
|
|
await writeFile(clientDir, "_next/static/styles-def456.css.gz", gzContent);
|
|
|
|
const cache = await StaticFileCache.create(clientDir);
|
|
const entry = cache.lookup("/_next/static/styles-def456.css");
|
|
|
|
expect(entry!.gz?.path).toBe(path.join(clientDir, "_next/static/styles-def456.css.gz"));
|
|
expect(entry!.gz?.headers["Content-Length"]).toBe(String(gzContent.length));
|
|
});
|
|
|
|
it("detects zstandard precompressed variant", async () => {
|
|
const content = "const zstd = true;\n".repeat(200);
|
|
await writeFile(clientDir, "_next/static/app-zstd.js", content);
|
|
const zstdContent = zlib.zstdCompressSync(Buffer.from(content));
|
|
await writeFile(clientDir, "_next/static/app-zstd.js.zst", zstdContent);
|
|
|
|
const cache = await StaticFileCache.create(clientDir);
|
|
const entry = cache.lookup("/_next/static/app-zstd.js");
|
|
|
|
expect(entry!.zst?.path).toBe(path.join(clientDir, "_next/static/app-zstd.js.zst"));
|
|
expect(entry!.zst?.headers["Content-Length"]).toBe(String(zstdContent.length));
|
|
});
|
|
|
|
it("sets Vary: Accept-Encoding on original variant when compressed siblings exist", async () => {
|
|
const content = "const x = 1;\n".repeat(200);
|
|
await writeFile(clientDir, "_next/static/app-abc123.js", content);
|
|
await writeFile(
|
|
clientDir,
|
|
"_next/static/app-abc123.js.br",
|
|
zlib.brotliCompressSync(Buffer.from(content)),
|
|
);
|
|
|
|
const cache = await StaticFileCache.create(clientDir);
|
|
const entry = cache.lookup("/_next/static/app-abc123.js");
|
|
|
|
expect(entry!.original.headers["Vary"]).toBe("Accept-Encoding");
|
|
});
|
|
|
|
it("omits Vary on original variant when no compressed siblings exist", async () => {
|
|
await writeFile(clientDir, "favicon.ico", "icon-data");
|
|
|
|
const cache = await StaticFileCache.create(clientDir);
|
|
const entry = cache.lookup("/favicon.ico");
|
|
|
|
expect(entry!.original.headers["Vary"]).toBeUndefined();
|
|
});
|
|
|
|
it("does not expose .br/.gz/.zst files as standalone entries", async () => {
|
|
const content = "const x = 1;\n".repeat(200);
|
|
await writeFile(clientDir, "_next/static/app-abc123.js", content);
|
|
await writeFile(
|
|
clientDir,
|
|
"_next/static/app-abc123.js.br",
|
|
zlib.brotliCompressSync(Buffer.from(content)),
|
|
);
|
|
await writeFile(
|
|
clientDir,
|
|
"_next/static/app-abc123.js.gz",
|
|
zlib.gzipSync(Buffer.from(content)),
|
|
);
|
|
await writeFile(
|
|
clientDir,
|
|
"_next/static/app-abc123.js.zst",
|
|
zlib.zstdCompressSync(Buffer.from(content)),
|
|
);
|
|
|
|
const cache = await StaticFileCache.create(clientDir);
|
|
|
|
// .br, .gz, .zst should not be independently servable
|
|
expect(cache.lookup("/_next/static/app-abc123.js.br")).toBeUndefined();
|
|
expect(cache.lookup("/_next/static/app-abc123.js.gz")).toBeUndefined();
|
|
expect(cache.lookup("/_next/static/app-abc123.js.zst")).toBeUndefined();
|
|
});
|
|
|
|
// ── HTML fallbacks ─────────────────────────────────────────────
|
|
|
|
it("resolves .html extension fallback for prerendered pages", async () => {
|
|
await writeFile(clientDir, "about.html", "<html>About</html>");
|
|
|
|
const cache = await StaticFileCache.create(clientDir);
|
|
const entry = cache.lookup("/about");
|
|
|
|
expect(entry).toBeDefined();
|
|
expect(entry!.original.path).toBe(path.join(clientDir, "about.html"));
|
|
expect(entry!.original.headers["Content-Type"]).toBe("text/html");
|
|
});
|
|
|
|
it("resolves /index.html fallback for directory paths", async () => {
|
|
await writeFile(clientDir, "blog/index.html", "<html>Blog</html>");
|
|
|
|
const cache = await StaticFileCache.create(clientDir);
|
|
const entry = cache.lookup("/blog");
|
|
|
|
expect(entry).toBeDefined();
|
|
expect(entry!.original.path).toBe(path.join(clientDir, "blog/index.html"));
|
|
});
|
|
|
|
// ── Directory traversal protection ─────────────────────────────
|
|
|
|
it("blocks .vite/ internal directory access", async () => {
|
|
await writeFile(clientDir, ".vite/manifest.json", "{}");
|
|
|
|
const cache = await StaticFileCache.create(clientDir);
|
|
|
|
expect(cache.lookup("/.vite/manifest.json")).toBeUndefined();
|
|
});
|
|
|
|
it("skips root / path", async () => {
|
|
await writeFile(clientDir, "index.html", "<html>Root</html>");
|
|
|
|
const cache = await StaticFileCache.create(clientDir);
|
|
|
|
// Root index.html is served by SSR/RSC, not static serving
|
|
expect(cache.lookup("/")).toBeUndefined();
|
|
});
|
|
|
|
// ── Content type detection ─────────────────────────────────────
|
|
|
|
it("detects content types from file extensions", async () => {
|
|
await writeFile(clientDir, "_next/static/style-aaa.css", "body{}");
|
|
await writeFile(clientDir, "_next/static/data-bbb.json", "{}");
|
|
await writeFile(clientDir, "logo.svg", "<svg/>");
|
|
await writeFile(clientDir, "photo.webp", "webp-data");
|
|
|
|
const cache = await StaticFileCache.create(clientDir);
|
|
|
|
expect(cache.lookup("/_next/static/style-aaa.css")!.original.headers["Content-Type"]).toBe(
|
|
"text/css",
|
|
);
|
|
expect(cache.lookup("/_next/static/data-bbb.json")!.original.headers["Content-Type"]).toBe(
|
|
"application/json",
|
|
);
|
|
expect(cache.lookup("/logo.svg")!.original.headers["Content-Type"]).toBe("image/svg+xml");
|
|
expect(cache.lookup("/photo.webp")!.original.headers["Content-Type"]).toBe("image/webp");
|
|
});
|
|
|
|
it("falls back to application/octet-stream for unknown extensions", async () => {
|
|
await writeFile(clientDir, "_next/static/data-ccc.xyz", "unknown-data");
|
|
|
|
const cache = await StaticFileCache.create(clientDir);
|
|
|
|
expect(cache.lookup("/_next/static/data-ccc.xyz")!.original.headers["Content-Type"]).toBe(
|
|
"application/octet-stream",
|
|
);
|
|
});
|
|
|
|
// ── Nested directory scanning ──────────────────────────────────
|
|
|
|
it("scans nested directories recursively", async () => {
|
|
await writeFile(clientDir, "_next/static/chunks/vendor-aaa.js", "vendor code");
|
|
await writeFile(clientDir, "_next/static/chunks/lazy/page-bbb.js", "page code");
|
|
|
|
const cache = await StaticFileCache.create(clientDir);
|
|
|
|
expect(cache.lookup("/_next/static/chunks/vendor-aaa.js")).toBeDefined();
|
|
expect(cache.lookup("/_next/static/chunks/lazy/page-bbb.js")).toBeDefined();
|
|
});
|
|
});
|