vinext 1.0.0-beta.1 → 1.0.0-beta.3

package/dist/index.js

@@ -2,15 +2,17 @@ import path, { toSlash } from "./deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/
 import { detectPackageManager, formatMissingCloudflarePluginError, hasWranglerConfig } from "./utils/project.js";
 import { normalizePathnameForRouteMatchStrict } from "./routing/utils.js";
 import { buildViteResolveExtensions, createValidFileMatcher, findFileWithExts, normalizeViteResolveExtensions } from "./routing/file-matcher.js";
+import { hasBasePath, stripBasePath } from "./utils/base-path.js";
 import { apiRouter, invalidateRouteCache, matchRoute, pagesRouter } from "./routing/pages-router.js";
 import { VINEXT_MW_CTX_HEADER } from "./utils/protocol-headers.js";
 import { INTERNAL_HEADERS, NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_TIMING_HEADER } from "./server/headers.js";
 import { normalizePath as normalizePath$1 } from "./server/normalize-path.js";
 import { matchesRewriteSource, proxyExternalRequest } from "./config/config-matchers.js";
+import { validateMiddlewareMatcherPatterns } from "./server/middleware-matcher-pattern.js";
 import { isOpenRedirectShaped } from "./server/open-redirect.js";
-import { filterInternalHeaders, normalizeTrailingSlash } from "./server/request-pipeline.js";
+import { canonicalizeRequestUrlPathname, filterInternalHeaders, normalizeTrailingSlash } from "./server/request-pipeline.js";
 import { findMiddlewareFile, isProxyFile, runMiddleware } from "./server/middleware.js";
-import { extractMiddlewareMatcherConfig, hasExportedName } from "./build/report.js";
+import { extractMiddlewareMatcherConfig, extractMiddlewareMatcherConfigValue, hasExportedName } from "./build/report.js";
 import { generateServerEntry } from "./entries/pages-server-entry.js";
 import { generateClientEntry } from "./entries/pages-client-entry.js";
 import { appRouteGraph, appRouter, invalidateAppRouteCache, matchAppRoute } from "./routing/app-router.js";
@@ -18,7 +20,7 @@ import { findInstrumentationClientFile, findInstrumentationFile, runInstrumentat
 import { isUnknownRecord } from "./utils/record.js";
 import { logRequest, now } from "./server/request-log.js";
 import { resolvePagesI18nRequest, stripI18nLocaleForApiRoute } from "./server/pages-i18n.js";
-import { isNextDataPathname, normalizeNextDataPagePathname, parseNextDataPathname } from "./server/pages-data-route.js";
+import { encodeUrlParserIgnoredCharacters, isNextDataPathname, normalizeNextDataPagePathname, parseNextDataPathname, urlParserCreatesPagesDataPath } from "./server/pages-data-route.js";
 import { resolveAssetsDir } from "./utils/asset-prefix.js";
 import { getPagesPreviewModeId } from "./server/pages-preview.js";
 import { createSSRHandler } from "./server/dev-server.js";
@@ -33,7 +35,7 @@ import { generateRscEntry } from "./entries/app-rsc-entry.js";
 import { generateSsrEntry } from "./entries/app-ssr-entry.js";
 import { VINEXT_CACHE_CONFIG_PLUGIN_PROPERTY, VIRTUAL_CACHE_ADAPTERS, generateCacheAdaptersModule } from "./cache/cache-adapters-virtual.js";
 import { VIRTUAL_IMAGE_ADAPTERS, generateImageAdaptersModule } from "./image/image-adapters-virtual.js";
-import { generateBrowserEntry, isLinkPrefetchRoute, toDocumentOnlyAppRoute, toLinkPrefetchRoute } from "./entries/app-browser-entry.js";
+import { generateBrowserEntry, toLinkPrefetchRoutes } from "./entries/app-browser-entry.js";
 import { collectRouteClassificationManifest } from "./build/route-classification-manifest.js";
 import { planRouteClassificationInjection } from "./build/route-classification-injector.js";
 import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from "./shims/constants.js";
@@ -44,6 +46,7 @@ import { precompressAssets } from "./build/precompress.js";
 import { ensureAssetsIgnore } from "./build/assets-ignore.js";
 import { emitNextClientRuntimeManifests } from "./build/next-client-runtime-manifests.js";
 import { collectInlineCssManifest, injectInlineCssManifestGlobal } from "./build/inline-css.js";
+import { readTrustedRevalidationHostname } from "./server/revalidation-host.js";
 import { installDevStackSourcemapMiddleware } from "./server/dev-stack-sourcemap.js";
 import { runPagesRequest } from "./server/pages-request-pipeline.js";
 import { pagesRouteHasPriorityOverAppRoute, validateHybridRouteConflicts } from "./server/hybrid-route-priority.js";
@@ -68,6 +71,7 @@ import { createOgAssetsPlugin, createOgInlineFetchAssetsPlugin } from "./plugins
 import { generateRouteTypes } from "./typegen.js";
 import { SSR_EXTERNAL_REACT_ENTRIES, VINEXT_OPTIMIZE_DEPS_EXCLUDE, mergeOptimizeDepsExclude } from "./plugins/rsc-client-shim-excludes.js";
 import { createServerExternalsManifestPlugin } from "./plugins/server-externals-manifest.js";
+import public_shim_map_default from "./shims/public-shim-map.json.js";
 import { VINEXT_CLIENT_ENTRY_MANIFEST } from "./utils/client-entry-manifest.js";
 import { computeClientRuntimeMetadata } from "./utils/client-runtime-metadata.js";
 import { PAGES_CLIENT_ASSETS_MODULE, buildPagesClientAssetsModule, setPagesClientAssetsBuildMetadata, takePagesClientAssetsBuildMetadata, writePagesClientAssetsModuleIfMissing } from "./build/pages-client-assets-module.js";
@@ -80,6 +84,7 @@ import { createClientAssetFileNames, createClientCodeSplittingConfig, createClie
 import { hasExportAllCandidate, stripServerExports, validatePageExports } from "./plugins/strip-server-exports.js";
 import { removeConsoleCalls } from "./plugins/remove-console.js";
 import { createImportMetaUrlPlugin } from "./plugins/import-meta-url.js";
+import { createTransformCache } from "./plugins/transform-cache.js";
 import { createRequireContextPlugin } from "./plugins/require-context.js";
 import { createExtensionlessDynamicImportPlugin } from "./plugins/extensionless-dynamic-import.js";
 import { createWasmModuleImportPlugin } from "./plugins/wasm-module-import.js";
@@ -111,6 +116,63 @@ const OPTIONAL_OPTIMIZE_DEPS_WARNING_RE = /Failed to resolve dependency: .*use-s
 const VINEXT_FILTERED_OPTIMIZE_DEPS_WARN = Symbol.for("vinext.filteredOptimizeDepsWarn");
 const ANSI_ESCAPE_RE = new RegExp(`${String.fromCharCode(27)}\\[[0-9;]*m`, "g");
 installSocketErrorBackstop();
+function isUseCacheAstNode(value) {
+	return typeof value === "object" && value !== null && typeof Reflect.get(value, "type") === "string";
+}
+function hasInlineUseCacheDirective(node) {
+	const body = isUseCacheAstNode(node.body) && node.body.type === "BlockStatement" ? node.body : null;
+	if (!body || !Array.isArray(body.body)) return false;
+	return body.body.some((statement) => {
+		if (!isUseCacheAstNode(statement) || statement.type !== "ExpressionStatement") return false;
+		const expression = isUseCacheAstNode(statement.expression) ? statement.expression : null;
+		return expression?.type === "Literal" && typeof expression.value === "string" && /^use cache(:\s*\w+)?$/.test(expression.value);
+	});
+}
+function functionAcceptsSecondArgument(node) {
+	const params = Array.isArray(node.params) ? node.params : [];
+	if (params.length >= 2) return true;
+	return params.some((param) => isUseCacheAstNode(param) && param.type === "RestElement");
+}
+function collectInlineUseCacheSecondArgumentUsage(value) {
+	const usage = [];
+	function walk(node) {
+		if (Array.isArray(node)) {
+			for (const child of node) walk(child);
+			return;
+		}
+		if (!isUseCacheAstNode(node)) return;
+		if ((node.type === "FunctionDeclaration" || node.type === "FunctionExpression" || node.type === "ArrowFunctionExpression") && hasInlineUseCacheDirective(node)) usage.push(functionAcceptsSecondArgument(node));
+		for (const [key, child] of Object.entries(node)) {
+			if (key === "type" || key === "start" || key === "end" || key === "loc" || key === "parent") continue;
+			walk(child);
+		}
+	}
+	walk(value);
+	return usage;
+}
+function collectFileUseCacheSecondArgumentUsage(body) {
+	const localFunctions = /* @__PURE__ */ new Map();
+	function collectDeclaration(value) {
+		if (!isUseCacheAstNode(value)) return;
+		if (value.type === "FunctionDeclaration") {
+			const id = isUseCacheAstNode(value.id) ? value.id : null;
+			if (id?.type === "Identifier" && typeof id.name === "string") localFunctions.set(id.name, functionAcceptsSecondArgument(value));
+			return;
+		}
+		if (value.type !== "VariableDeclaration" || !Array.isArray(value.declarations)) return;
+		for (const declaration of value.declarations) {
+			if (!isUseCacheAstNode(declaration) || declaration.type !== "VariableDeclarator") continue;
+			const id = isUseCacheAstNode(declaration.id) ? declaration.id : null;
+			const init = isUseCacheAstNode(declaration.init) ? declaration.init : null;
+			if (id?.type === "Identifier" && typeof id.name === "string" && init && (init.type === "FunctionExpression" || init.type === "ArrowFunctionExpression")) localFunctions.set(id.name, functionAcceptsSecondArgument(init));
+		}
+	}
+	for (const statement of body) {
+		if (!isUseCacheAstNode(statement)) continue;
+		collectDeclaration(statement.type === "ExportNamedDeclaration" || statement.type === "ExportDefaultDeclaration" ? statement.declaration : statement);
+	}
+	return localFunctions;
+}
 function isInsideDirectory(dir, filePath) {
 	const relativePath = path.relative(dir, filePath);
 	return relativePath !== "" && !relativePath.startsWith("..") && !path.isAbsolute(relativePath);
@@ -472,16 +534,17 @@ const _tsconfigAliasCache = /* @__PURE__ */ new Map();
 function sortTsconfigAliasesBySpecificity(aliases) {
 	return Object.fromEntries(Object.entries(aliases).sort((a, b) => b[0].length - a[0].length));
 }
-function resolveTsconfigAliases(projectRoot) {
-	if (_tsconfigAliasCache.has(projectRoot)) return _tsconfigAliasCache.get(projectRoot);
+function resolveTsconfigAliases(projectRoot, configuredPath) {
+	const configPath = configuredPath ? path.resolve(projectRoot, configuredPath) : void 0;
+	const cacheKey = configPath ?? projectRoot;
+	if (_tsconfigAliasCache.has(cacheKey)) return _tsconfigAliasCache.get(cacheKey);
 	let aliases = {};
-	for (const name of TSCONFIG_FILES) {
-		const candidate = path.join(projectRoot, name);
+	for (const candidate of configPath ? [configPath] : TSCONFIG_FILES.map((name) => path.join(projectRoot, name))) {
 		if (!fs.existsSync(candidate)) continue;
 		aliases = sortTsconfigAliasesBySpecificity(loadTsconfigPathAliases(candidate, projectRoot));
 		break;
 	}
-	_tsconfigAliasCache.set(projectRoot, aliases);
+	_tsconfigAliasCache.set(cacheKey, aliases);
 	return aliases;
 }
 /**
@@ -667,27 +730,14 @@ function generateRootParamsModule(rootParamNames) {
 	const exports = names.map((name) => `export function ${name}() { return getRootParam(${JSON.stringify(name)}); }`).join("\n");
 	return `import { getRootParam } from ${JSON.stringify(rootParamsShimPath)};\n${exports}\n`;
 }
-/**
-* Shims with a `.react-server.ts` variant for the RSC environment.
-* Maps import specifier → base shim name. In the RSC env, resolveId
-* appends `.react-server`; in other envs it resolves to the base.
-*
-* These MUST NOT appear in `nextShimMap` (resolve.alias) because Vite's
-* alias plugin runs before user `enforce:"pre"` plugins — aliases are
-* unoverridable. Keeping them out of the alias lets the resolveId hook
-* control resolution per-environment.
-*
-* To add a new react-server shim:
-*   1. Create `<name>.react-server.ts` in src/shims/
-*   2. Add entries here for each import specifier.
-*/
-const _reactServerShims = /* @__PURE__ */ new Map([
-	["next/navigation", "navigation"],
-	["next/navigation.js", "navigation"],
-	["next/dist/client/components/navigation", "navigation"],
-	["next/error", "error"],
-	["next/error.js", "error"]
-]);
+const _publicNextShimMap = public_shim_map_default;
+const _reactServerShims = /* @__PURE__ */ new Map();
+for (const [specifier, definition] of Object.entries(_publicNextShimMap)) {
+	if (!definition.reactServer) continue;
+	_reactServerShims.set(specifier, definition.shim);
+	_reactServerShims.set(`${specifier}.js`, definition.shim);
+}
+_reactServerShims.set("next/dist/client/components/navigation", "navigation");
 const clientCodeSplittingConfig = createClientCodeSplittingConfig(createClientManualChunks(_shimsDir));
 const appClientCodeSplittingConfig = createClientCodeSplittingConfig(createClientManualChunks(_shimsDir, true));
 function getClientOutputConfig(assetsDir, preserveAppRouteBoundaries = false) {
@@ -765,7 +815,7 @@ function vinext(options = {}) {
 	* __NEXT_DATA__ to determine which page to hydrate.
 	*/
 	async function generateClientEntry$1() {
-		const appPrefetchRoutes = hasAppDir ? (await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher)).map((route) => isLinkPrefetchRoute(route) ? toLinkPrefetchRoute(route) : toDocumentOnlyAppRoute(route)) : [];
+		const appPrefetchRoutes = hasAppDir ? toLinkPrefetchRoutes(await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher)) : [];
 		return generateClientEntry(pagesDir, nextConfig, fileMatcher, {
 			appPrefetchRoutes,
 			instrumentationClientPath,
@@ -774,10 +824,9 @@ function vinext(options = {}) {
 		});
 	}
 	async function writeRouteTypes() {
-		if (!hasAppDir) return;
 		await generateRouteTypes({
 			root,
-			appDir,
+			appDir: hasAppDir ? appDir : null,
 			pageExtensions: nextConfig.pageExtensions
 		});
 	}
@@ -906,6 +955,7 @@ function vinext(options = {}) {
 			return (typeof hook === "function" ? hook : hook.handler).call(this, config, env);
 		}
 	};
+	const cachedTypeofWindowTransform = createTransformCache();
 	const plugins = [
 		createStyledJsxPlugin(earlyBaseDir),
 		mdxProxyPlugin,
@@ -978,10 +1028,9 @@ function vinext(options = {}) {
 			async config(config, env) {
 				isServeCommand = env.command === "serve";
 				root = toSlash(config.root ?? process.cwd());
-				const shouldEnableNativeTsconfigPaths = config.resolve?.tsconfigPaths === void 0;
-				const tsconfigPathAliases = resolveTsconfigAliases(root);
+				const userResolve = config.resolve;
+				let tsconfigPathAliases = {};
 				const swcHelpersAlias = resolveSwcHelpersAlias(root);
-				if (Object.keys(tsconfigPathAliases).length > 0) config.customLogger = suppressAliasCustomResolverDeprecationWarning(config.customLogger ?? createLogger(config.logLevel, { allowClearScreen: config.clearScreen }));
 				const mode = env?.mode ?? "development";
 				const dotenvVars = loadEnv(mode, config.envDir ?? root, "");
 				for (const [key, value] of Object.entries(dotenvVars)) if (process.env[key] === void 0) process.env[key] = value;
@@ -989,7 +1038,7 @@ function vinext(options = {}) {
 				if (mode === "test") resolvedNodeEnv = "test";
 				else if (env?.command === "build" || env?.isPreview === true) resolvedNodeEnv = "production";
 				else resolvedNodeEnv = "development";
-				if (process.env.NODE_ENV !== resolvedNodeEnv) process.env.NODE_ENV = resolvedNodeEnv;
+				if (process.env.NODE_ENV !== resolvedNodeEnv) Reflect.set(process.env, "NODE_ENV", resolvedNodeEnv);
 				if (env?.command === "build") previewBuildCredentials = getPreviewBuildCredentials() ?? createPreviewBuildCredentials();
 				draftModeSecret = previewBuildCredentials?.id ?? getPagesPreviewModeId();
 				let baseDir;
@@ -1008,6 +1057,8 @@ function vinext(options = {}) {
 				appDir = path.join(baseDir, "app");
 				hasPagesDir = fs.existsSync(pagesDir);
 				hasAppDir = !options.disableAppRouter && fs.existsSync(appDir);
+				invalidateRouteCache(pagesDir);
+				invalidateAppRouteCache();
 				if (!nextConfig) {
 					const phase = env?.command === "build" ? PHASE_PRODUCTION_BUILD : PHASE_DEVELOPMENT_SERVER;
 					let rawConfig;
@@ -1026,6 +1077,10 @@ function vinext(options = {}) {
 						buildId: sharedBuildId
 					};
 				}
+				const configuredTsconfigPath = isUnknownRecord(nextConfig.typescript) ? typeof nextConfig.typescript.tsconfigPath === "string" ? nextConfig.typescript.tsconfigPath : void 0 : void 0;
+				tsconfigPathAliases = resolveTsconfigAliases(root, configuredTsconfigPath);
+				const shouldAutoEnableNativeTsconfigPaths = userResolve?.tsconfigPaths === void 0 && configuredTsconfigPath === void 0;
+				if (Object.keys(tsconfigPathAliases).length > 0) config.customLogger = suppressAliasCustomResolverDeprecationWarning(config.customLogger ?? createLogger(config.logLevel, { allowClearScreen: config.clearScreen }));
 				if (rscCompatibilityId === void 0) {
 					const sharedRscCompatibilityId = process.env.__VINEXT_SHARED_RSC_COMPATIBILITY_ID;
 					rscCompatibilityId = sharedRscCompatibilityId && sharedRscCompatibilityId.length > 0 ? sharedRscCompatibilityId : createRscCompatibilityId(nextConfig);
@@ -1036,6 +1091,10 @@ function vinext(options = {}) {
 				instrumentationClientPath = findInstrumentationClientFile(root, fileMatcher);
 				const middlewareConventionDir = canonicalize(baseDir) === canonicalize(path.join(root, "src")) ? path.join(root, "src") : root;
 				middlewarePath = findMiddlewareFile(root, fileMatcher, middlewareConventionDir);
+				if (middlewarePath) {
+					const staticMatcher = extractMiddlewareMatcherConfigValue(middlewarePath);
+					if (staticMatcher !== void 0) validateMiddlewareMatcherPatterns(staticMatcher);
+				}
 				const instrumentationClientInjects = nextConfig.instrumentationClientInject.map((spec) => spec.startsWith("./") || spec.startsWith("../") ? path.resolve(root, spec) : spec);
 				clientInjectModule = instrumentationClientInjects.length ? generateInstrumentationClientInjectModule(instrumentationClientInjects, instrumentationClientPath, INSTRUMENTATION_CLIENT_EMPTY_MODULE) : null;
 				if (env?.command === "build") await writeRouteTypes();
@@ -1050,6 +1109,10 @@ function vinext(options = {}) {
 				}
 				defines["process.env.__NEXT_ROUTER_BASEPATH"] = JSON.stringify(nextConfig.basePath);
 				defines["process.env.__VINEXT_HAS_PAGES_ROUTER"] = JSON.stringify(String(hasPagesDir));
+				defines["process.env.__VINEXT_HAS_CLIENT_REWRITES"] = JSON.stringify(String(nextConfig.rewrites.beforeFiles.length > 0 || nextConfig.rewrites.afterFiles.length > 0 || nextConfig.rewrites.fallback.length > 0));
+				defines["process.env.__VINEXT_HAS_CONFIG_HEADERS"] = JSON.stringify(String(nextConfig.headers.length > 0));
+				defines["process.env.__VINEXT_HAS_CONFIG_REDIRECTS"] = JSON.stringify(String(nextConfig.redirects.length > 0));
+				defines["process.env.__VINEXT_HAS_CONFIG_REWRITES"] = JSON.stringify(String(nextConfig.rewrites.beforeFiles.length > 0 || nextConfig.rewrites.afterFiles.length > 0 || nextConfig.rewrites.fallback.length > 0));
 				defines["process.env.__NEXT_CLIENT_ROUTER_DYNAMIC_STALETIME"] = JSON.stringify(String(nextConfig.staleTimes.dynamic));
 				defines["process.env.__NEXT_CLIENT_ROUTER_STATIC_STALETIME"] = JSON.stringify(String(nextConfig.staleTimes.static));
 				defines["process.env.__VINEXT_PREFETCH_INLINING"] = JSON.stringify(nextConfig.prefetchInlining ? "true" : "false");
@@ -1101,28 +1164,7 @@ function vinext(options = {}) {
 				}
 				for (const key of Object.keys(nextConfig.compilerDefineServer)) if (key in defines) throw new Error(`The \`compiler.defineServer\` option is configured to replace the \`${key}\` variable. This variable is either part of a built-in or is already configured.`);
 				nextShimMap = Object.fromEntries(Object.entries({
-					"next/link": path.join(shimsDir, "link"),
-					"next/head": path.join(shimsDir, "head"),
-					"next/router": path.join(shimsDir, "router"),
-					"next/compat/router": path.join(shimsDir, "compat-router"),
-					"next/image": path.join(shimsDir, "image"),
-					"next/legacy/image": path.join(shimsDir, "legacy-image"),
-					"next/dynamic": path.join(shimsDir, "dynamic"),
-					"next/app": path.join(shimsDir, "app"),
-					"next/document": path.join(shimsDir, "document"),
-					"next/config": path.join(shimsDir, "config"),
-					"next/script": path.join(shimsDir, "script"),
-					"next/server": path.join(shimsDir, "server"),
-					"next/headers": path.join(shimsDir, "headers"),
-					"next/font/google": path.join(shimsDir, "font-google"),
-					"next/font/local": path.join(shimsDir, "font-local"),
-					"next/cache": path.join(shimsDir, "cache"),
-					"next/form": path.join(shimsDir, "form"),
-					"next/og": path.join(shimsDir, "og"),
-					"next/web-vitals": path.join(shimsDir, "web-vitals"),
-					"next/amp": path.join(shimsDir, "amp"),
-					"next/offline": path.join(shimsDir, "offline"),
-					"next/constants": path.join(shimsDir, "constants"),
+					...Object.fromEntries(Object.entries(_publicNextShimMap).filter(([, definition]) => !definition.reactServer).map(([specifier, definition]) => [specifier, path.join(shimsDir, definition.shim)])),
 					"next/dist/shared/lib/app-router-context.shared-runtime": path.join(shimsDir, "internal", "app-router-context"),
 					"next/dist/shared/lib/app-router-context": path.join(shimsDir, "internal", "app-router-context"),
 					"next/dist/shared/lib/router-context.shared-runtime": path.join(shimsDir, "internal", "router-context"),
@@ -1244,7 +1286,7 @@ function vinext(options = {}) {
 							"react/jsx-runtime",
 							"react/jsx-dev-runtime"
 						],
-						...shouldEnableNativeTsconfigPaths ? { tsconfigPaths: true } : {}
+						...shouldAutoEnableNativeTsconfigPaths ? { tsconfigPaths: true } : {}
 					},
 					oxc: {
 						jsx: { runtime: "automatic" },
@@ -1460,7 +1502,7 @@ function vinext(options = {}) {
 					config.optimizeDeps.exclude = mergeOptimizeDepsExclude(config.optimizeDeps.exclude ?? [], VINEXT_OPTIMIZE_DEPS_EXCLUDE, PAGES_CLOUDFLARE_WORKER_OPTIMIZE_DEPS_EXCLUDE);
 				}
 				const configuredExtensions = name === "client" ? nextConfig.resolveExtensions : nextConfig.serverResolveExtensions;
-				const extensions = configuredExtensions === null ? buildViteResolveExtensions(nextConfig.pageExtensions, config.resolve?.extensions) : normalizeViteResolveExtensions(configuredExtensions);
+				const extensions = configuredExtensions === null ? buildViteResolveExtensions(config.resolve?.extensions) : normalizeViteResolveExtensions(configuredExtensions);
 				config.resolve ??= {};
 				config.resolve.extensions = extensions;
 				return null;
@@ -1856,8 +1898,20 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				}
 			},
 			configureServer(server) {
+				server.middlewares.use((req, _res, next) => {
+					req.__vinextOriginalEncodedUrl ??= req.url;
+					next();
+				});
 				const pageExtensions = fileMatcher.extensionRegex;
 				let pagesRunner = null;
+				const getTrustedDevRevalidateOrigin = () => {
+					const resolved = server.resolvedUrls?.local[0];
+					if (resolved) try {
+						return new URL(resolved).origin;
+					} catch {}
+					const address = server.httpServer?.address();
+					return `http://localhost:${typeof address === "object" && address ? address.port : server.config.server.port ?? 3e3}`;
+				};
 				let cachedSSRHandler = null;
 				function getPagesRunner() {
 					if (!pagesRunner) pagesRunner = createDirectRunner(server.environments["ssr"] ?? Object.values(server.environments).find((e) => e !== server.environments["rsc"]) ?? Object.values(server.environments)[0]);
@@ -2179,7 +2233,16 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								res.end("Forbidden");
 								return;
 							}
-							const requestHost = (Array.isArray(req.headers.host) ? req.headers.host[0] : req.headers.host) || "localhost";
+							let revalidationHostname = null;
+							if (req.headers["x-vinext-revalidate-host"] !== void 0) {
+								const revalidationHeaders = new Headers();
+								for (const [name, value] of Object.entries(req.headers)) {
+									if (value === void 0 || name.startsWith(":")) continue;
+									revalidationHeaders.set(name, Array.isArray(value) ? value.join(", ") : value);
+								}
+								revalidationHostname = readTrustedRevalidationHostname(revalidationHeaders, nextConfig?.i18n);
+							}
+							const requestHost = revalidationHostname ?? ((Array.isArray(req.headers.host) ? req.headers.host[0] : req.headers.host) || "localhost");
 							const requestOrigin = `http://${requestHost}`;
 							const getUrlHostname = (requestUrl) => new URL(requestUrl).hostname;
 							if (isImageOptimizationPath(url.split("?")[0])) {
@@ -2193,9 +2256,25 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								res.end();
 								return;
 							}
+							const originalEncodedUrl = req.__vinextOriginalEncodedUrl ?? url;
+							const originalEncodedPathname = originalEncodedUrl.split("?")[0];
+							if (isOpenRedirectShaped(originalEncodedPathname)) {
+								res.writeHead(404);
+								res.end("This page could not be found");
+								return;
+							}
+							const canonicalOriginalUrl = canonicalizeRequestUrlPathname(originalEncodedUrl);
+							url = canonicalizeRequestUrlPathname(url);
 							const rawPathname = url.split("?")[0];
 							if (rawPathname.endsWith("/index.html")) url = url.replace("/index.html", "/");
 							else if (rawPathname.endsWith(".html")) url = url.replace(/\.html(?=\?|$)/, "");
+							let middlewareUrl = canonicalOriginalUrl;
+							let routeUrl = middlewareUrl;
+							{
+								const routePathname = routeUrl.split("?")[0];
+								if (routePathname.endsWith("/index.html")) routeUrl = routeUrl.replace("/index.html", "/");
+								else if (routePathname.endsWith(".html")) routeUrl = routeUrl.replace(/\.html(?=\?|$)/, "");
+							}
 							let pathname = url.split("?")[0];
 							if (isOpenRedirectShaped(pathname)) {
 								res.writeHead(404);
@@ -2210,20 +2289,42 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								res.end("Bad Request");
 								return;
 							}
+							if (urlParserCreatesPagesDataPath(pathname)) {
+								res.writeHead(404);
+								res.end("This page could not be found");
+								return;
+							}
+							pathname = encodeUrlParserIgnoredCharacters(pathname);
 							{
 								const qs = url.includes("?") ? url.slice(url.indexOf("?")) : "";
 								url = pathname + qs;
 							}
 							const capturedMiddlewarePath = middlewarePath;
 							const bp = nextConfig?.basePath ?? "";
-							if (bp && pathname.startsWith(bp)) {
-								const stripped = pathname.slice(bp.length) || "/";
-								url = stripped + (url.includes("?") ? url.slice(url.indexOf("?")) : "");
-								pathname = stripped;
+							const viteBase = server.config.base;
+							const viteBasePath = viteBase.startsWith("/") && viteBase !== "/" ? viteBase.replace(/\/+$/, "") : "";
+							const routingBasePath = bp || viteBasePath;
+							if (routingBasePath) {
+								if (hasBasePath(pathname, routingBasePath)) {
+									const stripped = stripBasePath(pathname, routingBasePath);
+									url = stripped + (url.includes("?") ? url.slice(url.indexOf("?")) : "");
+									pathname = stripped;
+								}
+								const middlewarePathname = middlewareUrl.split("?")[0];
+								if (hasBasePath(middlewarePathname, routingBasePath)) {
+									const middlewareQs = middlewareUrl.includes("?") ? middlewareUrl.slice(middlewareUrl.indexOf("?")) : "";
+									middlewareUrl = stripBasePath(middlewarePathname, routingBasePath) + middlewareQs;
+								}
+								const routePathname = routeUrl.split("?")[0];
+								if (hasBasePath(routePathname, routingBasePath)) {
+									const routeQs = routeUrl.includes("?") ? routeUrl.slice(routeUrl.indexOf("?")) : "";
+									routeUrl = stripBasePath(routePathname, routingBasePath) + routeQs;
+								}
 							}
+							let configMatchPathname = stripBasePath(middlewareUrl.split("?")[0], routingBasePath);
 							if (nextConfig) {
 								const qs = url.includes("?") ? url.slice(url.indexOf("?")) : "";
-								const trailingSlashRedirect = normalizeTrailingSlash(pathname, bp, nextConfig.trailingSlash, qs);
+								const trailingSlashRedirect = normalizeTrailingSlash(routeUrl.split("?")[0], bp, nextConfig.trailingSlash, qs);
 								if (trailingSlashRedirect) {
 									const location = trailingSlashRedirect.headers.get("Location");
 									res.writeHead(trailingSlashRedirect.status, location ? { Location: location } : void 0);
@@ -2241,7 +2342,10 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 									const qs = url.includes("?") ? url.slice(url.indexOf("?")) : "";
 									const pagePathname = normalizeNextDataPagePathname(dataMatch.pagePathname, capturedMiddlewarePath !== null && nextConfig?.trailingSlash === true);
 									url = pagePathname + qs;
+									middlewareUrl = url;
+									routeUrl = url;
 									pathname = pagePathname;
+									configMatchPathname = pagePathname;
 									req.url = url;
 								} else {
 									const deploymentId = process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID;
@@ -2273,10 +2377,11 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 							const rawHeaders = new Headers(Object.fromEntries(Object.entries(req.headers).filter(([k, v]) => v !== void 0 && !k.startsWith(":")).map(([k, v]) => [k, Array.isArray(v) ? v.join(", ") : String(v)])));
 							const isDataRequest = isDataReq;
 							const nodeRequestHeaders = filterInternalHeaders(rawHeaders);
+							if (revalidationHostname) nodeRequestHeaders.set("host", revalidationHostname);
 							for (const header of INTERNAL_HEADERS) delete req.headers[header];
 							for (const header of VINEXT_INTERNAL_HEADERS) delete req.headers[header];
 							const method = req.method ?? "GET";
-							const webRequest = new Request(new URL(url, requestOrigin), {
+							const webRequest = new Request(new URL(routeUrl, requestOrigin), {
 								method,
 								headers: nodeRequestHeaders
 							});
@@ -2287,11 +2392,11 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 							const devRunMiddlewareAdapter = capturedMiddlewarePath ? async (_request, _ctx, opts) => {
 								const rawProto = process.env.VINEXT_TRUST_PROXY === "1" || (process.env.VINEXT_TRUSTED_HOSTS ?? "").split(",").some((h) => h.trim()) ? String(req.headers["x-forwarded-proto"] || "").split(",")[0].trim() : "";
 								const mwOrigin = `${rawProto === "https" || rawProto === "http" ? rawProto : "http"}://${requestHost}`;
-								const middlewareRequest = new Request(new URL(url, mwOrigin), {
+								const middlewareRequest = new Request(new URL(middlewareUrl, mwOrigin), {
 									method: req.method,
 									headers: nodeRequestHeaders
 								});
-								const result = await runMiddleware(getPagesRunner(), capturedMiddlewarePath, middlewareRequest, nextConfig?.i18n, nextConfig?.basePath, nextConfig?.trailingSlash, opts.isDataRequest);
+								const result = await runMiddleware(getPagesRunner(), capturedMiddlewarePath, middlewareRequest, nextConfig?.i18n, nextConfig?.basePath, nextConfig?.trailingSlash, opts.isDataRequest, pathname);
 								if (hasAppDir && result.continue) {
 									const mwCtxEntries = [];
 									if (result.responseHeaders) {
@@ -2335,6 +2440,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								isDataRequest,
 								hasMiddleware: capturedMiddlewarePath !== null,
 								rawSearch: url.includes("?") ? url.slice(url.indexOf("?")) : "",
+								configMatchPathname,
 								runMiddleware: devRunMiddlewareAdapter,
 								matchPageRoute: (resolvedPathname, request) => {
 									const m = matchRoute(nextConfig?.i18n ? resolvePagesI18nRequest(resolvedPathname, nextConfig.i18n, request.headers, getUrlHostname(request.url), bp, nextConfig.trailingSlash ?? false).url : resolvedPathname, devPageRoutes);
@@ -2392,6 +2498,8 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								if (await handleApiRoute(getPagesRunner(), req, res, pipelineResult.apiUrl, apiRoutes, {
 									basePath: nextConfig?.basePath,
 									i18n: nextConfig?.i18n,
+									trustedRevalidateOrigin: getTrustedDevRevalidateOrigin(),
+									allowedRevalidateHeaderKeys: nextConfig?.allowedRevalidateHeaderKeys,
 									trailingSlash: nextConfig?.trailingSlash
 								})) return;
 								if (hasAppDir) return next();
@@ -2410,7 +2518,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								}
 								if (!cachedSSRHandler || cachedSSRHandler.routes !== routes) cachedSSRHandler = {
 									routes,
-									handler: createSSRHandler(server, getPagesRunner(), routes, pagesDir, nextConfig?.i18n, fileMatcher, nextConfig?.basePath ?? "", nextConfig?.trailingSlash ?? false, middlewarePath !== null, (nextConfig?.rewrites.beforeFiles.length ?? 0) > 0 || (nextConfig?.rewrites.afterFiles.length ?? 0) > 0 || (nextConfig?.rewrites.fallback.length ?? 0) > 0, nextConfig?.clientTraceMetadata, nextConfig?.htmlLimitedBots, nextConfig?.reactStrictMode === true)
+									handler: createSSRHandler(server, getPagesRunner(), routes, pagesDir, nextConfig?.i18n, fileMatcher, nextConfig?.basePath ?? "", nextConfig?.trailingSlash ?? false, middlewarePath !== null, (nextConfig?.rewrites.beforeFiles.length ?? 0) > 0 || (nextConfig?.rewrites.afterFiles.length ?? 0) > 0 || (nextConfig?.rewrites.fallback.length ?? 0) > 0, nextConfig?.clientTraceMetadata, nextConfig?.htmlLimitedBots, nextConfig?.reactStrictMode === true, nextConfig?.expireTime)
 								};
 								flushStagedHeaders();
 								flushRequestHeaders();
@@ -2537,7 +2645,8 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					if (useNativeTypeofWindowFolding && this.environment.config.build.write !== false) return null;
 					const cacheDir = `${toSlash(this.environment.config.cacheDir).replace(/\/$/, "")}/`;
 					if (toSlash(id).startsWith(cacheDir)) return null;
-					return replaceTypeofWindow(code, getTypeofWindowReplacement(this.environment), id);
+					const replacement = getTypeofWindowReplacement(this.environment);
+					return cachedTypeofWindowTransform(id, code, replacement, () => replaceTypeofWindow(code, replacement, id));
 				}
 			}
 		},
@@ -2716,32 +2825,8 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				async handler(code, id) {
 					const ast = parseAst(code);
 					const cacheDirective = ast.body.find((node) => node.type === "ExpressionStatement" && node.expression?.type === "Literal" && typeof node.expression.value === "string" && node.expression.value.startsWith("use cache"));
-					function nodeHasInlineCacheDirective(node) {
-						if (!node || typeof node !== "object") return false;
-						const fn = node.type === "MethodDefinition" ? node.value : node;
-						const stmts = fn?.body?.type === "BlockStatement" ? fn.body.body : null;
-						if (Array.isArray(stmts)) {
-							for (const stmt of stmts) if (stmt?.type === "ExpressionStatement" && stmt.expression?.type === "Literal" && typeof stmt.expression?.value === "string" && /^use cache(:\s*\w+)?$/.test(stmt.expression.value)) return true;
-						}
-						return false;
-					}
-					function astHasInlineCache(nodes) {
-						for (const node of nodes) {
-							if (!node || typeof node !== "object") continue;
-							if ((node.type === "FunctionDeclaration" || node.type === "FunctionExpression" || node.type === "ArrowFunctionExpression" || node.type === "MethodDefinition") && nodeHasInlineCacheDirective(node)) return true;
-							for (const key of Object.keys(node)) {
-								if (key === "type" || key === "start" || key === "end" || key === "loc") continue;
-								const child = node[key];
-								if (Array.isArray(child) && child.some((c) => c && typeof c === "object")) {
-									if (astHasInlineCache(child)) return true;
-								} else if (child && typeof child === "object" && child.type) {
-									if (astHasInlineCache([child])) return true;
-								}
-							}
-						}
-						return false;
-					}
-					const hasInlineCache = !cacheDirective && astHasInlineCache(ast.body);
+					const inlineCacheSecondArgumentUsage = cacheDirective ? [] : collectInlineUseCacheSecondArgumentUsage(ast.body);
+					const hasInlineCache = inlineCacheSecondArgumentUsage.length > 0;
 					if (!cacheDirective && !hasInlineCache) return null;
 					if (!resolvedRscTransformsPath) throw new Error("vinext: 'use cache' requires @vitejs/plugin-rsc to be installed.\nRun: " + detectPackageManager(process.cwd()) + " @vitejs/plugin-rsc");
 					const { transformWrapExport, transformHoistInlineDirective } = await import(pathToFileURL(resolvedRscTransformsPath).href);
@@ -2753,10 +2838,15 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 						const moduleFileName = path.basename(modulePath);
 						const isAppPageModule = hasAppDir && isInsideDirectory(appDir, modulePath) && path.parse(moduleFileName).name === "page" && fileMatcher.extensionRegex.test(moduleFileName);
 						const runtimeModuleUrl = pathToFileURL(resolveShimModulePath(shimsDir, "cache-runtime")).href;
+						const secondArgumentUsage = collectFileUseCacheSecondArgumentUsage(ast.body);
 						const result = transformWrapExport(code, ast, {
 							runtime: (value, name) => {
-								const pageOptions = name === "default" && isAppPageModule ? `, { appPageDefaultExport: true }` : "";
-								return `(await import(${JSON.stringify(runtimeModuleUrl)})).registerCachedFunction(${value}, ${JSON.stringify(id + ":" + name)}, ${JSON.stringify(variant)}${pageOptions})`;
+								const runtimeOptions = [];
+								const acceptsSecondArgument = secondArgumentUsage.get(value) ?? true;
+								runtimeOptions.push(`acceptsSecondArgument: ${acceptsSecondArgument}`);
+								if (name === "default" && isAppPageModule) runtimeOptions.push("appPageDefaultExport: true");
+								const optionsArgument = runtimeOptions.length > 0 ? `, { ${runtimeOptions.join(", ")} }` : "";
+								return `(await import(${JSON.stringify(runtimeModuleUrl)})).registerCachedFunction(${value}, ${JSON.stringify(id + ":" + name)}, ${JSON.stringify(variant)}${optionsArgument})`;
 							},
 							rejectNonAsyncFunction: false,
 							filter: (name, meta) => {
@@ -2783,12 +2873,15 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					if (hasInlineCache) {
 						const runtimeModuleUrl2 = pathToFileURL(resolveShimModulePath(shimsDir, "cache-runtime")).href;
 						try {
+							let transformedFunctionIndex = 0;
 							const result = transformHoistInlineDirective(code, ast, {
 								directive: /^use cache(:\s*\w+)?$/,
 								runtime: (value, name, meta) => {
 									const directiveMatch = meta.directiveMatch[0];
 									const variant = directiveMatch === "use cache" ? "" : directiveMatch.replace("use cache:", "").trim();
-									return `(await import(${JSON.stringify(runtimeModuleUrl2)})).registerCachedFunction(${value}, ${JSON.stringify(id + ":" + name)}, ${JSON.stringify(variant)})`;
+									const acceptsSecondArgument = inlineCacheSecondArgumentUsage[transformedFunctionIndex++];
+									const optionsArgument = acceptsSecondArgument === void 0 ? "" : `, { acceptsSecondArgument: ${acceptsSecondArgument} }`;
+									return `(await import(${JSON.stringify(runtimeModuleUrl2)})).registerCachedFunction(${value}, ${JSON.stringify(id + ":" + name)}, ${JSON.stringify(variant)}${optionsArgument})`;
 								},
 								rejectNonAsyncFunction: false
 							});

package/dist/init-cloudflare.d.ts

@@ -25,7 +25,9 @@ type CloudflarePlatformSetupResult = {
 declare function validateCloudflarePlatformSetup(context: CloudflarePlatformSetupContext, cloudflare: CloudflareInitOptions): void;
 declare function setupCloudflarePlatform(context: CloudflarePlatformSetupContext, cloudflare: CloudflareInitOptions): CloudflarePlatformSetupResult;
 declare function generateWranglerConfig(info: CloudflareProjectInfo, options?: CloudflareInitOptions, today?: string): string;
-declare function updateWranglerConfigForCloudflare(code: string, options: CloudflareInitOptions): string;
+declare function updateWranglerConfigForCloudflare(code: string, options: CloudflareInitOptions, context?: {
+  root?: string;
+}): string;
 declare function getWranglerImagesBinding(code: string): string;
 /** Generate vite.config.ts for App Router */
 declare function generateAppRouterViteConfig(info?: CloudflareProjectInfo, options?: CloudflareInitOptions, imagesBinding?: string, prerender?: boolean): string;