vinext 1.0.0-beta.0 → 1.0.0-beta.2

package/dist/routing/app-router.js

@@ -20,7 +20,9 @@ import { buildAppRouteGraph, computeAppRouteStaticSiblings, computeRootParamName
 let cachedGraph = null;
 let cachedAppDir = null;
 let cachedPageExtensionsKey = null;
+let cacheGeneration = 0;
 function invalidateAppRouteCache() {
+	cacheGeneration++;
 	cachedGraph = null;
 	cachedAppDir = null;
 	cachedPageExtensionsKey = null;
@@ -30,25 +32,24 @@ function invalidateAppRouteCache() {
 * TODO(#726): Layer 4 should consume this read model directly once the
 * navigation planner owns route graph facts.
 *
-* `appDir` must be forward-slash — callers normalize it at their entry, and it
-* flows into `buildAppRouteGraph`, which builds every path with `path.posix.*`.
-*
 * @internal
 */
 async function appRouteGraph(appDir, pageExtensions, matcher) {
 	matcher ??= createValidFileMatcher(pageExtensions);
 	const pageExtensionsKey = JSON.stringify(matcher.extensions);
-	if (cachedGraph && cachedAppDir === appDir && cachedPageExtensionsKey === pageExtensionsKey) return cachedGraph;
-	const graph = await buildAppRouteGraph(appDir, matcher);
-	cachedGraph = graph;
-	cachedAppDir = appDir;
-	cachedPageExtensionsKey = pageExtensionsKey;
-	return graph;
+	while (true) {
+		if (cachedGraph && cachedAppDir === appDir && cachedPageExtensionsKey === pageExtensionsKey) return cachedGraph;
+		const scanGeneration = cacheGeneration;
+		const graph = await buildAppRouteGraph(appDir, matcher);
+		if (scanGeneration !== cacheGeneration) continue;
+		cachedGraph = graph;
+		cachedAppDir = appDir;
+		cachedPageExtensionsKey = pageExtensionsKey;
+		return graph;
+	}
 }
 /**
 * Scan the app/ directory and return a list of routes.
-*
-* `appDir` must be forward-slash — it is forwarded to `appRouteGraph`.
 */
 async function appRouter(appDir, pageExtensions, matcher) {
 	return (await appRouteGraph(appDir, pageExtensions, matcher)).routes;

package/dist/routing/file-matcher.d.ts

@@ -21,38 +21,24 @@ declare function findFileWithExtensions(basePath: string, matcher: ValidFileMatc
 /**
  * Find a file by basename and configured page extension in a directory.
  * Returns the first matching absolute path, or null if not found.
- *
- * `dir` must be forward-slash. The returned path is built with `path.posix.join`,
- * so it is forward-slash too.
  */
 declare function findFileWithExts(dir: string, name: string, matcher: ValidFileMatcher): string | null;
 /**
- * Vite's default `resolve.extensions` covers `.tsx/.ts/.jsx/.js/.json` (and
- * `.mjs/.mts`). When the user configures `pageExtensions` with values Vite
- * does not know about — e.g. `["platform.tsx", "tsx", "mdx"]` from the
- * Next.js `resolve-extensions` fixture — extensionless imports of those
- * files fail to resolve, and the build crashes with "Custom deploy script
- * failed: undefined (1)".
- *
- * Build the merged extension list that Vite should use:
+ * Add the config extensions produced by `vinext init` to vinext's resolver.
  *
- *  1. User-configured pageExtensions go first (each prefixed with `.`) so
- *     the user's priority wins. e.g. `.platform.tsx` resolves before `.tsx`.
- *  2. Vite's defaults follow, with duplicates removed.
- *  3. `.cjs`/`.cts` go last (lowest priority). Neither Vite's defaults nor the
- *     user's pageExtensions include them, but `vinext init` renames CJS config
- *     files (e.g. `tailwind.config.js` → `tailwind.config.cjs`) when it adds
- *     `"type": "module"`, and app code imports those extensionlessly
- *     (`import cfg from "../tailwind.config"`). Without these, the bundle fails
- *     with "[UNRESOLVED_IMPORT] Could not resolve '../tailwind.config'".
+ * `pageExtensions` is intentionally not part of module resolution. Next.js
+ * uses it to discover route files; custom module extensions are configured
+ * separately through `turbopack.resolveExtensions` or webpack
+ * `resolve.extensions`.
  *
- * The user's pageExtensions retain their relative order, which is what
- * Next.js / Turbopack do via the `resolveExtensions` config option.
+ * The default order preserves vinext's existing module-resolution behavior
+ * and matches Next.js Turbopack for overlapping JavaScript and TypeScript
+ * extensions.
  *
- * See: cloudflare/vinext#1502 for page-extension ordering, and
- * cloudflare/vinext#2435 for extensionless `.cjs` config imports.
+ * `.cjs`/`.cts` go last because `vinext init` renames CJS config files when it
+ * adds `"type": "module"`, and app code may import those files extensionlessly.
  */
-declare function buildViteResolveExtensions(pageExtensions?: readonly string[] | null, viteDefaults?: readonly string[]): string[];
+declare function buildViteResolveExtensions(viteExtensions?: readonly string[]): string[];
 /**
  * Normalize an explicit Next.js resolver extension list for Vite.
  *
@@ -66,9 +52,8 @@ declare function normalizeViteResolveExtensions(extensions: readonly string[]):
  * Use function-form exclude for Node < 22.14 compatibility.
  *
  * Yields forward-slash relative paths: node's glob emits native (backslash)
- * separators on Windows, so each match is normalized — this is the entry point
- * that lets downstream consumers treat the scanned paths as canonical
- * forward-slash ids.
+ * separators on Windows, so each match goes through `toSlash` — this is the
+ * boundary where external fs output enters the canonical forward-slash space.
  */
 declare function scanWithExtensions(stem: string, cwd: string, extensions: readonly string[], exclude?: (name: string) => boolean): AsyncGenerator<string>;
 //#endregion

package/dist/routing/file-matcher.js

@@ -1,7 +1,6 @@
-import { normalizePathSeparators } from "../utils/path.js";
+import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { escapeRegExp } from "../utils/regex.js";
 import { existsSync } from "node:fs";
-import path from "node:path";
 import { glob } from "node:fs/promises";
 //#region src/routing/file-matcher.ts
 const DEFAULT_PAGE_EXTENSIONS = [
@@ -10,6 +9,15 @@ const DEFAULT_PAGE_EXTENSIONS = [
 	"jsx",
 	"js"
 ];
+const DEFAULT_VINEXT_RESOLVE_EXTENSIONS = [
+	".tsx",
+	".ts",
+	".jsx",
+	".js",
+	".mjs",
+	".mts",
+	".json"
+];
 function normalizePageExtensions(pageExtensions) {
 	if (!Array.isArray(pageExtensions) || pageExtensions.length === 0) return [...DEFAULT_PAGE_EXTENSIONS];
 	const filtered = pageExtensions.filter((ext) => typeof ext === "string").map((ext) => ext.trim().replace(/^\.+/, "")).filter((ext) => ext.length > 0);
@@ -19,6 +27,10 @@ function buildExtensionGlob(stem, extensions) {
 	if (extensions.length === 1) return `${stem}.${extensions[0]}`;
 	return `${stem}.{${extensions.join(",")}}`;
 }
+function includeDotDirectoryMatches(pattern) {
+	if (!pattern.startsWith("**/")) return pattern;
+	return `{**,**/.*/**}/${pattern.slice(3)}`;
+}
 /**
 * Ported in spirit from Next.js createValidFileMatcher:
 * packages/next/src/server/lib/find-page-file.ts
@@ -67,58 +79,34 @@ function findFileWithExtensions(basePath, matcher) {
 /**
 * Find a file by basename and configured page extension in a directory.
 * Returns the first matching absolute path, or null if not found.
-*
-* `dir` must be forward-slash. The returned path is built with `path.posix.join`,
-* so it is forward-slash too.
 */
 function findFileWithExts(dir, name, matcher) {
 	for (const ext of matcher.dottedExtensions) {
-		const filePath = path.posix.join(dir, name + ext);
+		const filePath = path.join(dir, name + ext);
 		if (existsSync(filePath)) return filePath;
 	}
 	return null;
 }
 /**
-* Vite's default `resolve.extensions` covers `.tsx/.ts/.jsx/.js/.json` (and
-* `.mjs/.mts`). When the user configures `pageExtensions` with values Vite
-* does not know about — e.g. `["platform.tsx", "tsx", "mdx"]` from the
-* Next.js `resolve-extensions` fixture — extensionless imports of those
-* files fail to resolve, and the build crashes with "Custom deploy script
-* failed: undefined (1)".
-*
-* Build the merged extension list that Vite should use:
+* Add the config extensions produced by `vinext init` to vinext's resolver.
 *
-*  1. User-configured pageExtensions go first (each prefixed with `.`) so
-*     the user's priority wins. e.g. `.platform.tsx` resolves before `.tsx`.
-*  2. Vite's defaults follow, with duplicates removed.
-*  3. `.cjs`/`.cts` go last (lowest priority). Neither Vite's defaults nor the
-*     user's pageExtensions include them, but `vinext init` renames CJS config
-*     files (e.g. `tailwind.config.js` → `tailwind.config.cjs`) when it adds
-*     `"type": "module"`, and app code imports those extensionlessly
-*     (`import cfg from "../tailwind.config"`). Without these, the bundle fails
-*     with "[UNRESOLVED_IMPORT] Could not resolve '../tailwind.config'".
+* `pageExtensions` is intentionally not part of module resolution. Next.js
+* uses it to discover route files; custom module extensions are configured
+* separately through `turbopack.resolveExtensions` or webpack
+* `resolve.extensions`.
 *
-* The user's pageExtensions retain their relative order, which is what
-* Next.js / Turbopack do via the `resolveExtensions` config option.
+* The default order preserves vinext's existing module-resolution behavior
+* and matches Next.js Turbopack for overlapping JavaScript and TypeScript
+* extensions.
 *
-* See: cloudflare/vinext#1502 for page-extension ordering, and
-* cloudflare/vinext#2435 for extensionless `.cjs` config imports.
+* `.cjs`/`.cts` go last because `vinext init` renames CJS config files when it
+* adds `"type": "module"`, and app code may import those files extensionlessly.
 */
-function buildViteResolveExtensions(pageExtensions, viteDefaults = [
-	".mjs",
-	".js",
-	".mts",
-	".ts",
-	".jsx",
-	".tsx",
-	".json"
-]) {
-	const dotted = normalizePageExtensions(pageExtensions).map((ext) => `.${ext}`);
+function buildViteResolveExtensions(viteExtensions = DEFAULT_VINEXT_RESOLVE_EXTENSIONS) {
 	const seen = /* @__PURE__ */ new Set();
 	const result = [];
 	for (const ext of [
-		...dotted,
-		...viteDefaults,
+		...viteExtensions,
 		".cjs",
 		".cts"
 	]) {
@@ -153,16 +141,15 @@ function normalizeViteResolveExtensions(extensions) {
 * Use function-form exclude for Node < 22.14 compatibility.
 *
 * Yields forward-slash relative paths: node's glob emits native (backslash)
-* separators on Windows, so each match is normalized — this is the entry point
-* that lets downstream consumers treat the scanned paths as canonical
-* forward-slash ids.
+* separators on Windows, so each match goes through `toSlash` — this is the
+* boundary where external fs output enters the canonical forward-slash space.
 */
 async function* scanWithExtensions(stem, cwd, extensions, exclude) {
-	const pattern = buildExtensionGlob(stem, extensions);
+	const pattern = includeDotDirectoryMatches(buildExtensionGlob(stem, extensions));
 	for await (const file of glob(pattern, {
 		cwd,
 		...exclude ? { exclude } : {}
-	})) yield normalizePathSeparators(file);
+	})) yield toSlash(file);
 }
 //#endregion
 export { buildViteResolveExtensions, createValidFileMatcher, findFileWithExtensions, findFileWithExts, normalizePageExtensions, normalizeViteResolveExtensions, scanWithExtensions };

package/dist/routing/pages-router.js

@@ -1,21 +1,23 @@
+import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { decodeRouteSegment, sortRoutes } from "./utils.js";
 import { createValidFileMatcher, scanWithExtensions } from "./file-matcher.js";
 import { patternToNextFormat, validateRoutePatterns } from "./route-validation.js";
-import { createRouteTrieCache, matchRouteWithTrie } from "./route-matching.js";
-import path from "node:path";
+import { createRouteTrieCache, matchRouteWithTrieRawPathname } from "./route-matching.js";
 //#region src/routing/pages-router.ts
 /** Next.js special pages that should not produce routes. */
-const RESERVED_PAGE_NAMES = new Set([
+const RESERVED_PAGE_NAMES = /* @__PURE__ */ new Set([
 	"_app",
 	"_document",
 	"_error"
 ]);
 const routeCache = /* @__PURE__ */ new Map();
+let routeCacheGeneration = 0;
 /**
 * Invalidate cached routes for a given pages directory.
 * Called by the file watcher when pages are added/removed.
 */
 function invalidateRouteCache(pagesDir) {
+	routeCacheGeneration++;
 	for (const key of routeCache.keys()) if (key.startsWith(`pages:${pagesDir}:`) || key.startsWith(`api:${pagesDir}:`)) routeCache.delete(key);
 }
 /**
@@ -32,20 +34,7 @@ function invalidateRouteCache(pagesDir) {
 */
 async function pagesRouter(pagesDir, pageExtensions, matcher) {
 	matcher ??= createValidFileMatcher(pageExtensions);
-	const cacheKey = `pages:${pagesDir}:${JSON.stringify(matcher.extensions)}`;
-	const cached = routeCache.get(cacheKey);
-	if (cached) return cached.promise;
-	const promise = scanPageRoutes(pagesDir, matcher);
-	routeCache.set(cacheKey, {
-		routes: [],
-		promise
-	});
-	const routes = await promise;
-	routeCache.set(cacheKey, {
-		routes,
-		promise
-	});
-	return routes;
+	return getCachedRoutes(`pages:${pagesDir}:${JSON.stringify(matcher.extensions)}`, () => scanPageRoutes(pagesDir, matcher));
 }
 async function scanPageRoutes(pagesDir, matcher) {
 	const routes = [];
@@ -114,7 +103,7 @@ const trieCache = createRouteTrieCache();
 * Returns the matched params or null if no match.
 */
 function matchRoute(url, routes) {
-	return matchRouteWithTrie(url, routes, trieCache);
+	return matchRouteWithTrieRawPathname(url, routes, trieCache);
 }
 /**
 * Scan the pages/api/ directory and return API routes.
@@ -126,20 +115,25 @@ function matchRoute(url, routes) {
 */
 async function apiRouter(pagesDir, pageExtensions, matcher) {
 	matcher ??= createValidFileMatcher(pageExtensions);
-	const cacheKey = `api:${pagesDir}:${JSON.stringify(matcher.extensions)}`;
+	return getCachedRoutes(`api:${pagesDir}:${JSON.stringify(matcher.extensions)}`, () => scanApiRoutes(pagesDir, matcher));
+}
+async function getCachedRoutes(cacheKey, scan) {
 	const cached = routeCache.get(cacheKey);
-	if (cached) return cached.promise;
-	const promise = scanApiRoutes(pagesDir, matcher);
-	routeCache.set(cacheKey, {
-		routes: [],
-		promise
-	});
-	const routes = await promise;
-	routeCache.set(cacheKey, {
-		routes,
-		promise
-	});
-	return routes;
+	if (cached) return cached;
+	const promise = (async () => {
+		while (true) {
+			const scanGeneration = routeCacheGeneration;
+			const routes = await scan();
+			if (scanGeneration === routeCacheGeneration) return routes;
+		}
+	})();
+	routeCache.set(cacheKey, promise);
+	try {
+		return await promise;
+	} catch (error) {
+		if (routeCache.get(cacheKey) === promise) routeCache.delete(cacheKey);
+		throw error;
+	}
 }
 async function scanApiRoutes(pagesDir, matcher) {
 	const apiDir = path.join(pagesDir, "api");
@@ -152,7 +146,7 @@ async function scanApiRoutes(pagesDir, matcher) {
 	}
 	const routes = [];
 	for (const file of files) {
-		const route = fileToRoute(path.posix.join("api", file), pagesDir, matcher);
+		const route = fileToRoute(path.join("api", file), pagesDir, matcher);
 		if (route) routes.push(route);
 	}
 	validateRoutePatterns(routes.map((route) => route.pattern));

package/dist/routing/route-matching.d.ts

@@ -23,5 +23,18 @@ declare function matchRouteWithTrie<R extends {
   route: R;
   params: Record<string, string | string[]>;
 } | null;
+/**
+ * Match a filesystem route against the request's raw encoded pathname.
+ *
+ * Next.js compares static route identity before decoding, so `/%61bout` does
+ * not select the filesystem route `/about`. Dynamic captures are still decoded
+ * exactly once by `trieMatch`, matching `getRouteMatcher` upstream.
+ */
+declare function matchRouteWithTrieRawPathname<R extends {
+  patternParts: string[];
+}>(url: string, routes: R[], cache: RouteTrieCache<R>): {
+  route: R;
+  params: Record<string, string | string[]>;
+} | null;
 //#endregion
-export { createRouteTrieCache, matchRouteWithTrie };
+export { createRouteTrieCache, matchRouteWithTrie, matchRouteWithTrieRawPathname };

package/dist/routing/route-matching.js

@@ -38,5 +38,17 @@ function matchRouteWithTrie(url, routes, cache) {
 	const urlParts = normalizedUrl.split("/").filter(Boolean);
 	return trieMatch(getOrBuildTrie(cache, routes), urlParts);
 }
+/**
+* Match a filesystem route against the request's raw encoded pathname.
+*
+* Next.js compares static route identity before decoding, so `/%61bout` does
+* not select the filesystem route `/about`. Dynamic captures are still decoded
+* exactly once by `trieMatch`, matching `getRouteMatcher` upstream.
+*/
+function matchRouteWithTrieRawPathname(url, routes, cache) {
+	const pathname = url.split("?")[0];
+	const urlParts = (pathname === "/" ? "/" : pathname.replace(/\/$/, "")).split("/").filter(Boolean);
+	return trieMatch(getOrBuildTrie(cache, routes), urlParts);
+}
 //#endregion
-export { createRouteTrieCache, matchRouteWithTrie };
+export { createRouteTrieCache, matchRouteWithTrie, matchRouteWithTrieRawPathname };

package/dist/routing/route-pattern.d.ts

@@ -4,6 +4,7 @@ declare function routePatternParts(pathname: string): string[];
 declare function routePattern(pathname: string): string;
 declare function fillRoutePatternSegments(pathname: string, params: RoutePatternParams): string | null;
 declare function matchRoutePattern(urlParts: readonly string[], patternParts: readonly string[]): RoutePatternParams | null;
+declare function matchRoutePatternRaw(urlParts: readonly string[], patternParts: readonly string[]): RoutePatternParams | null;
 declare function matchRoutePatternPrefix(pathParts: readonly string[], patternParts: readonly string[]): boolean;
 declare function matchRoutePatternWithOptionalDynamicSegments(pathParts: readonly string[], patternParts: readonly string[]): boolean;
 /**
@@ -61,4 +62,4 @@ declare function normalizeStaticPathname(pathname: string): string;
  */
 declare function normalizeStaticPathsEntry(entry: StaticPathsEntry, routePattern: string): NormalizedStaticPathsEntry;
 //#endregion
-export { RoutePatternParams, StaticPathsEntry, fillRoutePatternSegments, matchRoutePattern, matchRoutePatternPrefix, matchRoutePatternWithOptionalDynamicSegments, normalizeStaticPathname, normalizeStaticPathsEntry, routePattern, routePatternParts };
+export { RoutePatternParams, StaticPathsEntry, fillRoutePatternSegments, matchRoutePattern, matchRoutePatternPrefix, matchRoutePatternRaw, matchRoutePatternWithOptionalDynamicSegments, normalizeStaticPathname, normalizeStaticPathsEntry, routePattern, routePatternParts };

package/dist/routing/route-pattern.js

@@ -56,6 +56,11 @@ function fillRoutePatternSegments(pathname, params) {
 	return resolvedSegments.length > 0 ? `/${resolvedSegments.join("/")}` : "/";
 }
 function matchRoutePattern(urlParts, patternParts) {
+	const params = matchRoutePatternRaw(urlParts, patternParts);
+	if (params) decodeMatchedParams(params);
+	return params;
+}
+function matchRoutePatternRaw(urlParts, patternParts) {
 	const params = Object.create(null);
 	function matchFrom(urlIndex, patternIndex) {
 		if (patternIndex === patternParts.length) return urlIndex === urlParts.length;
@@ -83,9 +88,7 @@ function matchRoutePattern(urlParts, patternParts) {
 		if (urlIndex >= urlParts.length || urlParts[urlIndex] !== patternPart) return false;
 		return matchFrom(urlIndex + 1, patternIndex + 1);
 	}
-	if (!matchFrom(0, 0)) return null;
-	decodeMatchedParams(params);
-	return params;
+	return matchFrom(0, 0) ? params : null;
 }
 function matchRoutePatternPrefix(pathParts, patternParts) {
 	let pathIndex = 0;
@@ -162,4 +165,4 @@ function normalizeStaticPathsEntry(entry, routePattern) {
 	return { params };
 }
 //#endregion
-export { fillRoutePatternSegments, matchRoutePattern, matchRoutePatternPrefix, matchRoutePatternWithOptionalDynamicSegments, normalizeStaticPathname, normalizeStaticPathsEntry, routePattern, routePatternParts };
+export { fillRoutePatternSegments, matchRoutePattern, matchRoutePatternPrefix, matchRoutePatternRaw, matchRoutePatternWithOptionalDynamicSegments, normalizeStaticPathname, normalizeStaticPathsEntry, routePattern, routePatternParts };

package/dist/routing/route-trie.d.ts

@@ -63,5 +63,9 @@ declare function trieMatch<R>(root: TrieNode<R>, urlParts: string[]): {
   route: R;
   params: Record<string, string | string[]>;
 } | null;
+declare function trieMatchRaw<R>(root: TrieNode<R>, urlParts: string[]): {
+  route: R;
+  params: Record<string, string | string[]>;
+} | null;
 //#endregion
-export { TrieNode, buildRouteTrie, trieMatch };
+export { TrieNode, buildRouteTrie, trieMatch, trieMatchRaw };

package/dist/routing/route-trie.js

@@ -92,10 +92,13 @@ function buildRouteTrie(routes) {
 * @returns Match result with route and extracted params, or null
 */
 function trieMatch(root, urlParts) {
-	const result = match(root, urlParts, 0, []);
+	const result = trieMatchRaw(root, urlParts);
 	if (result) decodeMatchedParams(result.params);
 	return result;
 }
+function trieMatchRaw(root, urlParts) {
+	return match(root, urlParts, 0, []);
+}
 function match(node, urlParts, index, entries) {
 	if (index === urlParts.length) {
 		if (node.route !== null) return {
@@ -140,4 +143,4 @@ function match(node, urlParts, index, entries) {
 	return null;
 }
 //#endregion
-export { buildRouteTrie, trieMatch };
+export { buildRouteTrie, trieMatch, trieMatchRaw };

package/dist/server/api-handler.js

@@ -8,7 +8,7 @@ import { DEFAULT_PAGES_API_BODY_SIZE_LIMIT, resolveBodyParserConfig } from "./pa
 import { PagesBodyParseError, getMediaType, isJsonMediaType } from "./pages-media-type.js";
 import { resolveRequestHost, resolveRequestProtocol } from "./proxy-trust.js";
 import { performOnDemandRevalidate } from "./pages-revalidate.js";
-import { attachPagesRequestCookies } from "./pages-node-compat.js";
+import { attachPagesPreviewApi, attachPagesRequestCookies } from "./pages-node-compat.js";
 import { isEdgeApiRuntime } from "./edge-api-runtime.js";
 import { decode } from "node:querystring";
 import { Buffer } from "node:buffer";
@@ -166,41 +166,49 @@ function enhanceApiObjects(req, res, query, body) {
 		query
 	});
 	attachPagesRequestCookies(apiReq);
-	return {
-		apiReq,
-		apiRes: Object.assign(res, {
-			status(code) {
-				this.statusCode = code;
-				return this;
-			},
-			json(data) {
+	const apiRes = Object.assign(res, {
+		status(code) {
+			this.statusCode = code;
+			return this;
+		},
+		json(data) {
+			this.setHeader("Content-Type", "application/json");
+			this.end(JSON.stringify(data));
+		},
+		send(data) {
+			if (Buffer.isBuffer(data)) {
+				if (!this.getHeader("Content-Type")) this.setHeader("Content-Type", "application/octet-stream");
+				this.setHeader("Content-Length", String(data.length));
+				this.end(data);
+				return;
+			}
+			if (typeof data === "object" && data !== null) {
 				this.setHeader("Content-Type", "application/json");
 				this.end(JSON.stringify(data));
-			},
-			send(data) {
-				if (Buffer.isBuffer(data)) {
-					if (!this.getHeader("Content-Type")) this.setHeader("Content-Type", "application/octet-stream");
-					this.setHeader("Content-Length", String(data.length));
-					this.end(data);
-					return;
-				}
-				if (typeof data === "object" && data !== null) {
-					this.setHeader("Content-Type", "application/json");
-					this.end(JSON.stringify(data));
-				} else {
-					if (!this.getHeader("Content-Type")) this.setHeader("Content-Type", "text/plain");
-					this.end(String(data));
-				}
-			},
-			redirect(statusOrUrl, url) {
-				if (typeof statusOrUrl === "string") this.writeHead(307, { Location: statusOrUrl });
-				else this.writeHead(statusOrUrl, { Location: url ?? "" });
-				this.end();
-			},
-			async revalidate(urlPath, opts) {
-				await performOnDemandRevalidate(req, urlPath, opts);
+			} else {
+				if (!this.getHeader("Content-Type")) this.setHeader("Content-Type", "text/plain");
+				this.end(String(data));
+			}
+		},
+		redirect(statusOrUrl, url) {
+			if (typeof statusOrUrl === "string") {
+				url = statusOrUrl;
+				statusOrUrl = 307;
 			}
-		})
+			if (typeof statusOrUrl !== "number" || typeof url !== "string") throw new Error("Invalid redirect arguments. Please use a single argument URL, e.g. res.redirect('/destination') or use a status code and URL, e.g. res.redirect(307, '/destination').");
+			this.writeHead(statusOrUrl, { Location: url });
+			this.write(url);
+			this.end();
+			return this;
+		},
+		async revalidate(urlPath, opts) {
+			await performOnDemandRevalidate(req, urlPath, opts);
+		}
+	});
+	attachPagesPreviewApi(apiReq, apiRes);
+	return {
+		apiReq,
+		apiRes
 	};
 }
 /**