vinext 0.0.51 → 0.0.52

package/dist/build/precompress.d.ts

@@ -11,16 +11,16 @@ type PrecompressResult = {
  * Safe to re-run — overwrites existing compressed variants with identical
  * output, and never compresses `.br`, `.gz`, or `.zst` files themselves.
  *
- * `assetsDir` defaults to `"assets"` (Vite's historical default). When
- * `assetPrefix` is configured the build writes assets to a different
- * directory (e.g. `"cdn/_next/static"` for a path prefix, or `"_next/static"`
- * for an absolute URL prefix); callers should resolve that with
+ * `assetsDir` defaults to `"_next/static"` (Next.js's canonical convention,
+ * matching `resolveAssetsDir("")`). When `assetPrefix` is configured as a
+ * path prefix the build writes assets to a different directory (e.g.
+ * `"cdn/_next/static"`); callers should resolve that with
  * `resolveAssetsDir(assetPrefix)` and thread it through. Without this,
- * `assetPrefix` builds would walk an empty `assets/` directory and emit
- * zero compressed variants.
+ * `assetPrefix` builds would walk an empty `_next/static/` directory and
+ * emit zero compressed variants.
  */
 declare function precompressAssets(clientDir: string, options?: {
-  /** Subdirectory under `clientDir` containing hashed assets. Defaults to `"assets"`. */assetsDir?: string;
+  /** Subdirectory under `clientDir` containing hashed assets. Defaults to `"_next/static"`. */assetsDir?: string;
   onProgress?: (completed: number, total: number, file: string) => void;
 }): Promise<PrecompressResult>;
 //#endregion

package/dist/build/precompress.js

@@ -1,5 +1,6 @@
+import { ASSET_PREFIX_URL_DIR } from "../utils/asset-prefix.js";
 import path from "node:path";
-import fsp from "node:fs/promises";
+import fs from "node:fs/promises";
 import os from "node:os";
 import zlib from "node:zlib";
 import { promisify } from "node:util";
@@ -8,12 +9,12 @@ import { promisify } from "node:util";
 * Build-time precompression for hashed static assets.
 *
 * Generates .br (brotli q5), .gz (gzip l8), and .zst (zstd l8) files
-* alongside compressible assets in dist/client/assets/. Served directly by
-* the production server — no per-request compression needed for immutable
-* build output.
+* alongside compressible assets in dist/client/_next/static/. Served
+* directly by the production server — no per-request compression needed
+* for immutable build output.
 *
-* Only targets assets/ (hashed, immutable) — public directory files use
-* on-the-fly compression since they may change between deploys.
+* Only targets the hashed-asset directory (immutable) — public directory
+* files use on-the-fly compression since they may change between deploys.
 */
 const brotliCompress = promisify(zlib.brotliCompress);
 const gzip = promisify(zlib.gzip);
@@ -45,7 +46,7 @@ const CONCURRENCY = Math.min(os.availableParallelism(), 8);
 async function* walkFiles(dir, base = dir) {
 	let entries;
 	try {
-		entries = await fsp.readdir(dir, { withFileTypes: true });
+		entries = await fs.readdir(dir, { withFileTypes: true });
 	} catch {
 		return;
 	}
@@ -62,16 +63,16 @@ async function* walkFiles(dir, base = dir) {
 * Safe to re-run — overwrites existing compressed variants with identical
 * output, and never compresses `.br`, `.gz`, or `.zst` files themselves.
 *
-* `assetsDir` defaults to `"assets"` (Vite's historical default). When
-* `assetPrefix` is configured the build writes assets to a different
-* directory (e.g. `"cdn/_next/static"` for a path prefix, or `"_next/static"`
-* for an absolute URL prefix); callers should resolve that with
+* `assetsDir` defaults to `"_next/static"` (Next.js's canonical convention,
+* matching `resolveAssetsDir("")`). When `assetPrefix` is configured as a
+* path prefix the build writes assets to a different directory (e.g.
+* `"cdn/_next/static"`); callers should resolve that with
 * `resolveAssetsDir(assetPrefix)` and thread it through. Without this,
-* `assetPrefix` builds would walk an empty `assets/` directory and emit
-* zero compressed variants.
+* `assetPrefix` builds would walk an empty `_next/static/` directory and
+* emit zero compressed variants.
 */
 async function precompressAssets(clientDir, options = {}) {
-	const { assetsDir: assetsSubdir = "assets", onProgress } = options;
+	const { assetsDir: assetsSubdir = ASSET_PREFIX_URL_DIR, onProgress } = options;
 	const assetsDir = path.join(clientDir, assetsSubdir);
 	const result = {
 		filesCompressed: 0,
@@ -88,13 +89,13 @@ async function precompressAssets(clientDir, options = {}) {
 	for (let i = 0; i < filePaths.length; i += CONCURRENCY) {
 		const chunk = filePaths.slice(i, i + CONCURRENCY);
 		await Promise.all(chunk.map(async (fullPath) => {
-			const content = await fsp.readFile(fullPath);
+			const content = await fs.readFile(fullPath);
 			if (content.length < MIN_SIZE) return;
 			const compressions = [brotliCompress(content, { params: { [zlib.constants.BROTLI_PARAM_QUALITY]: 5 } }), gzip(content, { level: 8 })];
 			if (zstdCompress) compressions.push(zstdCompress(content, { params: { [zlib.constants.ZSTD_c_compressionLevel]: 8 } }));
 			const [brContent, gzContent, zstdContent] = await Promise.all(compressions);
-			const writes = [fsp.writeFile(fullPath + ".br", brContent), fsp.writeFile(fullPath + ".gz", gzContent)];
-			if (zstdContent) writes.push(fsp.writeFile(fullPath + ".zst", zstdContent));
+			const writes = [fs.writeFile(fullPath + ".br", brContent), fs.writeFile(fullPath + ".gz", gzContent)];
+			if (zstdContent) writes.push(fs.writeFile(fullPath + ".zst", zstdContent));
 			await Promise.all(writes);
 			result.filesCompressed++;
 			result.totalOriginalBytes += content.length;

package/dist/build/precompress.js.map

@@ -1 +1 @@
-{"version":3,"file":"precompress.js","names":[],"sources":["../../src/build/precompress.ts"],"sourcesContent":["/**\n * Build-time precompression for hashed static assets.\n *\n * Generates .br (brotli q5), .gz (gzip l8), and .zst (zstd l8) files\n * alongside compressible assets in dist/client/assets/. Served directly by\n * the production server — no per-request compression needed for immutable\n * build output.\n *\n * Only targets assets/ (hashed, immutable) — public directory files use\n * on-the-fly compression since they may change between deploys.\n */\nimport fsp from \"node:fs/promises\";\nimport os from \"node:os\";\nimport path from \"node:path\";\nimport zlib from \"node:zlib\";\nimport { promisify } from \"node:util\";\n\nconst brotliCompress = promisify(zlib.brotliCompress);\nconst gzip = promisify(zlib.gzip);\nconst zstdCompress = typeof zlib.zstdCompress === \"function\" ? promisify(zlib.zstdCompress) : null;\n\n/** File extensions worth compressing (text-based, not already compressed). */\nconst COMPRESSIBLE_EXTENSIONS = new Set([\n  \".js\",\n  \".mjs\",\n  \".css\",\n  \".html\",\n  \".json\",\n  \".xml\",\n  \".svg\",\n  \".txt\",\n  \".map\",\n  \".wasm\",\n]);\n\n/** Below this size, compression overhead exceeds savings. */\nconst MIN_SIZE = 1024;\n\n/**\n * Past ~8 parallel files, mixed-size asset sets spend more time queueing zlib\n * work than making forward progress. Keep the batch size bounded even on\n * higher-core machines.\n */\nconst CONCURRENCY = Math.min(os.availableParallelism(), 8);\n\ntype PrecompressResult = {\n  filesCompressed: number;\n  totalOriginalBytes: number;\n  /** Sum of brotli-compressed sizes (used for compression ratio reporting). */\n  totalBrotliBytes: number;\n};\n\n/**\n * Walk a directory recursively, yielding relative paths for regular files.\n */\nasync function* walkFiles(dir: string, base: string = dir): AsyncGenerator<string> {\n  let entries;\n  try {\n    entries = await fsp.readdir(dir, { withFileTypes: true });\n  } catch {\n    return; // directory doesn't exist\n  }\n  for (const entry of entries) {\n    const fullPath = path.join(dir, entry.name);\n    if (entry.isDirectory()) {\n      yield* walkFiles(fullPath, base);\n    } else if (entry.isFile()) {\n      yield path.relative(base, fullPath);\n    }\n  }\n}\n\n/**\n * Precompress all compressible hashed assets under `clientDir/<assetsDir>/`.\n *\n * Writes `.br`, `.gz`, and `.zst` files alongside each original.\n * Safe to re-run — overwrites existing compressed variants with identical\n * output, and never compresses `.br`, `.gz`, or `.zst` files themselves.\n *\n * `assetsDir` defaults to `\"assets\"` (Vite's historical default). When\n * `assetPrefix` is configured the build writes assets to a different\n * directory (e.g. `\"cdn/_next/static\"` for a path prefix, or `\"_next/static\"`\n * for an absolute URL prefix); callers should resolve that with\n * `resolveAssetsDir(assetPrefix)` and thread it through. Without this,\n * `assetPrefix` builds would walk an empty `assets/` directory and emit\n * zero compressed variants.\n */\nexport async function precompressAssets(\n  clientDir: string,\n  options: {\n    /** Subdirectory under `clientDir` containing hashed assets. Defaults to `\"assets\"`. */\n    assetsDir?: string;\n    onProgress?: (completed: number, total: number, file: string) => void;\n  } = {},\n): Promise<PrecompressResult> {\n  const { assetsDir: assetsSubdir = \"assets\", onProgress } = options;\n  const assetsDir = path.join(clientDir, assetsSubdir);\n  const result: PrecompressResult = {\n    filesCompressed: 0,\n    totalOriginalBytes: 0,\n    totalBrotliBytes: 0,\n  };\n\n  // Collect compressible file paths, then read + compress in bounded chunks\n  // to keep peak memory at O(CONCURRENCY * max_file_size) instead of\n  // O(total_assets).\n  const filePaths: string[] = [];\n\n  for await (const relativePath of walkFiles(assetsDir)) {\n    const ext = path.extname(relativePath).toLowerCase();\n\n    if (!COMPRESSIBLE_EXTENSIONS.has(ext)) continue;\n    // .br/.gz/.zst are intentionally absent from COMPRESSIBLE_EXTENSIONS, so\n    // precompressed variants generated by a previous run are never re-compressed.\n\n    filePaths.push(path.join(assetsDir, relativePath));\n  }\n\n  let processed = 0;\n  for (let i = 0; i < filePaths.length; i += CONCURRENCY) {\n    const chunk = filePaths.slice(i, i + CONCURRENCY);\n    await Promise.all(\n      chunk.map(async (fullPath) => {\n        const content = await fsp.readFile(fullPath);\n        // readFile already done before this check — stat()-first would save\n        // the read for tiny files but costs an extra syscall per file;\n        // sub-1KB hashed assets are rare enough that read-first is cheaper.\n        if (content.length < MIN_SIZE) return;\n\n        // Compress all variants concurrently within each file\n        const compressions: Promise<Buffer>[] = [\n          brotliCompress(content, {\n            params: { [zlib.constants.BROTLI_PARAM_QUALITY]: 5 },\n          }),\n          gzip(content, { level: 8 }),\n        ];\n        if (zstdCompress) {\n          compressions.push(\n            zstdCompress(content, {\n              params: { [zlib.constants.ZSTD_c_compressionLevel]: 8 },\n            }),\n          );\n        }\n\n        const results = await Promise.all(compressions);\n        const [brContent, gzContent, zstdContent] = results;\n\n        const writes = [\n          fsp.writeFile(fullPath + \".br\", brContent),\n          fsp.writeFile(fullPath + \".gz\", gzContent),\n        ];\n        if (zstdContent) {\n          writes.push(fsp.writeFile(fullPath + \".zst\", zstdContent));\n        }\n        await Promise.all(writes);\n\n        // Increment counters only after all writes succeed, so partial\n        // failures (e.g. ENOSPC mid-write) don't inflate the reported totals.\n        result.filesCompressed++;\n        result.totalOriginalBytes += content.length;\n        result.totalBrotliBytes += brContent.length;\n      }),\n    );\n    // Report progress once per chunk to avoid non-deterministic ordering\n    // within Promise.all (smaller files complete before larger ones).\n    // Progress tracks all files (including skipped ones below MIN_SIZE),\n    // which differs from filesCompressed (only files actually compressed).\n    processed += chunk.length;\n    onProgress?.(processed, filePaths.length, path.basename(chunk[chunk.length - 1]));\n  }\n\n  return result;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;AAiBA,MAAM,iBAAiB,UAAU,KAAK,eAAe;AACrD,MAAM,OAAO,UAAU,KAAK,KAAK;AACjC,MAAM,eAAe,OAAO,KAAK,iBAAiB,aAAa,UAAU,KAAK,aAAa,GAAG;;AAG9F,MAAM,0BAA0B,IAAI,IAAI;CACtC;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACD,CAAC;;AAGF,MAAM,WAAW;;;;;;AAOjB,MAAM,cAAc,KAAK,IAAI,GAAG,sBAAsB,EAAE,EAAE;;;;AAY1D,gBAAgB,UAAU,KAAa,OAAe,KAA6B;CACjF,IAAI;CACJ,IAAI;EACF,UAAU,MAAM,IAAI,QAAQ,KAAK,EAAE,eAAe,MAAM,CAAC;SACnD;EACN;;CAEF,KAAK,MAAM,SAAS,SAAS;EAC3B,MAAM,WAAW,KAAK,KAAK,KAAK,MAAM,KAAK;EAC3C,IAAI,MAAM,aAAa,EACrB,OAAO,UAAU,UAAU,KAAK;OAC3B,IAAI,MAAM,QAAQ,EACvB,MAAM,KAAK,SAAS,MAAM,SAAS;;;;;;;;;;;;;;;;;;AAoBzC,eAAsB,kBACpB,WACA,UAII,EAAE,EACsB;CAC5B,MAAM,EAAE,WAAW,eAAe,UAAU,eAAe;CAC3D,MAAM,YAAY,KAAK,KAAK,WAAW,aAAa;CACpD,MAAM,SAA4B;EAChC,iBAAiB;EACjB,oBAAoB;EACpB,kBAAkB;EACnB;CAKD,MAAM,YAAsB,EAAE;CAE9B,WAAW,MAAM,gBAAgB,UAAU,UAAU,EAAE;EACrD,MAAM,MAAM,KAAK,QAAQ,aAAa,CAAC,aAAa;EAEpD,IAAI,CAAC,wBAAwB,IAAI,IAAI,EAAE;EAIvC,UAAU,KAAK,KAAK,KAAK,WAAW,aAAa,CAAC;;CAGpD,IAAI,YAAY;CAChB,KAAK,IAAI,IAAI,GAAG,IAAI,UAAU,QAAQ,KAAK,aAAa;EACtD,MAAM,QAAQ,UAAU,MAAM,GAAG,IAAI,YAAY;EACjD,MAAM,QAAQ,IACZ,MAAM,IAAI,OAAO,aAAa;GAC5B,MAAM,UAAU,MAAM,IAAI,SAAS,SAAS;GAI5C,IAAI,QAAQ,SAAS,UAAU;GAG/B,MAAM,eAAkC,CACtC,eAAe,SAAS,EACtB,QAAQ,GAAG,KAAK,UAAU,uBAAuB,GAAG,EACrD,CAAC,EACF,KAAK,SAAS,EAAE,OAAO,GAAG,CAAC,CAC5B;GACD,IAAI,cACF,aAAa,KACX,aAAa,SAAS,EACpB,QAAQ,GAAG,KAAK,UAAU,0BAA0B,GAAG,EACxD,CAAC,CACH;GAIH,MAAM,CAAC,WAAW,WAAW,eAAe,MADtB,QAAQ,IAAI,aAAa;GAG/C,MAAM,SAAS,CACb,IAAI,UAAU,WAAW,OAAO,UAAU,EAC1C,IAAI,UAAU,WAAW,OAAO,UAAU,CAC3C;GACD,IAAI,aACF,OAAO,KAAK,IAAI,UAAU,WAAW,QAAQ,YAAY,CAAC;GAE5D,MAAM,QAAQ,IAAI,OAAO;GAIzB,OAAO;GACP,OAAO,sBAAsB,QAAQ;GACrC,OAAO,oBAAoB,UAAU;IACrC,CACH;EAKD,aAAa,MAAM;EACnB,aAAa,WAAW,UAAU,QAAQ,KAAK,SAAS,MAAM,MAAM,SAAS,GAAG,CAAC;;CAGnF,OAAO"}
+{"version":3,"file":"precompress.js","names":["fsp"],"sources":["../../src/build/precompress.ts"],"sourcesContent":["/**\n * Build-time precompression for hashed static assets.\n *\n * Generates .br (brotli q5), .gz (gzip l8), and .zst (zstd l8) files\n * alongside compressible assets in dist/client/_next/static/. Served\n * directly by the production server — no per-request compression needed\n * for immutable build output.\n *\n * Only targets the hashed-asset directory (immutable) — public directory\n * files use on-the-fly compression since they may change between deploys.\n */\nimport fsp from \"node:fs/promises\";\nimport os from \"node:os\";\nimport path from \"node:path\";\nimport zlib from \"node:zlib\";\nimport { promisify } from \"node:util\";\nimport { ASSET_PREFIX_URL_DIR } from \"../utils/asset-prefix.js\";\n\nconst brotliCompress = promisify(zlib.brotliCompress);\nconst gzip = promisify(zlib.gzip);\nconst zstdCompress = typeof zlib.zstdCompress === \"function\" ? promisify(zlib.zstdCompress) : null;\n\n/** File extensions worth compressing (text-based, not already compressed). */\nconst COMPRESSIBLE_EXTENSIONS = new Set([\n  \".js\",\n  \".mjs\",\n  \".css\",\n  \".html\",\n  \".json\",\n  \".xml\",\n  \".svg\",\n  \".txt\",\n  \".map\",\n  \".wasm\",\n]);\n\n/** Below this size, compression overhead exceeds savings. */\nconst MIN_SIZE = 1024;\n\n/**\n * Past ~8 parallel files, mixed-size asset sets spend more time queueing zlib\n * work than making forward progress. Keep the batch size bounded even on\n * higher-core machines.\n */\nconst CONCURRENCY = Math.min(os.availableParallelism(), 8);\n\ntype PrecompressResult = {\n  filesCompressed: number;\n  totalOriginalBytes: number;\n  /** Sum of brotli-compressed sizes (used for compression ratio reporting). */\n  totalBrotliBytes: number;\n};\n\n/**\n * Walk a directory recursively, yielding relative paths for regular files.\n */\nasync function* walkFiles(dir: string, base: string = dir): AsyncGenerator<string> {\n  let entries;\n  try {\n    entries = await fsp.readdir(dir, { withFileTypes: true });\n  } catch {\n    return; // directory doesn't exist\n  }\n  for (const entry of entries) {\n    const fullPath = path.join(dir, entry.name);\n    if (entry.isDirectory()) {\n      yield* walkFiles(fullPath, base);\n    } else if (entry.isFile()) {\n      yield path.relative(base, fullPath);\n    }\n  }\n}\n\n/**\n * Precompress all compressible hashed assets under `clientDir/<assetsDir>/`.\n *\n * Writes `.br`, `.gz`, and `.zst` files alongside each original.\n * Safe to re-run — overwrites existing compressed variants with identical\n * output, and never compresses `.br`, `.gz`, or `.zst` files themselves.\n *\n * `assetsDir` defaults to `\"_next/static\"` (Next.js's canonical convention,\n * matching `resolveAssetsDir(\"\")`). When `assetPrefix` is configured as a\n * path prefix the build writes assets to a different directory (e.g.\n * `\"cdn/_next/static\"`); callers should resolve that with\n * `resolveAssetsDir(assetPrefix)` and thread it through. Without this,\n * `assetPrefix` builds would walk an empty `_next/static/` directory and\n * emit zero compressed variants.\n */\nexport async function precompressAssets(\n  clientDir: string,\n  options: {\n    /** Subdirectory under `clientDir` containing hashed assets. Defaults to `\"_next/static\"`. */\n    assetsDir?: string;\n    onProgress?: (completed: number, total: number, file: string) => void;\n  } = {},\n): Promise<PrecompressResult> {\n  const { assetsDir: assetsSubdir = ASSET_PREFIX_URL_DIR, onProgress } = options;\n  const assetsDir = path.join(clientDir, assetsSubdir);\n  const result: PrecompressResult = {\n    filesCompressed: 0,\n    totalOriginalBytes: 0,\n    totalBrotliBytes: 0,\n  };\n\n  // Collect compressible file paths, then read + compress in bounded chunks\n  // to keep peak memory at O(CONCURRENCY * max_file_size) instead of\n  // O(total_assets).\n  const filePaths: string[] = [];\n\n  for await (const relativePath of walkFiles(assetsDir)) {\n    const ext = path.extname(relativePath).toLowerCase();\n\n    if (!COMPRESSIBLE_EXTENSIONS.has(ext)) continue;\n    // .br/.gz/.zst are intentionally absent from COMPRESSIBLE_EXTENSIONS, so\n    // precompressed variants generated by a previous run are never re-compressed.\n\n    filePaths.push(path.join(assetsDir, relativePath));\n  }\n\n  let processed = 0;\n  for (let i = 0; i < filePaths.length; i += CONCURRENCY) {\n    const chunk = filePaths.slice(i, i + CONCURRENCY);\n    await Promise.all(\n      chunk.map(async (fullPath) => {\n        const content = await fsp.readFile(fullPath);\n        // readFile already done before this check — stat()-first would save\n        // the read for tiny files but costs an extra syscall per file;\n        // sub-1KB hashed assets are rare enough that read-first is cheaper.\n        if (content.length < MIN_SIZE) return;\n\n        // Compress all variants concurrently within each file\n        const compressions: Promise<Buffer>[] = [\n          brotliCompress(content, {\n            params: { [zlib.constants.BROTLI_PARAM_QUALITY]: 5 },\n          }),\n          gzip(content, { level: 8 }),\n        ];\n        if (zstdCompress) {\n          compressions.push(\n            zstdCompress(content, {\n              params: { [zlib.constants.ZSTD_c_compressionLevel]: 8 },\n            }),\n          );\n        }\n\n        const results = await Promise.all(compressions);\n        const [brContent, gzContent, zstdContent] = results;\n\n        const writes = [\n          fsp.writeFile(fullPath + \".br\", brContent),\n          fsp.writeFile(fullPath + \".gz\", gzContent),\n        ];\n        if (zstdContent) {\n          writes.push(fsp.writeFile(fullPath + \".zst\", zstdContent));\n        }\n        await Promise.all(writes);\n\n        // Increment counters only after all writes succeed, so partial\n        // failures (e.g. ENOSPC mid-write) don't inflate the reported totals.\n        result.filesCompressed++;\n        result.totalOriginalBytes += content.length;\n        result.totalBrotliBytes += brContent.length;\n      }),\n    );\n    // Report progress once per chunk to avoid non-deterministic ordering\n    // within Promise.all (smaller files complete before larger ones).\n    // Progress tracks all files (including skipped ones below MIN_SIZE),\n    // which differs from filesCompressed (only files actually compressed).\n    processed += chunk.length;\n    onProgress?.(processed, filePaths.length, path.basename(chunk[chunk.length - 1]));\n  }\n\n  return result;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAkBA,MAAM,iBAAiB,UAAU,KAAK,eAAe;AACrD,MAAM,OAAO,UAAU,KAAK,KAAK;AACjC,MAAM,eAAe,OAAO,KAAK,iBAAiB,aAAa,UAAU,KAAK,aAAa,GAAG;;AAG9F,MAAM,0BAA0B,IAAI,IAAI;CACtC;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACD,CAAC;;AAGF,MAAM,WAAW;;;;;;AAOjB,MAAM,cAAc,KAAK,IAAI,GAAG,sBAAsB,EAAE,EAAE;;;;AAY1D,gBAAgB,UAAU,KAAa,OAAe,KAA6B;CACjF,IAAI;CACJ,IAAI;EACF,UAAU,MAAMA,GAAI,QAAQ,KAAK,EAAE,eAAe,MAAM,CAAC;SACnD;EACN;;CAEF,KAAK,MAAM,SAAS,SAAS;EAC3B,MAAM,WAAW,KAAK,KAAK,KAAK,MAAM,KAAK;EAC3C,IAAI,MAAM,aAAa,EACrB,OAAO,UAAU,UAAU,KAAK;OAC3B,IAAI,MAAM,QAAQ,EACvB,MAAM,KAAK,SAAS,MAAM,SAAS;;;;;;;;;;;;;;;;;;AAoBzC,eAAsB,kBACpB,WACA,UAII,EAAE,EACsB;CAC5B,MAAM,EAAE,WAAW,eAAe,sBAAsB,eAAe;CACvE,MAAM,YAAY,KAAK,KAAK,WAAW,aAAa;CACpD,MAAM,SAA4B;EAChC,iBAAiB;EACjB,oBAAoB;EACpB,kBAAkB;EACnB;CAKD,MAAM,YAAsB,EAAE;CAE9B,WAAW,MAAM,gBAAgB,UAAU,UAAU,EAAE;EACrD,MAAM,MAAM,KAAK,QAAQ,aAAa,CAAC,aAAa;EAEpD,IAAI,CAAC,wBAAwB,IAAI,IAAI,EAAE;EAIvC,UAAU,KAAK,KAAK,KAAK,WAAW,aAAa,CAAC;;CAGpD,IAAI,YAAY;CAChB,KAAK,IAAI,IAAI,GAAG,IAAI,UAAU,QAAQ,KAAK,aAAa;EACtD,MAAM,QAAQ,UAAU,MAAM,GAAG,IAAI,YAAY;EACjD,MAAM,QAAQ,IACZ,MAAM,IAAI,OAAO,aAAa;GAC5B,MAAM,UAAU,MAAMA,GAAI,SAAS,SAAS;GAI5C,IAAI,QAAQ,SAAS,UAAU;GAG/B,MAAM,eAAkC,CACtC,eAAe,SAAS,EACtB,QAAQ,GAAG,KAAK,UAAU,uBAAuB,GAAG,EACrD,CAAC,EACF,KAAK,SAAS,EAAE,OAAO,GAAG,CAAC,CAC5B;GACD,IAAI,cACF,aAAa,KACX,aAAa,SAAS,EACpB,QAAQ,GAAG,KAAK,UAAU,0BAA0B,GAAG,EACxD,CAAC,CACH;GAIH,MAAM,CAAC,WAAW,WAAW,eAAe,MADtB,QAAQ,IAAI,aAAa;GAG/C,MAAM,SAAS,CACbA,GAAI,UAAU,WAAW,OAAO,UAAU,EAC1CA,GAAI,UAAU,WAAW,OAAO,UAAU,CAC3C;GACD,IAAI,aACF,OAAO,KAAKA,GAAI,UAAU,WAAW,QAAQ,YAAY,CAAC;GAE5D,MAAM,QAAQ,IAAI,OAAO;GAIzB,OAAO;GACP,OAAO,sBAAsB,QAAQ;GACrC,OAAO,oBAAoB,UAAU;IACrC,CACH;EAKD,aAAa,MAAM;EACnB,aAAa,WAAW,UAAU,QAAQ,KAAK,SAAS,MAAM,MAAM,SAAS,GAAG,CAAC;;CAGnF,OAAO"}

package/dist/build/prerender.d.ts

@@ -123,15 +123,10 @@ type PrerenderAppOptionsInternal = PrerenderAppOptions & {
  * all '<' and '>' in the embedded JSON, preventing false </script> matches.
  */
 declare function extractRscPayloadFromPrerenderedHtml(html: string): Uint8Array | null;
-/**
- * Determine the HTML output file path for a URL.
- * Respects trailingSlash config.
- */
-declare function getOutputPath(urlPath: string, trailingSlash: boolean): string;
 /** Map of route patterns to generateStaticParams functions (or null/undefined). */
 type StaticParamsMap = Record<string, ((opts: {
   params: Record<string, string | string[]>;
-}) => Promise<Record<string, string | string[]>[]>) | null | undefined>;
+}) => Promise<unknown>) | null | undefined>;
 /**
  * Resolve parent dynamic segment params for a route.
  * Handles top-down generateStaticParams resolution for nested dynamic routes.
@@ -139,7 +134,7 @@ type StaticParamsMap = Record<string, ((opts: {
  * Uses the `staticParamsMap` (pattern → generateStaticParams) exported from
  * the production bundle.
  */
-declare function resolveParentParams(childRoute: AppRoute, routeIndex: ReadonlyMap<string, AppRoute>, staticParamsMap: StaticParamsMap): Promise<Record<string, string | string[]>[]>;
+declare function resolveParentParams(childRoute: AppRoute, staticParamsMap: StaticParamsMap): Promise<Record<string, string | string[]>[]>;
 /**
  * Run the prerender phase for Pages Router.
  *
@@ -187,12 +182,6 @@ declare function prerenderApp({
   rscBundlePath,
   ...options
 }: PrerenderAppOptionsInternal): Promise<PrerenderResult>;
-/**
- * Determine the RSC output file path for a URL.
- * "/blog/hello-world" → "blog/hello-world.rsc"
- * "/"                 → "index.rsc"
- */
-declare function getRscOutputPath(urlPath: string): string;
 /**
  * Write `vinext-prerender.json` to `outDir`.
  *
@@ -205,5 +194,5 @@ declare function writePrerenderIndex(routes: PrerenderRouteResult[], outDir: str
   trailingSlash?: boolean;
 }): void;
 //#endregion
-export { PrerenderResult, PrerenderRouteResult, StaticParamsMap, extractRscPayloadFromPrerenderedHtml, getOutputPath, getRscOutputPath, prerenderApp, prerenderPages, readPrerenderSecret, resolveParentParams, writePrerenderIndex };
+export { PrerenderResult, PrerenderRouteResult, StaticParamsMap, extractRscPayloadFromPrerenderedHtml, prerenderApp, prerenderPages, readPrerenderSecret, resolveParentParams, writePrerenderIndex };
 //# sourceMappingURL=prerender.d.ts.map

package/dist/build/prerender.js

@@ -5,7 +5,9 @@ import { headersContextFromRequest, runWithHeadersContext } from "../shims/heade
 import { NoOpCacheHandler, _consumeRequestScopedCacheLife, getCacheHandler, setCacheHandler } from "../shims/cache.js";
 import { classifyAppRoute, classifyPagesRoute, getAppRouteRenderEntryPath } from "./report.js";
 import { concatUint8Arrays, decodeRscEmbeddedChunk } from "../server/app-rsc-embedded-chunks.js";
+import { navigationRuntimeRscBootstrapExpression } from "../server/app-ssr-stream.js";
 import { readPrerenderSecret } from "./server-manifest.js";
+import { getOutputPath, getRscOutputPath } from "../utils/prerender-output-paths.js";
 import { startProdServer } from "../server/prod-server.js";
 import fs from "node:fs";
 import path from "node:path";
@@ -34,9 +36,12 @@ function getErrorMessageWithStack(err) {
 /** Sentinel path used to trigger 404 rendering without a real route match. */
 const NOT_FOUND_SENTINEL_PATH = "/__vinext_nonexistent_for_404__";
 const DEFAULT_CONCURRENCY = Math.min(os.availableParallelism(), 8);
-const RSC_CHUNK_SCRIPT_PREFIX = "self.__VINEXT_RSC_CHUNKS__=self.__VINEXT_RSC_CHUNKS__||[];";
-const RSC_DONE_MARKER = "__VINEXT_RSC_DONE__=true";
-const RSC_CHUNK_FULL_PREFIX = `${RSC_CHUNK_SCRIPT_PREFIX}self.__VINEXT_RSC_CHUNKS__.push(`;
+const RSC_LEGACY_CHUNK_SCRIPT_PREFIX = "self.__VINEXT_RSC_CHUNKS__=self.__VINEXT_RSC_CHUNKS__||[];";
+const RSC_LEGACY_DONE_SCRIPT = "self.__VINEXT_RSC_DONE__=true";
+const RSC_LEGACY_CHUNK_FULL_PREFIX = `${RSC_LEGACY_CHUNK_SCRIPT_PREFIX}self.__VINEXT_RSC_CHUNKS__.push(`;
+const RSC_RUNTIME_BOOTSTRAP_EXPRESSION = navigationRuntimeRscBootstrapExpression();
+const RSC_RUNTIME_CHUNK_FULL_PREFIX = `${RSC_RUNTIME_BOOTSTRAP_EXPRESSION}.rsc.push(`;
+const RSC_RUNTIME_DONE_SCRIPT = `${RSC_RUNTIME_BOOTSTRAP_EXPRESSION}.done=true`;
 /**
 * Reconstruct the RSC payload from a prerender HTML response by parsing the
 * inline bootstrap chunk scripts emitted by createRscEmbedTransform.
@@ -59,15 +64,19 @@ function extractRscPayloadFromPrerenderedHtml(html) {
 	let match;
 	while ((match = scriptPattern.exec(html)) !== null) {
 		const script = (match[1] ?? "").trim().replace(/;$/, "");
-		if (script === `self.${RSC_DONE_MARKER}`) {
+		if (script === RSC_RUNTIME_DONE_SCRIPT || script === RSC_LEGACY_DONE_SCRIPT) {
 			sawDone = true;
 			continue;
 		}
-		if (script.startsWith(RSC_CHUNK_SCRIPT_PREFIX)) chunks.push(decodeRscEmbeddedChunk(parseRscChunkPushArgument(script)));
+		if (script.startsWith(RSC_RUNTIME_CHUNK_FULL_PREFIX)) {
+			chunks.push(decodeRscEmbeddedChunk(parseRscChunkPushArgument(script, RSC_RUNTIME_CHUNK_FULL_PREFIX)));
+			continue;
+		}
+		if (script.startsWith(RSC_LEGACY_CHUNK_SCRIPT_PREFIX)) chunks.push(decodeRscEmbeddedChunk(parseRscChunkPushArgument(script, RSC_LEGACY_CHUNK_FULL_PREFIX)));
 	}
 	if (chunks.length === 0 && !sawDone) return null;
 	if (chunks.length === 0) throw new Error("[vinext] Malformed prerender RSC embed: done marker present without chunk scripts");
-	if (!sawDone) throw new Error("[vinext] Malformed prerender RSC embed: missing __VINEXT_RSC_DONE__ marker");
+	if (!sawDone) throw new Error("[vinext] Malformed prerender RSC embed: missing RSC done marker");
 	return concatUint8Arrays(chunks);
 }
 /**
@@ -77,9 +86,9 @@ function extractRscPayloadFromPrerenderedHtml(html) {
 * prefix and ends with `)`. JSON.parse on the slice catches any tampering or
 * trailing code.
 */
-function parseRscChunkPushArgument(script) {
-	if (!script.startsWith(RSC_CHUNK_FULL_PREFIX) || !script.endsWith(")")) throw new Error("[vinext] Malformed prerender RSC embed: unexpected chunk script shape");
-	const jsonSource = script.slice(RSC_CHUNK_FULL_PREFIX.length, -1);
+function parseRscChunkPushArgument(script, chunkPrefix) {
+	if (!script.startsWith(chunkPrefix) || !script.endsWith(")")) throw new Error("[vinext] Malformed prerender RSC embed: unexpected chunk script shape");
+	const jsonSource = script.slice(chunkPrefix.length, -1);
 	let parsed;
 	try {
 		parsed = JSON.parse(jsonSource);
@@ -135,23 +144,13 @@ function buildUrlFromParams(pattern, params) {
 	return "/" + result.join("/");
 }
 /**
-* Determine the HTML output file path for a URL.
-* Respects trailingSlash config.
-*/
-function getOutputPath(urlPath, trailingSlash) {
-	if (urlPath === "/") return "index.html";
-	const clean = urlPath.replace(/^\//, "");
-	if (trailingSlash) return `${clean}/index.html`;
-	return `${clean}.html`;
-}
-/**
 * Resolve parent dynamic segment params for a route.
 * Handles top-down generateStaticParams resolution for nested dynamic routes.
 *
 * Uses the `staticParamsMap` (pattern → generateStaticParams) exported from
 * the production bundle.
 */
-async function resolveParentParams(childRoute, routeIndex, staticParamsMap) {
+async function resolveParentParams(childRoute, staticParamsMap) {
 	const { patternParts } = childRoute;
 	let lastDynamicIdx = -1;
 	for (let i = patternParts.length - 1; i >= 0; i--) if (patternParts[i].startsWith(":")) {
@@ -164,25 +163,29 @@ async function resolveParentParams(childRoute, routeIndex, staticParamsMap) {
 		const part = patternParts[i];
 		prefixPattern += "/" + part;
 		if (!part.startsWith(":")) continue;
-		if (routeIndex.get(prefixPattern)?.pagePath) {
-			const fn = staticParamsMap[prefixPattern];
-			if (typeof fn === "function") parentSegments.push(fn);
-		}
+		const fn = staticParamsMap[prefixPattern];
+		if (typeof fn === "function") parentSegments.push(fn);
 	}
 	if (parentSegments.length === 0) return [];
 	let currentParams = [{}];
+	let resolvedAnyParent = false;
 	for (const generateStaticParams of parentSegments) {
 		const nextParams = [];
+		let resolvedThisParent = false;
 		for (const parentParams of currentParams) {
 			const results = await generateStaticParams({ params: parentParams });
-			if (Array.isArray(results)) for (const result of results) nextParams.push({
+			if (results === null) continue;
+			if (!Array.isArray(results)) return [];
+			resolvedThisParent = true;
+			resolvedAnyParent = true;
+			for (const result of results) nextParams.push({
 				...parentParams,
 				...result
 			});
 		}
-		currentParams = nextParams;
+		if (resolvedThisParent) currentParams = nextParams;
 	}
-	return currentParams;
+	return resolvedAnyParent ? currentParams : [];
 }
 /**
 * Run the prerender phase for Pages Router.
@@ -505,7 +508,6 @@ async function prerenderApp({ routes, outDir, config, mode, rscBundlePath, ...op
 				return false;
 			}
 		});
-		const routeIndex = new Map(routes.map((r) => [r.pattern, r]));
 		const urlsToRender = [];
 		for (const route of routes) {
 			const renderEntryPath = getAppRouteRenderEntryPath(route);
@@ -556,7 +558,7 @@ async function prerenderApp({ routes, outDir, config, mode, rscBundlePath, ...op
 					});
 					continue;
 				}
-				const parentParamSets = await resolveParentParams(route, routeIndex, staticParamsMap);
+				const parentParamSets = await resolveParentParams(route, staticParamsMap);
 				let paramSets;
 				if (parentParamSets.length > 0) {
 					paramSets = [];
@@ -570,8 +572,15 @@ async function prerenderApp({ routes, outDir, config, mode, rscBundlePath, ...op
 							...parentParams,
 							...childParams
 						});
+						else {
+							paramSets = [];
+							break;
+						}
 					}
-				} else paramSets = await generateStaticParamsFn({ params: {} });
+				} else {
+					const results = await generateStaticParamsFn({ params: {} });
+					paramSets = Array.isArray(results) || results === null ? results : [];
+				}
 				if (paramSets === null) {
 					if (mode === "export") results.push({
 						route: route.pattern,
@@ -772,15 +781,6 @@ async function prerenderApp({ routes, outDir, config, mode, rscBundlePath, ...op
 		if (ownedProdServerHandle) await new Promise((resolve) => ownedProdServerHandle.server.close(() => resolve()));
 	}
 }
-/**
-* Determine the RSC output file path for a URL.
-* "/blog/hello-world" → "blog/hello-world.rsc"
-* "/"                 → "index.rsc"
-*/
-function getRscOutputPath(urlPath) {
-	if (urlPath === "/") return "index.rsc";
-	return urlPath.replace(/^\//, "") + ".rsc";
-}
 function resolveRenderedCacheControl(requestCacheLife, cacheControl, fallbackExpireSeconds) {
 	const sMaxage = parseCacheControlSeconds(cacheControl, "s-maxage");
 	const staleWhileRevalidate = parseCacheControlSeconds(cacheControl, "stale-while-revalidate");
@@ -846,6 +846,6 @@ function writePrerenderIndex(routes, outDir, options) {
 	fs.writeFileSync(path.join(outDir, "vinext-prerender.json"), JSON.stringify(index, null, 2), "utf-8");
 }
 //#endregion
-export { extractRscPayloadFromPrerenderedHtml, getOutputPath, getRscOutputPath, prerenderApp, prerenderPages, readPrerenderSecret, resolveParentParams, writePrerenderIndex };
+export { extractRscPayloadFromPrerenderedHtml, prerenderApp, prerenderPages, readPrerenderSecret, resolveParentParams, writePrerenderIndex };
 
 //# sourceMappingURL=prerender.js.map