vinext 1.0.0-beta.1 → 1.0.0-beta.2

package/dist/shims/server.js

@@ -17,6 +17,10 @@ import { assertSafeNavigationUrl } from "./url-safety.js";
 * This is a pragmatic subset — we implement the most commonly used APIs
 * rather than bug-for-bug parity with Next.js internals.
 */
+/** @deprecated Import ImageResponse from `next/og` instead. */
+function ImageResponse() {
+	throw new Error("ImageResponse has moved from next/server to next/og");
+}
 const _USE_CACHE_ALS_KEY = Symbol.for("vinext.cacheRuntime.contextAls");
 const _UNSTABLE_CACHE_ALS_KEY = Symbol.for("vinext.unstableCache.als");
 const _g = globalThis;
@@ -60,10 +64,18 @@ var NextRequest = class extends Request {
 			});
 		} else super(input, requestInit);
 		const url = typeof input === "string" ? new URL(input, "http://localhost") : input instanceof URL ? input : new URL(input.url, "http://localhost");
+		const i18n = _nextConfig?.i18n ? {
+			locales: [..._nextConfig.i18n.locales],
+			defaultLocale: _nextConfig.i18n.defaultLocale,
+			domains: _nextConfig.i18n.domains?.map((domain) => ({
+				...domain,
+				locales: domain.locales ? [...domain.locales] : void 0
+			}))
+		} : void 0;
 		const urlConfig = _nextConfig ? {
 			basePath: _nextConfig.basePath,
 			nextConfig: {
-				i18n: _nextConfig.i18n,
+				i18n,
 				trailingSlash: _nextConfig.trailingSlash
 			}
 		} : void 0;
@@ -80,6 +92,12 @@ var NextRequest = class extends Request {
 	get cookies() {
 		return this._cookies;
 	}
+	get page() {
+		throw new Error("NextRequest.page has been removed; use URLPattern instead");
+	}
+	get ua() {
+		throw new Error("NextRequest.ua has been removed; use userAgent() instead");
+	}
 	/**
 	* Client IP address. Prefers Cloudflare's trusted CF-Connecting-IP header
 	* over the spoofable X-Forwarded-For. Returns undefined if unavailable.
@@ -407,6 +425,9 @@ var NextURL = class NextURL {
 	toString() {
 		return this.href;
 	}
+	toJSON() {
+		return this.href;
+	}
 	/**
 	* The build ID of the Next.js application.
 	* Set from `generateBuildId` in next.config.js, or a random UUID if not configured.
@@ -489,7 +510,7 @@ var RequestCookies = class {
 		else this._headers.set("cookie", this._serialize());
 	}
 	[Symbol.iterator]() {
-		return this.getAll().map((c) => [c.name, c])[Symbol.iterator]();
+		return new Map(this.getAll().map((cookie) => [cookie.name, cookie])).entries();
 	}
 };
 var ReadonlyRequestCookiesError = class ReadonlyRequestCookiesError extends Error {
@@ -557,7 +578,12 @@ var ResponseCookies = class {
 	set(...args) {
 		const [name, value, opts] = parseCookieSetArgs(args);
 		validateCookieName(name);
-		const serialized = serializeSetCookie(name, value, opts);
+		const sameSite = opts?.sameSite === true ? "Strict" : typeof opts?.sameSite === "string" ? opts.sameSite[0].toUpperCase() + opts.sameSite.slice(1) : void 0;
+		const serialized = serializeSetCookie(name, value, {
+			...opts,
+			expires: typeof opts?.expires === "number" ? new Date(opts.expires) : opts?.expires,
+			sameSite
+		});
 		this._parsed.set(name, {
 			serialized,
 			entry: {
@@ -595,7 +621,7 @@ var ResponseCookies = class {
 		});
 	}
 	[Symbol.iterator]() {
-		return [...this._parsed.values()].map((v) => [v.entry.name, v.entry])[Symbol.iterator]();
+		return new Map([...this._parsed.values()].map(({ entry }) => [entry.name, entry])).entries();
 	}
 	/** Delete all Set-Cookie headers and re-append from the internal map. */
 	_syncHeaders() {
@@ -655,8 +681,21 @@ var NextFetchEvent = class {
 	_waitUntilPromises = [];
 	constructor(params) {
 		this.sourcePage = params.page;
+		if (params.context) this._externalWaitUntil = params.context.waitUntil.bind(params.context);
+	}
+	_externalWaitUntil;
+	get request() {
+		throw new Error(`The middleware signature for ${this.sourcePage} no longer exposes event.request`);
 	}
+	respondWith() {
+		throw new Error(`The middleware signature for ${this.sourcePage} no longer uses respondWith()`);
+	}
+	passThroughOnException() {}
 	waitUntil(promise) {
+		if (this._externalWaitUntil) {
+			this._externalWaitUntil(promise);
+			return;
+		}
 		this._waitUntilPromises.push(promise);
 	}
 	get waitUntilPromises() {
@@ -727,4 +766,4 @@ const URLPattern = globalThis.URLPattern ?? (() => {
 	throw new Error("URLPattern is not available in this runtime. Install the `urlpattern-polyfill` package or upgrade to Node 20+.");
 });
 //#endregion
-export { NextFetchEvent, NextRequest, NextResponse, NextURL, RequestCookies, ResponseCookies, URLPattern, after, connection, sealRequestCookies, sealRequestHeaders, userAgent, userAgentFromString };
+export { ImageResponse, NextFetchEvent, NextRequest, NextResponse, NextURL, RequestCookies, ResponseCookies, URLPattern, after, connection, sealRequestCookies, sealRequestHeaders, userAgent, userAgentFromString };

package/dist/shims/unified-request-context.d.ts

@@ -1,5 +1,5 @@
-import { RootParamsState } from "./root-params.js";
 import { CacheState } from "./cache-request-state.js";
+import { RootParamsState } from "./root-params.js";
 import { ExecutionContextLike } from "./request-context.js";
 import { FetchCacheState } from "./fetch-cache.js";
 import { VinextHeadersShimState } from "./headers.js";

package/dist/shims/unified-request-context.js

@@ -16,6 +16,8 @@ function createRequestContext(opts) {
 	return {
 		headersContext: null,
 		actionRevalidationKind: 0,
+		pendingRevalidatedTags: /* @__PURE__ */ new Set(),
+		pendingRevalidations: /* @__PURE__ */ new Set(),
 		dynamicUsageDetected: false,
 		renderRequestApiUsage: /* @__PURE__ */ new Set(),
 		connectionProbe: null,

package/dist/shims/url-safety.d.ts

@@ -29,6 +29,6 @@ declare function isDangerousScheme(url: string): boolean;
  *   packages/next/src/shared/lib/router/router.ts:1025,1057
  */
 declare function reportBlockedDangerousNavigation(): void;
-declare function assertSafeNavigationUrl(url: string): void;
+declare function assertSafeNavigationUrl(url: string, ErrorConstructor?: new (message: string) => Error): void;
 //#endregion
 export { DANGEROUS_URL_BLOCK_MESSAGE, assertSafeNavigationUrl, isDangerousScheme, reportBlockedDangerousNavigation };

package/dist/shims/url-safety.js

@@ -60,10 +60,10 @@ function isDangerousScheme(url) {
 function reportBlockedDangerousNavigation() {
 	console.error(DANGEROUS_URL_BLOCK_MESSAGE);
 }
-function assertSafeNavigationUrl(url) {
+function assertSafeNavigationUrl(url, ErrorConstructor = Error) {
 	if (isDangerousScheme(url)) {
 		reportBlockedDangerousNavigation();
-		throw new Error(DANGEROUS_URL_BLOCK_MESSAGE);
+		throw new ErrorConstructor(DANGEROUS_URL_BLOCK_MESSAGE);
 	}
 }
 //#endregion

package/dist/typegen.d.ts

@@ -4,6 +4,12 @@ type GenerateRouteTypesOptions = {
   appDir?: string | null;
   pageExtensions?: readonly string[];
 };
-declare function generateRouteTypes(options: GenerateRouteTypesOptions): Promise<string>;
+type GenerateRouteTypesResult = {
+  routeTypesPath: string;
+  nextEnvPath: string;
+  nextEnvStatus: "created" | "updated" | "unchanged";
+};
+declare function nextEnvFileContent(hasNext: boolean, hasAppDir: boolean, eol?: string): string;
+declare function generateRouteTypes(options: GenerateRouteTypesOptions): Promise<GenerateRouteTypesResult>;
 //#endregion
-export { generateRouteTypes };
+export { GenerateRouteTypesResult, generateRouteTypes, nextEnvFileContent };

package/dist/typegen.js

@@ -4,34 +4,82 @@ import { decodeRouteSegment, isInvisibleSegment } from "./routing/utils.js";
 import { patternToNextFormat } from "./routing/route-validation.js";
 import { compareStrings } from "./utils/compare.js";
 import { appRouteGraph } from "./routing/app-router.js";
+import { createRequire } from "node:module";
 import fsp from "node:fs/promises";
+import os from "node:os";
 //#region src/typegen.ts
-const NEXT_ENV_FILE_CONTENT = `/// <reference types="next" />
+function nextEnvFileContent(hasNext, hasAppDir, eol = "\n") {
+	return `${hasNext ? `/// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import "./.next/types/routes.d.ts";
+import "vinext/types/augmentations";
+` : `import "vinext/types";
+`}import "./.next/types/routes.d.ts";
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
-`;
+// see https://nextjs.org/docs/${hasAppDir ? "app" : "pages"}/api-reference/config/typescript for more information.
+`.replaceAll("\n", eol);
+}
 async function generateRouteTypes(options) {
 	const root = path.resolve(options.root);
-	const appDir = options.appDir ? path.resolve(options.appDir) : findDir(root, "app", "src/app");
+	const appDir = options.appDir === null ? null : options.appDir ? path.resolve(options.appDir) : findDir(root, "app", "src/app");
 	const outPath = path.join(root, ".next", "types", "routes.d.ts");
-	const content = appDir ? renderRouteTypes(await collectRouteTypeModel(appDir, options.pageExtensions)) : renderRouteTypes(emptyRouteTypeModel());
+	const pagesDir = findDir(root, "pages", "src/pages");
+	const content = appDir ? renderRouteTypes(await collectRouteTypeModel(appDir, options.pageExtensions), pagesDir !== null) : renderRouteTypes(emptyRouteTypeModel(), false);
 	await fsp.mkdir(path.dirname(outPath), { recursive: true });
 	await fsp.writeFile(outPath, content, "utf-8");
-	await ensureNextEnvFile(root);
-	return outPath;
+	const nextEnv = await ensureNextEnvFile(root, appDir !== null);
+	return {
+		routeTypesPath: outPath,
+		nextEnvPath: nextEnv.path,
+		nextEnvStatus: nextEnv.status
+	};
 }
-async function ensureNextEnvFile(root) {
+async function ensureNextEnvFile(root, hasAppDir) {
 	const envPath = path.join(root, "next-env.d.ts");
+	let eol = os.EOL;
+	let existing;
 	try {
-		await fsp.writeFile(envPath, NEXT_ENV_FILE_CONTENT, {
-			encoding: "utf-8",
-			flag: "wx"
+		existing = await fsp.readFile(envPath, "utf-8");
+		const newline = existing.indexOf("\n", 1);
+		if (newline !== -1) eol = existing[newline - 1] === "\r" ? "\r\n" : "\n";
+	} catch (error) {
+		if (error.code !== "ENOENT") throw error;
+	}
+	const content = nextEnvFileContent(await hasNextPackage(root), hasAppDir, eol);
+	if (existing === content) return {
+		path: envPath,
+		status: "unchanged"
+	};
+	await fsp.writeFile(envPath, content, "utf-8");
+	return {
+		path: envPath,
+		status: existing === void 0 ? "created" : "updated"
+	};
+}
+async function hasNextPackage(root) {
+	const manifestPath = path.join(root, "package.json");
+	let declaresNext;
+	try {
+		const manifest = JSON.parse(await fsp.readFile(manifestPath, "utf-8"));
+		declaresNext = [
+			"dependencies",
+			"devDependencies",
+			"peerDependencies",
+			"optionalDependencies"
+		].some((field) => {
+			const dependencies = manifest[field];
+			return typeof dependencies === "object" && dependencies !== null && Object.hasOwn(dependencies, "next");
 		});
 	} catch (error) {
-		if (error.code !== "EEXIST") throw error;
+		if (error.code !== "ENOENT") throw error;
+	}
+	if (declaresNext === false) return false;
+	try {
+		const packageJsonPath = createRequire(manifestPath).resolve("next/package.json");
+		await fsp.access(packageJsonPath);
+		return true;
+	} catch {
+		return false;
 	}
 }
 function emptyRouteTypeModel() {
@@ -84,12 +132,23 @@ async function collectRouteTypeModel(appDir, pageExtensions) {
 	for (const slotNames of model.layoutSlots.values()) slotNames.sort(compareStrings);
 	return model;
 }
-function renderRouteTypes(model) {
+function renderRouteTypes(model, hasPagesCompat) {
 	const allRoutes = uniqueSorted([
 		...model.pageRoutes,
 		...model.layoutRoutes,
 		...model.routeHandlerRoutes
 	]);
+	const navigationCompat = hasPagesCompat ? `
+declare module "next/navigation" {
+  function useSearchParams(): import("next/navigation").ReadonlyURLSearchParams | null;
+  function usePathname(): string | null;
+  function useParams<
+    T extends Record<string, string | string[]> = Record<string, string | string[]>,
+  >(): T | null;
+  function useSelectedLayoutSegments(): string[] | null;
+  function useSelectedLayoutSegment(): string | null;
+}
+` : "";
 	return `// This file is generated by vinext. Do not edit.
 import type * as React from "react";
 
@@ -126,6 +185,8 @@ ${renderLayoutSlotMap(model.layoutRoutes, model.layoutSlots)}
   }
 }
 
+${navigationCompat}
+
 export {};
 `;
 }
@@ -224,4 +285,4 @@ function quote(value) {
 	return JSON.stringify(value);
 }
 //#endregion
-export { generateRouteTypes };
+export { generateRouteTypes, nextEnvFileContent };

package/dist/utils/domain-locale.d.ts

@@ -2,8 +2,8 @@
 type DomainLocale = {
   domain: string;
   defaultLocale: string;
-  locales?: string[];
-  http?: boolean;
+  locales?: readonly string[];
+  http?: true;
 };
 declare function normalizeDomainHostname(hostname: string | null | undefined): string | undefined;
 /**

package/dist/utils/external-url.d.ts

@@ -0,0 +1,5 @@
+//#region src/utils/external-url.d.ts
+/** Detect an absolute URL with any scheme, or a protocol-relative URL. */
+declare function isExternalUrl(url: string): boolean;
+//#endregion
+export { isExternalUrl };

package/dist/utils/external-url.js

@@ -0,0 +1,7 @@
+//#region src/utils/external-url.ts
+/** Detect an absolute URL with any scheme, or a protocol-relative URL. */
+function isExternalUrl(url) {
+	return /^[a-z][a-z0-9+.-]*:/i.test(url) || url.startsWith("//");
+}
+//#endregion
+export { isExternalUrl };

package/dist/utils/regex-safety.d.ts

@@ -0,0 +1,8 @@
+//#region src/utils/regex-safety.d.ts
+type RegexSafetyIssue = "nested repetition" | "ambiguous alternatives under repetition" | "ambiguous sequence expansion" | "overlapping sequential repetition" | "analysis budget exceeded";
+declare function analyzeRegexSafety(pattern: string, options?: {
+  ignoreCase?: boolean;
+}): RegexSafetyIssue | null;
+declare function regexAtomsMayOverlap(left: string, right: string, ignoreCase?: boolean): boolean;
+//#endregion
+export { RegexSafetyIssue, analyzeRegexSafety, regexAtomsMayOverlap };