vinext 1.4.1 → 1.4.3

package/dist/entries/pages-server-entry.js

@@ -104,10 +104,13 @@ async function generatePagesRequestEntry(pagesDir, nextConfig, fileMatcher, midd
 			deviceSizes: nextConfig?.images?.deviceSizes,
 			imageSizes: nextConfig?.images?.imageSizes,
 			qualities: nextConfig?.images?.qualities,
+			localPatterns: nextConfig?.images?.localPatterns,
 			dangerouslyAllowSVG: nextConfig?.images?.dangerouslyAllowSVG,
 			dangerouslyAllowLocalIP: nextConfig?.images?.dangerouslyAllowLocalIP,
 			contentDispositionType: nextConfig?.images?.contentDispositionType,
-			contentSecurityPolicy: nextConfig?.images?.contentSecurityPolicy
+			contentSecurityPolicy: nextConfig?.images?.contentSecurityPolicy,
+			minimumCacheTTL: nextConfig?.images?.minimumCacheTTL,
+			maximumResponseBody: nextConfig?.images?.maximumResponseBody
 		}
 	});
 	const instrumentationImportCode = instrumentationPath ? `import * as _instrumentation from ${JSON.stringify(instrumentationPath)};
@@ -134,6 +137,7 @@ export function __ensureInstrumentation(ctx) {
     isProxy: ${JSON.stringify(isProxyFile(middlewarePath))},
     module: middlewareModule,
     request,
+    restoreLocaleRootTrailingSlash: options?.restoreLocaleRootTrailingSlash === true,
     skipTrailingSlashRedirect: vinextConfig.skipTrailingSlashRedirect,
     trailingSlash: vinextConfig.trailingSlash,
   });
@@ -164,11 +168,14 @@ export const vinextConfig = ${vinextConfigJson};
 export const publicFiles = new Set(${JSON.stringify(publicFiles)});
 export const clientBuildFiles = new Set(__pagesClientAssets.clientBuildFiles ?? []);
 
+// The Worker request stage strips basePath before calling this, so the data
+// path must not lose it again: with basePath "/docs", "/docs/docs/_next/data/..."
+// is the page path "/docs/_next/data/...", not a data request.
 export function normalizeDataRequest(request) {
   return __normalizePagesDataRequest(
     request,
     buildId,
-    vinextConfig.basePath,
+    "",
     __shouldAddTrailingSlashToPagesDataPath(
       hasMiddleware,
       vinextConfig.trailingSlash,
@@ -281,10 +288,13 @@ async function generateServerEntry(pagesDir, nextConfig, fileMatcher, middleware
 			deviceSizes: nextConfig?.images?.deviceSizes,
 			imageSizes: nextConfig?.images?.imageSizes,
 			qualities: nextConfig?.images?.qualities,
+			localPatterns: nextConfig?.images?.localPatterns,
 			dangerouslyAllowSVG: nextConfig?.images?.dangerouslyAllowSVG,
 			dangerouslyAllowLocalIP: nextConfig?.images?.dangerouslyAllowLocalIP,
 			contentDispositionType: nextConfig?.images?.contentDispositionType,
-			contentSecurityPolicy: nextConfig?.images?.contentSecurityPolicy
+			contentSecurityPolicy: nextConfig?.images?.contentSecurityPolicy,
+			minimumCacheTTL: nextConfig?.images?.minimumCacheTTL,
+			maximumResponseBody: nextConfig?.images?.maximumResponseBody
 		}
 	});
 	const instrumentationImportCode = instrumentationPath ? `import * as _instrumentation from ${JSON.stringify(instrumentationPath)};
@@ -331,6 +341,7 @@ export async function runMiddleware(request, ctx, options) {
     isProxy: ${JSON.stringify(isProxyFile(middlewarePath))},
     module: middlewareModule,
     request,
+    restoreLocaleRootTrailingSlash: options?.restoreLocaleRootTrailingSlash === true,
     skipTrailingSlashRedirect: vinextConfig.skipTrailingSlashRedirect,
     trailingSlash: vinextConfig.trailingSlash,
   });
@@ -398,11 +409,14 @@ export const buildId = ${buildIdJson};
 // Per-build capability used by Worker entries to authorize remote path
 // discovery. It is never included in responses or exposed to user modules.
 export const prerenderSecret = ${JSON.stringify(prerenderSecret ?? null)};
+// The Worker request stage strips basePath before calling this, so the data
+// path must not lose it again: with basePath "/docs", "/docs/docs/_next/data/..."
+// is the page path "/docs/_next/data/...", not a data request.
 export function normalizeDataRequest(request) {
   return __normalizePagesDataRequest(
     request,
     buildId,
-    vinextConfig.basePath,
+    "",
     __shouldAddTrailingSlashToPagesDataPath(
       hasMiddleware,
       vinextConfig.trailingSlash,
@@ -437,6 +451,7 @@ export const pageRoutes = [
 ${pageRouteEntries.join(",\n")}
 ];
 export const publicFiles = new Set(${JSON.stringify(publicFiles)});
+export const clientBuildFiles = new Set(__pagesClientAssets.clientBuildFiles ?? []);
 const _pageRouteTrie = _buildRouteTrie(pageRoutes);
 const _errorPageRoute = {
   pattern: "/_error",

package/dist/index.js

@@ -14,12 +14,12 @@ import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from "./shims/consta
 import { serializeCacheLifeProfiles } from "./utils/cache-life-profiles.js";
 import { VINEXT_MW_CTX_HEADER } from "./utils/protocol-headers.js";
 import { encodeMiddlewareRequestHeaders } from "./utils/middleware-request-headers.js";
-import { hasBasePath, stripBasePath } from "./utils/base-path.js";
+import { hasBasePath, restoreBasePath, stripBasePath } from "./utils/base-path.js";
 import { INTERNAL_HEADERS, NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_TIMING_HEADER } from "./server/headers.js";
 import { methodNotAllowedResponse, notFoundStaticAssetResponse } from "./server/http-error-responses.js";
 import { isOpenRedirectShaped, sendRepeatedSlashRedirect } from "./server/open-redirect.js";
 import { canonicalizeRequestUrlPathname, filterInternalHeaders, normalizeTrailingSlash } from "./server/request-pipeline.js";
-import { matchesRewriteSource, proxyExternalRequest } from "./config/config-matchers.js";
+import { proxyExternalRequest } from "./config/config-matchers.js";
 import { omitUnusedBuildSourcemap } from "./plugins/transform-result.js";
 import { assetPrefixPathname, isNextStaticPath, resolveAssetsDir } from "./utils/asset-prefix.js";
 import { RESOLVED_VIRTUAL_GOOGLE_FONTS, VIRTUAL_GOOGLE_FONTS, createGoogleFontsPlugin, createLocalFontsPlugin, generateGoogleFontsVirtualModule, parseStaticObjectLiteral } from "./plugins/fonts.js";
@@ -31,7 +31,7 @@ import { apiRouter, invalidateRouteCache, matchRoute, pagesRouter } from "./rout
 import { resolveRuntimeEntryModule } from "./entries/runtime-entry-module.js";
 import { normalizePath as normalizePath$1 } from "./server/normalize-path.js";
 import { validateMiddlewareMatcherPatterns } from "./server/middleware-matcher-pattern.js";
-import { resolvePagesI18nRequest, shouldRestoreLocaleRootTrailingSlash, stripI18nLocaleForApiRoute } from "./server/pages-i18n.js";
+import { resolvePagesI18nRequest, shouldRestoreLocaleRootTrailingSlash } from "./server/pages-i18n.js";
 import { encodeUrlParserIgnoredCharacters, isNextDataPathname, normalizeNextDataPagePathname, parseNextDataPathname, shouldAddTrailingSlashToPagesDataPath, urlParserCreatesPagesDataPath } from "./server/pages-data-route.js";
 import { findInstrumentationClientFile, findInstrumentationFile, runInstrumentation } from "./server/instrumentation.js";
 import { findMiddlewareFile, isProxyFile, runMiddleware } from "./server/middleware.js";
@@ -78,6 +78,7 @@ import { readTrustedRevalidationHostname } from "./server/revalidation-host.js";
 import { sealForwardedMiddlewareContext } from "./server/forwarded-middleware-context.js";
 import { installDevStackSourcemapMiddleware } from "./server/dev-stack-sourcemap.js";
 import { traceFrameworkRequest } from "./server/request-tracing.js";
+import { publicFileRouteKey } from "./utils/public-file-path.js";
 import { runPagesRequest } from "./server/pages-request-pipeline.js";
 import { pagesRouteHasPriorityOverAppRoute, validateHybridRouteConflicts } from "./server/hybrid-route-priority.js";
 import { hasReactCompilerPlugin, isReactCompilerPlugin, isReactCompilerRequested, reactCompilerUnsupportedMessage } from "./utils/react-compiler-support.js";
@@ -89,6 +90,7 @@ import { createClientCompileHintsPlugin } from "./plugins/client-compile-hints.j
 import { clientReferenceDedupPlugin } from "./plugins/client-reference-dedup.js";
 import { dataUrlCssPlugin } from "./plugins/css-data-url.js";
 import { createCssModuleImportCompatibilityPlugin } from "./plugins/css-module-imports.js";
+import { createCssTargetPlugin } from "./plugins/css-target.js";
 import { createWorkerImageImportsPlugin } from "./plugins/worker-image-imports.js";
 import { assertClientOutDirIsSeparate, createClientAssetFileNames, createClientCodeSplittingConfig, createClientManualChunks, createClientOutputFileNameDefaults, createMultiStageChunkFileNames, createMultiStageCodeSplittingConfig, createRscFrameworkChunkOutputConfig, createWorkerFileNames, findUnsupportedClientOutputFileNames, getBuildBundlerOptions, getClientTreeshakeConfig, getOutputFileNames, withBuildBundlerOptions } from "./build/client-build-config.js";
 import { createRouteClientReferencesFallbackPlugin, createRscClientReferenceLoadersPlugin } from "./plugins/rsc-client-reference-loaders.js";
@@ -133,7 +135,6 @@ import { createExtensionlessDynamicImportPlugin } from "./plugins/extensionless-
 import { createWasmModuleImportPlugin } from "./plugins/wasm-module-import.js";
 import { consumerEnvironmentConditionFilter, getTypeofWindowReplacement, mayFoldChangeScannedImports, replaceConsumerEnvironmentConditions } from "./plugins/typeof-window.js";
 import { hasMdxFiles, loadMdxEsmReader, pageExtensionsIncludeMdx } from "./utils/mdx-scan.js";
-import { publicFileRouteKey } from "./utils/public-file-path.js";
 import { scanPublicFileRoutes, scanPublicFiles } from "./utils/public-routes.js";
 import { createIgnoreDynamicRequestsPlugin } from "./plugins/ignore-dynamic-requests.js";
 import { assertPluginRscVersion, needsAppReactServerDom } from "./utils/plugin-rsc-version.js";
@@ -843,6 +844,7 @@ const PAGES_REQUEST_STAGE_ENTRY = resolveRuntimeEntryModule("pages-request-stage
 const PAGES_RESPONSE_STAGE_ENTRY = resolveRuntimeEntryModule("pages-response-stage-entry");
 const NITRO_PUBLIC_FILES_ENTRY = resolveRuntimeEntryModule("nitro-public-files");
 const NITRO_PUBLIC_FILES_PLUGIN = resolveRuntimeEntryModule("nitro-public-files-plugin");
+const SRVX_MIDDLEWARE_ORIGIN_ENTRY = resolveRuntimeEntryModule("srvx-middleware-origin");
 const WORKER_ROUTER_ENTRIES = /* @__PURE__ */ new Set([resolveRuntimeEntryModule("app-router-entry"), resolveRuntimeEntryModule("pages-router-entry")]);
 /** Virtual module that registers config-driven cache adapters (see VinextOptions.cache). */
 const RESOLVED_CACHE_ADAPTERS = "\0" + VIRTUAL_CACHE_ADAPTERS;
@@ -1466,6 +1468,7 @@ function vinext(options = {}) {
 		}),
 		dataUrlCssPlugin(),
 		createCssModuleImportCompatibilityPlugin(),
+		createCssTargetPlugin(),
 		createDevServerLifecyclePlugin({}, (config) => config[VINEXT_DEV_CLI_LIFECYCLE] === true),
 		{
 			name: "vinext:config",
@@ -1764,12 +1767,6 @@ function vinext(options = {}) {
 					} } : {},
 					build: {
 						ssrEmitAssets: true,
-						cssTarget: [
-							"chrome111",
-							"edge111",
-							"firefox114",
-							"safari15"
-						],
 						assetsDir: clientAssetsDir,
 						...!isSSR && !hasClientBuildEnvironment ? { assetsInlineLimit: clientAssetsInlineLimit } : {},
 						...withBuildBundlerOptions({
@@ -2363,9 +2360,14 @@ function vinext(options = {}) {
 						const entry = hasAppDir ? "vinext/server/app-router-entry" : "vinext/server/pages-router-entry";
 						if (!hasAppDir && hasNitroPlugin) return [
 							`import pagesWorker from ${JSON.stringify(entry)};`,
+							`import { resolveSrvxMiddlewareOrigin } from ${JSON.stringify(SRVX_MIDDLEWARE_ORIGIN_ENTRY)};`,
 							...nitroPublicFiles ? [`import { withNitroPagesPublicFiles } from ${JSON.stringify(NITRO_PUBLIC_FILES_ENTRY)};`, "const worker = withNitroPagesPublicFiles(pagesWorker);"] : ["const worker = pagesWorker;"],
 							"export default { fetch(request, env, ctx) {",
-							`  return worker.fetch(request, env, { ...ctx, hostRuntime: ${JSON.stringify(nitroHostRuntime)} });`,
+							"  return worker.fetch(request, env, {",
+							"    ...ctx,",
+							`    hostRuntime: ${JSON.stringify(nitroHostRuntime)},`,
+							"    middlewareOrigin: resolveSrvxMiddlewareOrigin(request),",
+							"  });",
 							"} };"
 						].join("\n");
 						return `export { default } from ${JSON.stringify(entry)};`;
@@ -2453,10 +2455,13 @@ function vinext(options = {}) {
 								deviceSizes: nextConfig?.images?.deviceSizes,
 								imageSizes: nextConfig?.images?.imageSizes,
 								qualities: nextConfig?.images?.qualities,
+								localPatterns: nextConfig?.images?.localPatterns,
 								dangerouslyAllowSVG: nextConfig?.images?.dangerouslyAllowSVG,
 								dangerouslyAllowLocalIP: nextConfig?.images?.dangerouslyAllowLocalIP,
 								contentDispositionType: nextConfig?.images?.contentDispositionType,
-								contentSecurityPolicy: nextConfig?.images?.contentSecurityPolicy
+								contentSecurityPolicy: nextConfig?.images?.contentSecurityPolicy,
+								minimumCacheTTL: nextConfig?.images?.minimumCacheTTL,
+								maximumResponseBody: nextConfig?.images?.maximumResponseBody
 							},
 							hasPagesDir,
 							publicFiles: isServeCommand && devPublicFileRoutes ? [...devPublicFileRoutes].sort() : scanPublicFileRoutes(root, this.environment.config.publicDir === "" ? false : this.environment.config.publicDir),
@@ -2737,9 +2742,11 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				handler(_options, bundle) {
 					if (this.environment?.name !== "client") return;
 					const manifest = {};
+					const appBrowserRuntimeModule = toSlash(resolveRuntimeEntryModule("app-browser-entry"));
 					for (const chunk of Object.values(bundle)) {
 						if (chunk.type !== "chunk") continue;
 						if (chunk.isDynamicEntry && isVirtualEntryFacade(chunk.facadeModuleId, VIRTUAL_APP_ROUTE_MANIFEST)) manifest.appRouteManifest = chunk.fileName;
+						if (chunk.moduleIds.some((id) => toSlash(id) === appBrowserRuntimeModule)) manifest.appBrowserRuntime = chunk.fileName;
 						if (!chunk.isEntry) continue;
 						if (isVirtualEntryFacade(chunk.facadeModuleId, VIRTUAL_CLIENT_ENTRY)) manifest.pagesClientEntry = chunk.fileName;
 						else if (isVirtualEntryFacade(chunk.facadeModuleId, VIRTUAL_APP_BROWSER_ENTRY)) manifest.appBrowserEntry = chunk.fileName;
@@ -3378,14 +3385,17 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 							const viteBase = server.config.base;
 							const viteBasePath = viteBase.startsWith("/") && viteBase !== "/" ? viteBase.replace(/\/+$/, "") : "";
 							const routingBasePath = bp || viteBasePath;
+							const viteStrippedBasePath = originalRequestUrl !== originalEncodedUrl;
+							let originalUrlHadBasePath = false;
 							if (routingBasePath) {
-								if (hasBasePath(pathname, routingBasePath)) {
+								if (!viteStrippedBasePath && 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)) {
+									originalUrlHadBasePath = true;
 									const middlewareQs = middlewareUrl.includes("?") ? middlewareUrl.slice(middlewareUrl.indexOf("?")) : "";
 									middlewareUrl = stripBasePath(middlewarePathname, routingBasePath) + middlewareQs;
 								}
@@ -3395,7 +3405,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 									routeUrl = stripBasePath(routePathname, routingBasePath) + routeQs;
 								}
 							}
-							let configMatchPathname = stripBasePath(middlewareUrl.split("?")[0], routingBasePath);
+							let configMatchPathname = middlewareUrl.split("?")[0];
 							if (nextConfig && !nextConfig.skipTrailingSlashRedirect) {
 								const qs = url.includes("?") ? url.slice(url.indexOf("?")) : "";
 								const trailingSlashRedirect = normalizeTrailingSlash(routeUrl.split("?")[0], bp, nextConfig.trailingSlash, qs);
@@ -3412,7 +3422,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 							const rawRoutePathname = routeUrl.split("?")[0];
 							if (isNextDataPathname(rawRoutePathname)) {
 								const rawDataMatch = parseNextDataPathname(rawRoutePathname, devBuildId);
-								const dataMatch = rawDataMatch ? parseNextDataPathname(pathname, devBuildId) : null;
+								const dataMatch = rawDataMatch ? parseNextDataPathname(pathname, devBuildId, true) : null;
 								if (dataMatch && rawDataMatch) {
 									isDataReq = true;
 									const qs = url.includes("?") ? url.slice(url.indexOf("?")) : "";
@@ -3441,25 +3451,6 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 									});
 								}
 							}
-							const filePathMatchesRewrite = [
-								...nextConfig?.rewrites.beforeFiles ?? [],
-								...nextConfig?.rewrites.afterFiles ?? [],
-								...nextConfig?.rewrites.fallback ?? []
-							].some((rewrite) => matchesRewriteSource(pathname, rewrite, {
-								basePath: bp,
-								hadBasePath: true
-							}));
-							const isFilePathRequest = pathname.includes(".") && !pathname.endsWith(".html");
-							const isExistingPublicMutation = req.method !== "GET" && req.method !== "HEAD" && isExistingDevPublicFile(pathname);
-							let filePathMatchesPagesRoute = false;
-							const requestHostname = getUrlHostname(requestOrigin);
-							if (isFilePathRequest && !filePathMatchesRewrite && !isDataReq) {
-								const [pageRoutes, apiRoutes] = await Promise.all([pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher), apiRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher)]);
-								const pageRouteUrl = nextConfig?.i18n ? resolvePagesI18nRequest(pathname, nextConfig.i18n, req.headers, requestHostname, bp, nextConfig.trailingSlash ?? false).url : pathname;
-								const apiRouteUrl = stripI18nLocaleForApiRoute(pathname, nextConfig?.i18n ?? null);
-								filePathMatchesPagesRoute = matchRoute(pageRouteUrl, pageRoutes) !== null || matchRoute(apiRouteUrl, apiRoutes) !== null;
-							}
-							if (isFilePathRequest && !isDataReq && !filePathMatchesRewrite && !filePathMatchesPagesRoute && !isNextStaticPath(pathname, "", assetPrefixPathname(nextConfig?.assetPrefix ?? "")) && !isExistingPublicMutation) return next();
 							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);
@@ -3482,12 +3473,14 @@ 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(middlewareUrl, mwOrigin), {
+								const middlewareRequestUrl = new URL(middlewareUrl, mwOrigin);
+								if (originalUrlHadBasePath) middlewareRequestUrl.pathname = restoreBasePath(middlewareRequestUrl.pathname, bp);
+								const middlewareRequest = new Request(middlewareRequestUrl, {
 									method: req.method,
 									headers: nodeRequestHeaders,
 									signal: webRequest.signal
 								});
-								const result = await runMiddleware(getPagesRunner(), capturedMiddlewarePath, middlewareRequest, nextConfig?.i18n, nextConfig?.basePath, nextConfig?.trailingSlash, opts.isDataRequest, pathname, opts.isStaleDataRequest, nextConfig?.skipTrailingSlashRedirect);
+								const result = await runMiddleware(getPagesRunner(), capturedMiddlewarePath, middlewareRequest, nextConfig?.i18n, nextConfig?.basePath, nextConfig?.trailingSlash, opts.isDataRequest, pathname, opts.isStaleDataRequest, nextConfig?.skipTrailingSlashRedirect, opts.restoreLocaleRootTrailingSlash);
 								if (hasAppDir && result.continue) {
 									const mwCtxEntries = [];
 									if (result.responseHeaders) {
@@ -3628,7 +3621,8 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 									trustedRevalidateOrigin: getTrustedDevRevalidateOrigin(),
 									allowedRevalidateHeaderKeys: nextConfig?.allowedRevalidateHeaderKeys,
 									trailingSlash: nextConfig?.trailingSlash,
-									skipTrailingSlashRedirect: nextConfig?.skipTrailingSlashRedirect
+									skipTrailingSlashRedirect: nextConfig?.skipTrailingSlashRedirect,
+									requestPathname: originalUrlHadBasePath ? restoreBasePath(routeUrl.split("?")[0], bp) : routeUrl.split("?")[0]
 								})) return;
 								if (hasAppDir) {
 									if (pipelineResult.configRewriteFired) forwardInternalApiRewriteToApp(pipelineResult.apiUrl);
@@ -4117,6 +4111,11 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				nitroHostRuntime = nitro.options.exportConditions?.includes("workerd") ? "worker" : "node";
 				if (!nextConfig) return;
 				if (!hasAppDir && !hasPagesDir) return;
+				if (!nitro.options.dev) {
+					const requestTargetPlugin = resolveRuntimeEntryModule("nitro-request-target-plugin");
+					nitro.options.plugins ??= [];
+					if (!nitro.options.plugins.includes(requestTargetPlugin)) nitro.options.plugins.push(requestTargetPlugin);
+				}
 				nitroPublicFiles = registerNitroPublicFiles(nitro.options, NITRO_PUBLIC_FILES_PLUGIN, () => scanPublicFiles(root, nitroPublicDir));
 				if (resolvedServerExternalPackages.length > 0) nitro.options.traceDeps = [.../* @__PURE__ */ new Set([...nitro.options.traceDeps ?? [], ...resolvedServerExternalPackages])];
 			} }
@@ -4263,6 +4262,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 						pagesClientAssetsModule = buildPagesClientAssetsModule({
 							clientEntry: runtimeMetadata.clientEntryFile ?? void 0,
 							appBootstrapPreinitModules: runtimeMetadata.appBootstrapPreinitModules,
+							appBootstrapPreloadModules: runtimeMetadata.appBootstrapPreloadModules,
 							appRouteManifestModule: runtimeMetadata.appRouteManifestModule,
 							appClientReferenceChunks: runtimeMetadata.appClientReferenceChunks,
 							ssrManifest,

package/dist/init-cloudflare.js

@@ -140,7 +140,7 @@ function setupCloudflarePlatform(context, cloudflare) {
 			generatedPlatformFiles.push(path.relative(context.root, responseStorePath) || RESPONSE_STORE_WRANGLER_CONFIG);
 		}
 	}
-	const nextSteps = [];
+	const nextSteps = !wranglerCode || !findTopLevelJsonProperty(wranglerCode, "main") ? workerEntryWarning(context.root, context.isStaticExport) : [];
 	if (cloudflare.cdnCache === "response-store" && (cloudflare.responseStoreMode ?? "service-binding") === "service-binding") nextSteps.push("Deploy Workers Response Store before deploying the application:", `   ${context.packageManager ?? "npm"} run deploy:response-store`);
 	if (cloudflare.prerender && cloudflare.cdnCache !== "static-assets") nextSteps.push("Pre-rendered routes are built, but Cloudflare deploys do not serve them.", "   Use the Static Assets cache to serve them, or cache warming to fill another cache.");
 	return {
@@ -193,14 +193,15 @@ function setupCfPlatform(context, cloudflare) {
 	}
 	const configPath = path.join(context.root, "cloudflare.config.ts");
 	const generatedPlatformFiles = [];
+	const nextSteps = [];
 	if (!fs.existsSync(configPath)) {
 		fs.writeFileSync(configPath, generateTypedCloudflareConfig({
 			...projectInfo,
 			isStaticExport: context.isStaticExport
 		}, cloudflare, context.today));
 		generatedPlatformFiles.push("cloudflare.config.ts");
+		nextSteps.push(...workerEntryWarning(context.root, context.isStaticExport));
 	}
-	const nextSteps = [];
 	if (serviceBinding) nextSteps.push("After `vinext build`, deploy the Response Store Worker explicitly (and repeat when its code/config changes):", `   ${context.packageManager ?? "npm"} run deploy:response-store`, "vinext-cloudflare deploy only deploys the application Worker.");
 	if (cloudflare.prerender && cloudflare.cdnCache !== "static-assets") nextSteps.push("Pre-rendered routes are built, but Cloudflare deploys do not serve them.", "   Use the Static Assets cache to serve them, or cache warming to fill another cache.");
 	nextSteps.push("For TypeScript, add \".cloudflare/types\" to the include list in tsconfig.json.", "Worker types are generated during dev/build; run `cf workers types` before standalone type-checks.");
@@ -280,6 +281,21 @@ function resolveWorkerEntry(root) {
 	return "vinext/server/fetch-handler";
 }
 /**
+* A `worker/index.*` that never reaches vinext's handler (say, a migrated Vite
+* SPA's API Worker) answers every page route itself, so each one 404s (#4460).
+*/
+function workerEntryWarning(root, isStaticExport) {
+	if (isStaticExport) return [];
+	const entry = resolveWorkerEntry(root);
+	if (entry === "vinext/server/fetch-handler") return [];
+	if (fs.readFileSync(path.join(root, entry), "utf-8").includes("vinext/server/fetch-handler")) return [];
+	return [
+		`Warning: ${entry.slice(2)} does not import vinext/server/fetch-handler. As the Worker entry`,
+		"   it must hand requests to vinext, or every page 404s. Otherwise point the Worker entry",
+		"   (entrypoint in cloudflare.config.ts, or main in wrangler.jsonc) at vinext/server/fetch-handler."
+	];
+}
+/**
 * Next.js runs no middleware for a static export, and an export with
 * `trailingSlash` relies on the default html_handling to serve `/about/` from
 * `about/index.html`, so export apps keep asset-first serving.

package/dist/init-platform.js

@@ -148,9 +148,9 @@ async function resolveInitOptions(args, options = {}) {
 	if (name && platform !== "cloudflare") throw new Error("--name requires --platform=cloudflare.");
 	const explicitPrerender = parsePrerenderArg(args);
 	if (platform === "cloudflare" && platformOptions?.cdnCache === "static-assets" && explicitPrerender === false) throw new Error("--no-prerender cannot be used with --cdn-cache=static-assets, which requires build-time prerendering.");
-	const supportsWarmCdnCache = platformOptions?.cdnCache === "response-store" || platformOptions?.cdnCache === "workers-cache";
+	const supportsWarmCdnCache = platformOptions?.cdnCache !== void 0 && platformOptions.cdnCache !== "none";
 	if (platform === "cloudflare" && !supportsWarmCdnCache) {
-		if (explicitWarmCdnCache === true) throw new Error("--warm-cache requires --cdn-cache=response-store or workers-cache.");
+		if (explicitWarmCdnCache === true) throw new Error("--warm-cache requires a cache: pass --cdn-cache=response-store, workers-cache, data-cache, or static-assets.");
 	}
 	const prerender = platform === "cloudflare" && platformOptions?.cdnCache === "static-assets" ? false : explicitPrerender ?? await resolveInitPrerender(args, options, platform);
 	const warmCdnCache = platform === "cloudflare" && supportsWarmCdnCache ? await resolveInitWarmCdnCache(args, options) : false;

package/dist/init.js

@@ -1,8 +1,9 @@
 import path, { toSlash } from "./deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { detectPackageManager, detectPackageManagerName, detectProject, ensureESModule, findViteConfigPath, hasViteConfig, renameCJSConfigs } from "./utils/project.js";
 import { compactResourceName, cssModulesConfigSource, findConfigKeepingWorkerName, setupCloudflarePlatform, updateViteConfigForCssModules, usesCommonJsViteConfig, validateCloudflarePlatformSetup } from "./init-cloudflare.js";
-import { getReactUpgradeDeps } from "./utils/react-version.js";
+import { findPackageVersion, getReactUpgradeDeps } from "./utils/react-version.js";
 import { getPluginReactUpgradeDeps } from "./utils/plugin-react-version.js";
+import { createRequire } from "node:module";
 import fs from "node:fs";
 import { spawn, spawnSync } from "node:child_process";
 //#region src/init.ts
@@ -297,6 +298,26 @@ function addDependencyEntries(root, deps, { dev }) {
 	if (added.length > 0) fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + "\n", "utf-8");
 	return added;
 }
+/** The spec in the manifest sections `isDepInstalled` reads. */
+function readDeclaredDependency(root, name) {
+	try {
+		const pkg = JSON.parse(fs.readFileSync(path.join(root, "package.json"), "utf-8"));
+		return pkg.dependencies?.[name] ?? pkg.devDependencies?.[name] ?? pkg.peerDependencies?.[name];
+	} catch {
+		return;
+	}
+}
+/** The declared spec, or the installed version of a package hoisted from elsewhere. */
+function readCurrentDependencyVersion(root, name) {
+	const declared = readDeclaredDependency(root, name);
+	if (declared !== void 0) return declared;
+	try {
+		const resolved = createRequire(path.join(root, "package.json")).resolve(name);
+		return findPackageVersion(resolved, name) ?? void 0;
+	} catch {
+		return;
+	}
+}
 /**
 * Check if react/react-dom need upgrading for react-server-dom-webpack compatibility.
 *
@@ -578,12 +599,20 @@ async function init(options) {
 	let dependencyInstallNeedsApproval = false;
 	const dependencyEntriesAdded = [];
 	const devDependencyEntriesAdded = [];
+	const upgradedFrom = /* @__PURE__ */ new Map();
+	const recordUpgrades = (deps) => {
+		for (const dep of deps) {
+			const { name } = parseDependencySpecifier(dep);
+			upgradedFrom.set(name, readCurrentDependencyVersion(root, name));
+		}
+	};
 	if (isApp) {
 		const reactUpgrade = shouldInstall ? [.../* @__PURE__ */ new Set([...getReactUpgradeDeps(root), ...getReactUpgradeDeps(root, {
 			fromManifest: true,
 			installing: true
 		})])] : getReactUpgradeDeps(root, { fromManifest: true });
 		if (reactUpgrade.length > 0) {
+			recordUpgrades(reactUpgrade);
 			console.log(`  ${terminalStyle.cyan(terminalStyle.bold("Upgrading dependencies:"))}`);
 			console.log(formatList(reactUpgrade.map((dep) => dep.replace(/@latest$/, "")), "    "));
 			try {
@@ -601,6 +630,7 @@ async function init(options) {
 	}
 	const pluginReactUpgrade = getPluginReactUpgradeDeps(root);
 	if (pluginReactUpgrade.length > 0) {
+		recordUpgrades(pluginReactUpgrade);
 		console.log(`  ${terminalStyle.cyan(terminalStyle.bold("Upgrading devDependencies:"))}`);
 		console.log(formatList(pluginReactUpgrade.map((dep) => dep.replace(/@latest$/, "")), "    "));
 		try {
@@ -654,13 +684,20 @@ async function init(options) {
 	if (pmName === "pnpm" && shouldInstall && !dependencyInstallNeedsApproval && !options._exec && hasAutomaticallyIgnoredBuilds(inspectPnpmIgnoredBuilds(root))) dependencyInstallNeedsApproval = true;
 	else if (pmName === "pnpm" && shouldInstall && !dependencyInstallNeedsApproval && options._inspectPnpmIgnoredBuilds && hasAutomaticallyIgnoredBuilds(options._inspectPnpmIgnoredBuilds(root))) dependencyInstallNeedsApproval = true;
 	console.log(`  ${terminalStyle.green(terminalStyle.bold("vinext init complete!"))}\n`);
-	if (dependencyEntriesAdded.length > 0) {
+	const addedDependencies = dependencyEntriesAdded.filter((name) => !upgradedFrom.has(name));
+	const addedDevDependencies = devDependencyEntriesAdded.filter((name) => !upgradedFrom.has(name));
+	if (addedDependencies.length > 0) {
 		console.log(`    ${terminalStyle.green("✓")} Added dependencies to dependencies:`);
-		console.log(formatList(dependencyEntriesAdded, "      "));
+		console.log(formatList(addedDependencies, "      "));
 	}
-	if (devDependencyEntriesAdded.length > 0) {
+	if (addedDevDependencies.length > 0) {
 		console.log(`    ${terminalStyle.green("✓")} Added dependencies to devDependencies:`);
-		console.log(formatList(devDependencyEntriesAdded, "      "));
+		console.log(formatList(addedDevDependencies, "      "));
+	}
+	for (const [name, from] of upgradedFrom) {
+		const to = readDeclaredDependency(root, name);
+		if (to === void 0 || to === from) continue;
+		console.log(`    ${terminalStyle.green("✓")} Upgraded ${name} ${from ?? "(not installed)"} \u2192 ${to}`);
 	}
 	if (dependencyInstallNeedsApproval) console.log(`    ${terminalStyle.yellow("!")} Dependency installation is waiting for build-script approval`);
 	if (addedTypeModule) console.log(`    ${terminalStyle.green("✓")} Added "type": "module" to package.json`);

package/dist/plugins/css-target.d.ts

@@ -0,0 +1,18 @@
+import { Plugin } from "vite";
+//#region src/plugins/css-target.d.ts
+/**
+ * Applies {@link DEFAULT_CSS_TARGET} only where nobody chose a target (#4413).
+ *
+ * Vite merges config by concatenating arrays, and the CSS minifier keeps the
+ * oldest version of each browser, so a pin merged onto a chosen target would
+ * stop an app from ever raising it. Instead nothing is set while config hooks
+ * run, so the app and every plugin hook see and merge plain Vite values. The
+ * post-ordered `config` and `configEnvironment` hooks only note where a target
+ * was set, and the pin is applied once config is resolved.
+ *
+ * Both the top-level `build`, which Vite's CSS plugin minifies with (a copy of
+ * the environment's in per-environment builds), and every environment's `build`
+ * are checked.
+ */
+export declare function createCssTargetPlugin(): Plugin;
+//#endregion

package/dist/plugins/css-target.js

@@ -0,0 +1,93 @@
+//#region src/plugins/css-target.ts
+/**
+* CSS minification target. Vite defaults it to the same target as JS
+* (modern evergreens), which lets the CSS minifier (Lightning CSS by
+* default, or esbuild) rewrite
+* `@media (max-width: 768px)` to the Media Queries Level 4 range
+* syntax `@media (width <= 768px)`. Both forms are semantically
+* equivalent in modern browsers, but the rewrite is observable to
+* user code that inspects `cssText` of `CSSMediaRule`s and breaks
+* tools that pattern-match the raw query string. Next.js does not
+* perform this rewrite by default (its webpack/lightningcss CSS
+* pipeline preserves the original syntax), so user code carried
+* over from Next.js can break when migrating to vinext.
+*
+* The minifier lowers a CSS feature when ANY target in the list lacks
+* support, so we only need to pin one engine below the range-syntax
+* baseline. Range syntax shipped in Chrome 104, Edge 104, Firefox 63,
+* and Safari 16.4 (per esbuild's `internal/compat/css_table.go`
+* MediaRange entry — and caniuse). Of those, Safari is the latest:
+* pinning `safari15` (semantically Safari 15.0, which predates
+* Safari 16.4) is sufficient to suppress the rewrite on its own.
+*
+* The other three targets are pinned to ~2023 baselines instead of
+* the absolute oldest supported version so the minifier does NOT
+* collaterally downlevel unrelated modern CSS features. With
+* chrome111/edge111/firefox114 we keep through:
+*   - `:is()` pseudo-class (Chrome 88, Firefox 78)
+*   - `hwb()` colors (Chrome 101, Firefox 96)
+*   - `lab()`, `oklch()`, `color()` (Chrome 111, Firefox 113)
+*   - gradient interpolation hints (Chrome 111)
+* CSS Nesting (Chrome 120, Safari 17.2) and Firefox-137 gradient
+* interpolation will still be lowered; that is an intentional
+* trade-off — those features are newer than the baseline and
+* lowering them is the correct behavior for our target audience.
+*
+* Mirrors the Next.js fixture
+* test/e2e/app-dir/css-media-query/css-media-query.test.ts which
+* asserts `cssText` preserves `max-width: 768px`.
+*/
+const DEFAULT_CSS_TARGET = [
+	"chrome111",
+	"edge111",
+	"firefox114",
+	"safari15"
+];
+/**
+* Applies {@link DEFAULT_CSS_TARGET} only where nobody chose a target (#4413).
+*
+* Vite merges config by concatenating arrays, and the CSS minifier keeps the
+* oldest version of each browser, so a pin merged onto a chosen target would
+* stop an app from ever raising it. Instead nothing is set while config hooks
+* run, so the app and every plugin hook see and merge plain Vite values. The
+* post-ordered `config` and `configEnvironment` hooks only note where a target
+* was set, and the pin is applied once config is resolved.
+*
+* Both the top-level `build`, which Vite's CSS plugin minifies with (a copy of
+* the environment's in per-environment builds), and every environment's `build`
+* are checked.
+*/
+function createCssTargetPlugin() {
+	let topLevelConfigured = false;
+	const configuredEnvironments = /* @__PURE__ */ new Set();
+	return {
+		name: "vinext:css-target",
+		enforce: "post",
+		config: {
+			order: "post",
+			handler(config) {
+				topLevelConfigured = config.build?.cssTarget !== void 0;
+				configuredEnvironments.clear();
+			}
+		},
+		configEnvironment: {
+			order: "post",
+			handler(name, config) {
+				if (config.build?.cssTarget !== void 0) configuredEnvironments.add(name);
+			}
+		},
+		configResolved: {
+			order: "pre",
+			handler(config) {
+				pinUnsetCssTarget(config.build, topLevelConfigured);
+				for (const [name, environment] of Object.entries(config.environments)) pinUnsetCssTarget(environment.build, configuredEnvironments.has(name));
+			}
+		}
+	};
+}
+function pinUnsetCssTarget(build, configured) {
+	if (configured || build.cssTarget !== build.target) return;
+	build.cssTarget = [...DEFAULT_CSS_TARGET];
+}
+//#endregion
+export { createCssTargetPlugin };

package/dist/routing/app-route-graph.d.ts

@@ -109,6 +109,10 @@ type ParallelSlot = {
   loadingTreePositions?: number[];
   /** Absolute path to the slot's error component */
   errorPath: string | null;
+  /** Every error convention from the slot root to its active page, outermost first. */
+  errorPaths?: string[];
+  /** Slot-root-relative tree positions aligned with errorPaths. */
+  errorTreePositions?: number[];
   /** Nearest not-found convention for the slot's active branch. */
   notFoundPath?: string | null;
   /** Tree position of that convention relative to the slot root. */
@@ -167,6 +171,12 @@ export type AppRoute = {
     id: string;
     ownerTreePath: string;
     state: "active" | "default" | "unmatched";
+    /**
+     * Set on a sub-route minted for a slot page with no children page of its
+     * own: its children render a default, a sibling catch-all, or nothing, so
+     * its route segments don't describe them.
+     */
+    synthetic?: true;
   };
   /**
    * Interception markers not wrapped in an `@slot` directory.

package/dist/routing/app-route-graph.js

@@ -594,7 +594,8 @@ function discoverSlotSubRoutes(routes, matcher, ghostParents = []) {
 				childrenSlot: {
 					id: childrenSlotId,
 					ownerTreePath: childrenOwnerTreePath,
-					state: childrenDefault ? "default" : childrenCatchAll ? "active" : "unmatched"
+					state: childrenDefault ? "default" : childrenCatchAll ? "active" : "unmatched",
+					synthetic: true
 				},
 				loadingPath: null,
 				loadingPaths: parentRoute.loadingPaths,
@@ -742,10 +743,22 @@ function withSlotLoadingEntries(slot, pagePath, matcher) {
 		...slot,
 		loadingPaths: loadingEntries.map((entry) => entry.path),
 		loadingTreePositions: loadingEntries.map((entry) => entry.treePosition),
+		...findSlotErrorFields(slot.ownerDir, pagePath, matcher),
 		...findSlotNotFoundFields(slot.ownerDir, pagePath, matcher)
 	};
 }
 /**
+* Every error convention on the slot's active branch. Each catches errors in
+* its own segment, below that segment's layout.
+*/
+function findSlotErrorFields(slotDir, pagePath, matcher) {
+	const entries = findSlotSegmentFileEntries(slotDir, pagePath, "error", matcher);
+	return {
+		errorPaths: entries.map((entry) => entry.path),
+		errorTreePositions: entries.map((entry) => entry.treePosition)
+	};
+}
+/**
 * Every not-found convention on the slot's active branch, plus the nearest one,
 * which supplies the slot's not-found metadata.
 */
@@ -1347,6 +1360,7 @@ function discoverParallelSlots(dir, appDir, matcher, includeNestedOnlySlots = fa
 			loadingPaths: loadingEntries.map((loading) => loading.path),
 			loadingTreePositions: loadingEntries.map((loading) => loading.treePosition),
 			errorPath: findFile(slotDir, "error", matcher),
+			...findSlotErrorFields(slotDir, pagePath, matcher),
 			...findSlotNotFoundFields(slotDir, pagePath, matcher),
 			interceptingRoutes,
 			layoutIndex: -1,