vinext 1.1.0 → 1.2.0

package/README.md

@@ -147,6 +147,9 @@ Other options: `--port <port>` (default: 3001), `--skip-check`, `--force`.
 Cloudflare init uses `cf` and `cloudflare.config.ts` by default. Both `vinext init`
 and `create-vinext-app` accept `--legacy-wrangler-cloudflare-init` to retain the
 legacy Wrangler setup. Existing Wrangler configs are not automatically migrated.
+`vinext init --name <name>` sets the Worker name in the generated config instead of
+deriving it from `package.json`. An existing config keeps its own Worker name, and init
+prints a warning.
 
 If your `next.config.*` sets `output: "standalone"`, `vite build` emits a self-hosting bundle at `dist/standalone/`. Start it with:
 
@@ -282,7 +285,7 @@ You can, with caution. vinext has known compatibility gaps and has not yet been
 Yes. Next.js supports [self-hosting](https://nextjs.org/docs/app/building-your-application/deploying#self-hosting) on Node.js servers, Docker containers, and static exports. If you're happy with the Next.js toolchain and just want to run it somewhere other than Vercel, self-hosting is the simplest path.
 
 **How are you verifying this works?**
-The test suite has over 1,700 Vitest tests and 380 Playwright E2E tests. This includes tests ported directly from the [Next.js test suite](https://github.com/vercel/next.js/tree/canary/test) and [OpenNext's Cloudflare conformance suite](https://github.com/opennextjs/opennextjs-cloudflare), covering routing, SSR, RSC, server actions, caching, metadata, middleware, streaming, and more. Vercel's [App Router Playground](https://github.com/vercel/next-app-router-playground) also runs on vinext as an integration test. See the [Tests](#tests) section and `tests/nextjs-compat/TRACKING.md` for details.
+The test suite has over 1,700 Vitest tests and 380 Playwright E2E tests. This includes tests ported directly from the [Next.js test suite](https://github.com/vercel/next.js/tree/canary/test) and [OpenNext's Cloudflare conformance suite](https://github.com/opennextjs/opennextjs-cloudflare), covering routing, SSR, RSC, server actions, caching, metadata, middleware, streaming, and more. Vercel's [App Router Playground](https://github.com/vercel/next-app-router-playground) also runs on vinext as an integration test. See the [Tests](#tests) section for details.
 
 **Who is reviewing this code?**
 A mix of humans and AI agents. Humans review PRs before they merge, focused on behavior, structure, and long-term direction. We lean heavily on agent-driven code review to catch issues at PR time and across the codebase. The test suite is the primary quality gate. Outside contributions and deeper human code review are very welcome.
@@ -437,10 +440,14 @@ export default defineConfig({
 
 #### Module Federation (client-side)
 
-For client-side Module Federation, configure React and React DOM as singleton shared modules in both the host and remotes:
+Use [`@module-federation/vinext`](https://github.com/module-federation/vinext), a thin wrapper around `@module-federation/vite` with vinext defaults. Register `federation()` before `vinext()`:
+
+```bash
+npm install @module-federation/vinext
+```
 
 ```ts
-import { federation } from "@module-federation/vite";
+import { federation } from "@module-federation/vinext";
 import { defineConfig } from "vite";
 import vinext from "vinext";
 
@@ -448,11 +455,14 @@ export default defineConfig({
   plugins: [
     federation({
       name: "host",
-      shared: {
-        react: { singleton: true },
-        "react/": { singleton: true },
-        "react-dom": { singleton: true },
-        "react-dom/": { singleton: true },
+      remotes: {
+        catalog: {
+          type: "module",
+          name: "catalog",
+          entry: "https://catalog.example.com/remoteEntry.js",
+          entryGlobalName: "catalog",
+          shareScope: "default",
+        },
       },
     }),
     vinext(),
@@ -460,6 +470,8 @@ export default defineConfig({
 });
 ```
 
+The wrapper shares `react` and `react-dom` as singletons, defaults `filename` to `remoteEntry.js`, and injects the host's federation startup into the entry, because vinext has no conventional HTML entry. Explicit options override these defaults, and every `@module-federation/vite` option remains available. Passing your own `shared` replaces the default map, so keep `react`, `react/`, `react-dom`, and `react-dom/` as singletons in it, in both the host and remotes.
+
 In a remote client component, use `getVinextReact()` before reading React hooks. vinext registers the host's browser React instance before application modules execute, and the first registration remains stable across remote evaluation and HMR:
 
 ```tsx
@@ -478,7 +490,7 @@ export function RemoteCounter() {
 
 This bridge is browser-only. It does not provide App Router Module Federation SSR or transparently replace React imports inside third-party packages; compatible React versions remain the responsibility of the Module Federation `shared` configuration.
 
-See the [examples](#live-examples) for complete working configurations.
+See the [Module Federation guide](https://vinext.dev/docs/guides/module-federation) for loading remote components in the host.
 
 ### Other platforms (via Nitro)
 

package/dist/build/client-build-config.d.ts

@@ -116,4 +116,14 @@ export declare function createMultiStageCodeSplittingConfig(existing: VinextBuil
  * the host's existing output pattern (or vinext's server-assets default).
  */
 export declare function createMultiStageChunkFileNames(assetsDir: string, existing: VinextBuildOutput["chunkFileNames"]): ChunkFileNameFunction;
+/**
+ * The client environment builds after RSC and SSR, and Vite empties its
+ * output directory first. A client output directory that is, or contains, a
+ * server output directory would therefore delete the server build.
+ */
+export declare function assertClientOutDirIsSeparate(root: string, dirs: {
+  clientOutDir?: string;
+  rscOutDir?: string;
+  ssrOutDir?: string;
+}): void;
 //#endregion

package/dist/build/client-build-config.js

@@ -1,6 +1,7 @@
-import { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
+import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 //#region src/build/client-build-config.ts
 const ROUTE_OWNED_CLIENT_SHIMS = /* @__PURE__ */ new Set([
+	"app-router-tree-context",
 	"compat-router",
 	"dynamic",
 	"dynamic-preload-chunks",
@@ -266,5 +267,20 @@ function createMultiStageChunkFileNames(assetsDir, existing) {
 		return (existing ?? joinAssetFileNamePattern(assetsDir, "[name]-[hash].js")).replaceAll("[name]", name);
 	};
 }
+/**
+* The client environment builds after RSC and SSR, and Vite empties its
+* output directory first. A client output directory that is, or contains, a
+* server output directory would therefore delete the server build.
+*/
+function assertClientOutDirIsSeparate(root, dirs) {
+	if (!dirs.clientOutDir) return;
+	const clientOutDir = path.resolve(root, dirs.clientOutDir);
+	const serverOutDirs = [["rscOutDir", dirs.rscOutDir ?? "dist/server"], ["ssrOutDir", dirs.ssrOutDir ?? "dist/server/ssr"]];
+	for (const [name, dir] of serverOutDirs) {
+		const relative = path.relative(clientOutDir, path.resolve(root, dir));
+		if (relative === ".." || relative.startsWith("../") || path.isAbsolute(relative)) continue;
+		throw new Error(`[vinext] clientOutDir "${dirs.clientOutDir}" contains ${name} "${dir}". The client build runs last and empties its output directory, which would delete the server build. Use separate output directories.`);
+	}
+}
 //#endregion
-export { RSC_FRAMEWORK_CHUNK_TEST, createClientAssetFileNames, createClientCodeSplittingConfig, createClientFileNameConfig, createClientManualChunks, createMultiStageChunkFileNames, createMultiStageCodeSplittingConfig, createRscFrameworkChunkOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfig, isRscFrameworkModule, sanitizeRscChunkFileName, withBuildBundlerOptions };
+export { RSC_FRAMEWORK_CHUNK_TEST, assertClientOutDirIsSeparate, createClientAssetFileNames, createClientCodeSplittingConfig, createClientFileNameConfig, createClientManualChunks, createMultiStageChunkFileNames, createMultiStageCodeSplittingConfig, createRscFrameworkChunkOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfig, isRscFrameworkModule, sanitizeRscChunkFileName, withBuildBundlerOptions };

package/dist/build/pages-client-assets-module.d.ts

@@ -2,5 +2,13 @@ import { PagesClientAssets } from "../server/pages-client-assets.js";
 //#region src/build/pages-client-assets-module.d.ts
 export declare const PAGES_CLIENT_ASSETS_MODULE = "vinext-client-assets.js";
 export declare function buildPagesClientAssetsModule(assets: PagesClientAssets): string;
+/**
+ * Select the client bundle files that live outside `_next/static`, as URL
+ * pathnames. Plugins emit these at the output root, for example a Module
+ * Federation host's `remoteEntry.js`. Public directory files are copied
+ * outside the bundle, and build metadata (vinext's and Cloudflare's
+ * `.assetsignore`) is excluded.
+ */
+export declare function collectClientBuildFiles(fileNames: Iterable<string>): string[];
 export declare function writePagesClientAssetsModuleIfMissing(outputDir: string, moduleSource: string): void;
 //#endregion

package/dist/build/pages-client-assets-module.js

@@ -1,5 +1,7 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
+import "../utils/asset-prefix.js";
 import { getSharedChunkFiles } from "../server/pages-asset-tags.js";
+import "../utils/client-entry-manifest.js";
 import fs from "node:fs";
 //#region src/build/pages-client-assets-module.ts
 const PAGES_CLIENT_ASSETS_MODULE = "vinext-client-assets.js";
@@ -10,6 +12,24 @@ function buildPagesClientAssetsModule(assets) {
 	} : assets;
 	return `export default ${JSON.stringify(prepared)};\n`;
 }
+/**
+* Select the client bundle files that live outside `_next/static`, as URL
+* pathnames. Plugins emit these at the output root, for example a Module
+* Federation host's `remoteEntry.js`. Public directory files are copied
+* outside the bundle, and build metadata (vinext's and Cloudflare's
+* `.assetsignore`) is excluded.
+*/
+function collectClientBuildFiles(fileNames) {
+	const files = [];
+	for (const fileName of fileNames) {
+		const pathname = `/${fileName}`;
+		if (pathname.includes(`/_next/static/`)) continue;
+		if (pathname.startsWith("/.vite/") || fileName === "vinext-client-entry-manifest.json") continue;
+		if (fileName === ".assetsignore") continue;
+		files.push(pathname);
+	}
+	return files.sort();
+}
 function writePagesClientAssetsModuleIfMissing(outputDir, moduleSource) {
 	const outputPath = path.join(outputDir, PAGES_CLIENT_ASSETS_MODULE);
 	if (fs.existsSync(outputPath)) return;
@@ -17,4 +37,4 @@ function writePagesClientAssetsModuleIfMissing(outputDir, moduleSource) {
 	fs.writeFileSync(outputPath, moduleSource);
 }
 //#endregion
-export { PAGES_CLIENT_ASSETS_MODULE, buildPagesClientAssetsModule, writePagesClientAssetsModuleIfMissing };
+export { PAGES_CLIENT_ASSETS_MODULE, buildPagesClientAssetsModule, collectClientBuildFiles, writePagesClientAssetsModuleIfMissing };

package/dist/build/prerender-paths.js

@@ -134,6 +134,7 @@ async function fetchDiscoveryEndpoint(url, headers, retryOptions = {}) {
 			const request = (async () => {
 				const res = await fetch(url, {
 					headers,
+					redirect: "manual",
 					signal: controller.signal
 				});
 				return {
@@ -152,10 +153,11 @@ async function fetchDiscoveryEndpoint(url, headers, retryOptions = {}) {
 				if (res.status === 204) return null;
 				return text;
 			}
-			const userFailure = readDiscoveryUserFailure(res, text);
+			const redirected = res.status >= 300 && res.status < 400;
+			const userFailure = redirected ? null : readDiscoveryUserFailure(res, text);
 			const detail = userFailure ?? (/cloudflare:|ERR_UNSUPPORTED_ESM_URL_SCHEME/i.test(text) ? text.trim() : "");
-			lastError = /* @__PURE__ */ new Error(`path discovery returned HTTP ${res.status}${detail ? `: ${detail}` : ""}`);
-			if (!(res.status === 404 || res.status >= 500 && res.status <= 599 && userFailure === null)) {
+			lastError = redirected ? /* @__PURE__ */ new Error(`path discovery returned a redirect (HTTP ${res.status}); refusing to follow it with the prerender secret`) : /* @__PURE__ */ new Error(`path discovery returned HTTP ${res.status}${detail ? `: ${detail}` : ""}`);
+			if (!(redirected || res.status === 404 || res.status >= 500 && res.status <= 599 && userFailure === null)) {
 				shouldRetry = false;
 				throw lastError;
 			}

package/dist/build/run-prerender.js

@@ -124,7 +124,7 @@ async function runPrerender(options) {
 	let totalUrls = 0;
 	let completedUrls = 0;
 	const progress = new PrerenderProgress();
-	const outDir = mode === "export" ? path.join(root, "dist", "client") : path.join(manifestDir, "prerendered-routes");
+	const outDir = mode === "export" ? path.resolve(root, options.routeRootConfig?.clientOutDir ?? path.join("dist", "client")) : path.join(manifestDir, "prerendered-routes");
 	let sharedProdServer = null;
 	let sharedPrerenderSecret;
 	const restorePrerenderPhase = enterPrerenderPhase();

package/dist/build/ssr-manifest.d.ts

@@ -14,6 +14,8 @@ export type BundleBackfillChunk = {
  * `toSlash` where the result becomes a module id / manifest key.
  */
 export declare function tryRealpathSync(candidate: string): string | null;
+/** Forward-slash `path.relative(root, moduleId)`, which may escape with `../`. */
+export declare function relativeToRoot(root: string, moduleId: string): string;
 export declare function relativeWithinRoot(root: string, moduleId: string): string | null;
 export declare function augmentSsrManifestFromBundle(ssrManifest: Record<string, string[]>, bundle: Record<string, BundleBackfillChunk | {
   type: string;

package/dist/build/ssr-manifest.js

@@ -16,8 +16,12 @@ function tryRealpathSync(candidate) {
 function isWindowsAbsolutePath(candidate) {
 	return /^[a-zA-Z]:[\\/]/.test(candidate) || candidate.startsWith("\\\\");
 }
+/** Forward-slash `path.relative(root, moduleId)`, which may escape with `../`. */
+function relativeToRoot(root, moduleId) {
+	return isWindowsAbsolutePath(root) || isWindowsAbsolutePath(moduleId) ? path.win32.relative(root, moduleId) : path.relative(root, moduleId);
+}
 function relativeWithinRoot(root, moduleId) {
-	const relativeId = isWindowsAbsolutePath(root) || isWindowsAbsolutePath(moduleId) ? path.win32.relative(root, moduleId) : path.relative(root, moduleId);
+	const relativeId = relativeToRoot(root, moduleId);
 	if (!relativeId || relativeId === ".." || relativeId.startsWith("../")) return null;
 	return relativeId;
 }
@@ -70,4 +74,4 @@ function augmentSsrManifestFromBundle(ssrManifest, bundle, root, base = "/") {
 	return Object.fromEntries(Object.entries(nextManifest).map(([key, files]) => [key, [...files]]));
 }
 //#endregion
-export { augmentSsrManifestFromBundle, relativeWithinRoot, tryRealpathSync };
+export { augmentSsrManifestFromBundle, relativeToRoot, relativeWithinRoot, tryRealpathSync };

package/dist/check.js

@@ -210,7 +210,7 @@ const CONFIG_SUPPORT = {
 	},
 	transpilePackages: {
 		status: "supported",
-		detail: "listed packages are bundled instead of externalized on the server"
+		detail: "listed packages are bundled instead of externalized on the server, and their next/dynamic() calls get SSR preload links"
 	},
 	serverExternalPackages: {
 		status: "supported",
@@ -252,9 +252,10 @@ const CONFIG_SUPPORT = {
 		status: "unsupported",
 		detail: "custom cacheLife profiles are ignored; only the built-in profiles are available"
 	},
-	skipTrailingSlashRedirect: {
-		status: "unsupported",
-		detail: "ignored; trailing-slash redirects are always applied"
+	skipTrailingSlashRedirect: { status: "supported" },
+	"experimental.skipTrailingSlashRedirect": {
+		status: "supported",
+		detail: "legacy alias of skipTrailingSlashRedirect"
 	},
 	reactCompiler: {
 		status: "partial",
@@ -433,8 +434,8 @@ const LIBRARY_SUPPORT = {
 		detail: "renders client-side; by default events are only collected when deployed on Vercel"
 	},
 	"next-intl": {
-		status: "partial",
-		detail: "auto-detected from (src/)i18n/request.{ts,tsx,js,jsx}, so createNextIntlPlugin isn't needed; client components can fail with \"No intl context found\" (cloudflare/vinext#177)"
+		status: "supported",
+		detail: "createNextIntlPlugin is only optional with the request config at (src/)i18n/request.*; its experimental messages, precompile and extract options don't work (they need webpack/Turbopack loaders)"
 	},
 	"@clerk/nextjs": {
 		status: "supported",

package/dist/cli.js

@@ -4,8 +4,8 @@ import { detectPackageManager, ensureViteConfigCompatibility, findViteConfigPath
 import { formatReport, runCheck } from "./check.js";
 import { parseArgs } from "./cli-args.js";
 import { findViteRoot, getViteCliInvocation, valueOptionName } from "./utils/vite-cli-invocation.js";
-import { init } from "./init.js";
 import { resolveInitOptions } from "./init-platform.js";
+import { init } from "./init.js";
 import { loadDotenv } from "./config/dotenv.js";
 import { PHASE_PRODUCTION_BUILD } from "./shims/constants.js";
 import { loadNextConfig, resolveNextConfig } from "./config/next-config.js";
@@ -275,6 +275,7 @@ function printHelp(cmd) {
     --no-install         Update dependency entries without installing them
     --force              Overwrite existing vite.config.ts
     --platform <target>  Deployment target: cloudflare or node
+    --name <name>        Cloudflare Worker name (default: derived from package.json)
     --prerender          Configure Vite builds to pre-render static routes
                          (Cloudflare deploy won't serve them unless using Static Assets)
     --warm-cache         Add cache warming to the Cloudflare deploy script

package/dist/client/client-redirect-matcher.d.ts

@@ -0,0 +1,14 @@
+import { RequestContext } from "../config/request-context.js";
+import { BasePathMatchState, RedirectMatch } from "../config/config-matchers.js";
+import { ClientRedirect } from "./client-redirects.js";
+//#region src/client/client-redirect-matcher.d.ts
+/**
+ * Resolve the first matching client-safe redirect. A matching server-owned
+ * rule stops client evaluation and returns null so a later client-safe rule
+ * cannot take its place. The navigation then continues as it does in Next.js,
+ * which never resolves config redirects in the browser: a document request (or
+ * a data request that falls back to one) reaches the server rule, while a page
+ * without data fetching renders without it.
+ */
+export declare function matchClientRedirect(pathname: string, redirects: ClientRedirect[], context: RequestContext, basePathState: BasePathMatchState): RedirectMatch | null;
+//#endregion

package/dist/client/client-redirect-matcher.js

@@ -0,0 +1,37 @@
+import { matchRedirect } from "../config/config-matchers.js";
+//#region src/client/client-redirect-matcher.ts
+const matcherRules = /* @__PURE__ */ new WeakMap();
+function getMatcherRule(redirect) {
+	let rule = matcherRules.get(redirect);
+	if (!rule) {
+		rule = [{
+			source: redirect.source,
+			destination: redirect.destination ?? "/",
+			permanent: redirect.permanent ?? false,
+			has: redirect.has,
+			missing: redirect.missing,
+			locale: redirect.locale,
+			basePath: redirect.basePath
+		}];
+		matcherRules.set(redirect, rule);
+	}
+	return rule;
+}
+/**
+* Resolve the first matching client-safe redirect. A matching server-owned
+* rule stops client evaluation and returns null so a later client-safe rule
+* cannot take its place. The navigation then continues as it does in Next.js,
+* which never resolves config redirects in the browser: a document request (or
+* a data request that falls back to one) reaches the server rule, while a page
+* without data fetching renders without it.
+*/
+function matchClientRedirect(pathname, redirects, context, basePathState) {
+	for (const redirect of redirects) {
+		const match = matchRedirect(pathname, getMatcherRule(redirect), context, basePathState);
+		if (match === null) continue;
+		return redirect.requiresServerEvaluation ? null : match;
+	}
+	return null;
+}
+//#endregion
+export { matchClientRedirect };

package/dist/client/client-redirects.d.ts

@@ -0,0 +1,27 @@
+import { NextRedirect, ResolvedNextConfig } from "../config/next-config.js";
+import { ClientHasCondition } from "./client-rewrites.js";
+//#region src/client/client-redirects.d.ts
+type ClientRedirectFields = Pick<NextRedirect, "basePath" | "locale" | "source"> & {
+  has?: ClientHasCondition[];
+  missing?: ClientHasCondition[];
+};
+/**
+ * Redirect data that is safe to publish in a browser bundle.
+ *
+ * Next.js keeps redirects in the server routes manifest only. Vinext resolves
+ * browser-authoritative redirects during Pages Router navigation, but rules
+ * with header or cookie conditions are server-owned: their condition values
+ * can be private, so the rule keeps only its source and client-safe
+ * conditions to preserve first-match ordering, and drops its destination.
+ */
+export type ClientRedirect = (ClientRedirectFields & {
+  destination: string;
+  permanent: boolean;
+  requiresServerEvaluation?: never;
+}) | (ClientRedirectFields & {
+  destination?: never;
+  permanent?: never;
+  requiresServerEvaluation: true;
+});
+export declare function toClientRedirects(redirects: ResolvedNextConfig["redirects"]): ClientRedirect[];
+//#endregion

package/dist/client/client-redirects.js

@@ -0,0 +1,28 @@
+import { isClientHasCondition } from "./client-rewrites.js";
+//#region src/client/client-redirects.ts
+function toClientRedirect(redirect) {
+	const hasServerOnlyCondition = (redirect.has?.some((condition) => !isClientHasCondition(condition)) ?? false) || (redirect.missing?.some((condition) => !isClientHasCondition(condition)) ?? false);
+	const clientHas = redirect.has?.filter(isClientHasCondition);
+	const clientMissing = redirect.missing?.filter(isClientHasCondition);
+	const common = {
+		source: redirect.source,
+		has: clientHas?.length ? clientHas : void 0,
+		missing: clientMissing?.length ? clientMissing : void 0,
+		locale: redirect.locale,
+		basePath: redirect.basePath
+	};
+	if (hasServerOnlyCondition) return {
+		...common,
+		requiresServerEvaluation: true
+	};
+	return {
+		...common,
+		destination: redirect.destination,
+		permanent: redirect.permanent
+	};
+}
+function toClientRedirects(redirects) {
+	return redirects.map(toClientRedirect);
+}
+//#endregion
+export { toClientRedirects };

package/dist/client/client-rewrites.d.ts

@@ -1,6 +1,6 @@
 import { HasCondition, NextRewrite, ResolvedNextConfig } from "../config/next-config.js";
 //#region src/client/client-rewrites.d.ts
-type ClientHasCondition = Omit<HasCondition, "type"> & {
+export type ClientHasCondition = Omit<HasCondition, "type"> & {
   type: "host" | "query";
 };
 type ClientRewriteFields = Pick<NextRewrite, "basePath" | "locale" | "source"> & {
@@ -26,5 +26,6 @@ export type ClientRewrites = {
   beforeFiles: ClientRewrite[];
   fallback: ClientRewrite[];
 };
+export declare function isClientHasCondition(condition: HasCondition): condition is ClientHasCondition;
 export declare function toClientRewrites(rewrites: ResolvedNextConfig["rewrites"]): ClientRewrites;
 //#endregion

package/dist/client/client-rewrites.js

@@ -38,4 +38,4 @@ function toClientRewrites(rewrites) {
 	};
 }
 //#endregion
-export { toClientRewrites };
+export { isClientHasCondition, toClientRewrites };

package/dist/config/config-matchers.d.ts

@@ -1,5 +1,6 @@
 import { HasCondition, NextHeader, NextI18nConfig, NextRedirect, NextRewrite } from "./next-config.js";
 import { RequestContext, normalizeHost, parseCookies, requestContextFromRequest } from "./request-context.js";
+import { RedirectDestinationQueryPart } from "./destination-params.js";
 import { isExternalUrl } from "../utils/external-url.js";
 //#region src/config/config-matchers.d.ts
 /**
@@ -75,6 +76,15 @@ export declare function applyMiddlewareRequestHeaders(middlewareHeaders: Record<
 };
 export declare function checkHasConditions(has: HasCondition[] | undefined, missing: HasCondition[] | undefined, ctx: RequestContext): boolean;
 export declare function matchConfigPattern(pathname: string, pattern: string): Record<string, string> | null;
+/**
+ * A matched config redirect. `destinationQuery` holds the destination query's
+ * parts, split before params were substituted, for merging the request query.
+ */
+export type RedirectMatch = {
+  destination: string;
+  permanent: boolean;
+  destinationQuery: RedirectDestinationQueryPart[];
+};
 /**
  * Apply redirect rules from next.config.js.
  * Returns the redirect info if a redirect was matched, or null.
@@ -110,10 +120,7 @@ export declare function matchConfigPattern(pathname: string, pattern: string): R
  * an original index < N are checked via matchConfigPattern first — they are
  * few in practice (typically zero) so this is not a hot-path concern.
  */
-export declare function matchRedirect(pathname: string, redirects: NextRedirect[], ctx: RequestContext, basePathState?: BasePathMatchState, onRuleSourceMatch?: (rule: NextRedirect) => void): {
-  destination: string;
-  permanent: boolean;
-} | null;
+export declare function matchRedirect(pathname: string, redirects: NextRedirect[], ctx: RequestContext, basePathState?: BasePathMatchState, onRuleSourceMatch?: (rule: NextRedirect) => void): RedirectMatch | null;
 /**
  * Apply rewrite rules from next.config.js.
  * Returns the rewritten URL or null if no rewrite matched.
@@ -142,7 +149,8 @@ export declare function matchesRewriteSource(pathname: string, rewrite: NextRewr
  * users off-site.
  *
  * This function collapses any leading double (or more) slashes to a single
- * slash for non-external (relative) destinations.
+ * slash for non-external (relative) destinations, including tab/newline and
+ * leading C0 control characters that browsers ignore while parsing.
  */
 export declare function sanitizeDestination(dest: string): string;
 /**
@@ -162,13 +170,20 @@ export declare function sanitizeDestination(dest: string): string;
  * still treated as an RSC fetch. Dropping it breaks RSC fetch semantics
  * (issue #1529).
  *
- * Destination query params win — a request param is only carried over when
- * the destination does not already specify that key. Mirrors the merge
- * semantics in `proxyExternalRequest`. External destinations are returned
- * untouched (a config redirect to another origin should not leak the
- * original request's query).
+ * Ported from Next.js's `{ ...requestQuery, ...destinationQuery }` merge and
+ * `stringifyQuery`: request keys keep their order (integer-like keys first, as
+ * in a JS object), a destination key overrides the request value in place,
+ * and destination-only keys follow. Request keys and values are re-encoded;
+ * destination query text is emitted verbatim, except that, like Next.js,
+ * destination strings equal to a request key or value are re-encoded too.
+ * Pass the match's
+ * `destinationQuery` so substituted params keep their value boundaries;
+ * without it the destination's own query is split. External destinations are returned untouched (a config redirect to another
+ * origin should not leak the original request's query).
+ *
+ * https://github.com/vercel/next.js/blob/canary/packages/next/src/server/server-route-utils.ts
  */
-export declare function preserveRedirectDestinationQuery(destination: string, requestSearch: string): string;
+export declare function preserveRedirectDestinationQuery(destination: string, requestSearch: string, destinationQuery?: RedirectDestinationQueryPart[]): string;
 /**
  * Proxy an incoming request to an external URL and return the upstream response.
  *