vinext 1.4.1 → 1.4.2

package/README.md

@@ -687,7 +687,7 @@ Every `next/*` import is shimmed to a Vite-compatible implementation.
 | `next.config.js` / `.ts` / `.mjs`                | ✅  | Function configs, phase argument                                                                                                                                                                                                                         |
 | `rewrites` / `redirects` / `headers`             | ✅  | All phases, param interpolation. A source Next.js rejects fails config loading, as it fails the Next.js build: missing, not starting with `/`, over the 4,096-character built-regex limit, or rejected by path-to-regexp, such as a header glob `/api/*` |
 | Environment variables (`.env*`, `NEXT_PUBLIC_*`) | ✅  | Auto-loads Next.js-style dotenv files; only public vars are inlined                                                                                                                                                                                      |
-| `images` config                                  | 🟡  | Parsed but not used for optimization                                                                                                                                                                                                                     |
+| `images` config                                  | 🟡  | Parsed but not used for optimization; the production image endpoint enforces `localPatterns` (dev serves any local source)                                                                                                                               |
 | `experimental.optimizePackageImports`            | ✅  | Rewrites barrel imports to direct sub-module imports in RSC/SSR environments. A default set (lucide-react, date-fns, radix-ui, antd, MUI, and others) are always optimized. Add package names here to extend the list.                                   |
 | `vinext({ nextConfig })`                         | ✅  | Inline Next-style config from `vite.config.*`. Supports object-form and function-form config. When provided, this overrides root `next.config.*`.                                                                                                        |
 | `vinext({ react: { compiler: true } })`          | ✅  | React Compiler auto memoization. Needs `@vitejs/plugin-react` 6.1+ and the optional `oxc-transform-react` package.                                                                                                                                       |

package/dist/build/action-owner-manifest.js

@@ -26,6 +26,7 @@ function actionOwnerRouteEntryIds(route) {
 			slot.loadingPath,
 			...slot.loadingPaths ?? [],
 			slot.errorPath,
+			...slot.errorPaths ?? [],
 			slot.notFoundPath,
 			...slot.notFoundPaths ?? [],
 			...slot.interceptingRoutes.flatMap((intercept) => [

package/dist/check.js

@@ -197,7 +197,7 @@ const CONFIG_SUPPORT = {
 	env: { status: "supported" },
 	images: {
 		status: "partial",
-		detail: "remotePatterns, deviceSizes/imageSizes, qualities and SVG/CSP options honoured; resizing needs an optimizer via vinext({ images: { optimizer } }), images are served as-is otherwise; loader/loaderFile are ignored"
+		detail: "remotePatterns, deviceSizes/imageSizes, qualities, localPatterns (production only) and SVG/CSP options honoured; resizing needs an optimizer via vinext({ images: { optimizer } }), images are served as-is otherwise; loader/loaderFile are ignored"
 	},
 	allowedDevOrigins: {
 		status: "supported",

package/dist/config/config-matchers.js

@@ -719,7 +719,7 @@ function preserveRedirectDestinationQuery(destination, requestSearch, destinatio
 }
 const LOCATION_STRIPPED_RE = /^[\u0000- ]+|[\u0000- ]+$|[\t\n\r]/g;
 const LOCATION_UNSAFE_RE = /[\u0000-\u0008\u000A-\u001F\u007F]|[^\u0000-\u007F]/gu;
-const LONE_SURROGATE_RE = /[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g;
+const SURROGATE_RE = /[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDFFF]/g;
 /**
 * Percent-encode what a config-redirect `Location` header cannot carry.
 *
@@ -731,7 +731,7 @@ const LONE_SURROGATE_RE = /[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF
 * constructor throws the same way); vinext percent-encodes them instead.
 */
 function encodeRedirectLocation(location) {
-	return location.replace(LONE_SURROGATE_RE, "�").replace(LOCATION_UNSAFE_RE, encodeURIComponent);
+	return location.replace(SURROGATE_RE, (surrogate) => surrogate.length === 2 ? surrogate : "�").replace(LOCATION_UNSAFE_RE, encodeURIComponent);
 }
 function parseExternalRewriteUrl(externalUrl) {
 	try {

package/dist/config/destination-params.js

@@ -91,9 +91,12 @@ function substituteRewritePath(template, paramRe, params, absolute) {
 	const [path, hash] = substituted.split("#", 2);
 	const pathHash = hash === void 0 ? void 0 : hash ? `#${hash}` : "";
 	if (!absolute) return [path, pathHash];
-	return [path.replace(DOT_SEGMENT_RE, (segment, offset) => paramRanges.some(([start, end]) => start <= offset + segment.length && end >= offset) ? segment.replace(/\.|%(?=2e)/gi, (char) => char === "." ? "%252E" : "%25") : segment), pathHash];
+	return [path.replace(DOT_SEGMENT_RE, (_match, separator, segment, offset) => {
+		const start = offset + separator.length;
+		return paramRanges.some(([paramStart, end]) => paramStart <= start + segment.length && end >= start) ? separator + segment.replace(/\.|%(?=2e)/gi, (char) => char === "." ? "%252E" : "%25") : separator + segment;
+	}), pathHash];
 }
-const DOT_SEGMENT_RE = /(?<=^|[/\\])(?:\.|%2e){1,2}(?=[/\\]|$)/gi;
+const DOT_SEGMENT_RE = /(^|[/\\])((?:\.|%2e){1,2})(?=[/\\]|$)/gi;
 function encodePathQueryDelimiter(value) {
 	return value.replaceAll("?", "%3F");
 }

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

@@ -183,12 +183,27 @@ export type NextConfig = {
       search?: string;
     }>;
     domains?: string[];
+    /**
+     * Local sources the image optimization endpoint may serve. Statically
+     * imported images are allowed too, except under a basePath (the added
+     * pattern is unprefixed, as in Next.js). When unset, any local path
+     * without a query string is allowed (matches Next.js).
+     */
+    localPatterns?: Array<{
+      pathname?: string;
+      search?: string;
+    }>;
     unoptimized?: boolean;
     /** Allowed device widths for image optimization. Defaults to Next.js defaults: [640, 750, 828, 1080, 1200, 1920, 2048, 3840] */
     deviceSizes?: number[];
     /** Allowed image sizes for fixed-width images. Defaults to Next.js defaults: [32, 48, 64, 96, 128, 256, 384] */
     imageSizes?: number[];
-    /** Allowed image qualities. When unset, any quality from 1-100 is permitted (matches Next.js). */
+    /**
+     * Allowed image qualities. When set, the endpoint accepts only these and the
+     * default loader rounds `quality` to the closest entry, as in Next.js. When
+     * unset, any quality from 1-100 is permitted: a deliberate divergence from
+     * Next.js 16's `[75]` default that keeps Next.js 14/15 apps working.
+     */
     qualities?: number[];
     /** Allow SVG images through the image optimization endpoint. SVG can contain scripts, so only enable if you trust all image sources. */
     dangerouslyAllowSVG?: boolean;

package/dist/config/next-config.js

@@ -507,6 +507,35 @@ async function resolveBuildId(generate) {
 	return trimmed;
 }
 /**
+* Mirror Next.js's config resolution of `images.localPatterns`: statically
+* imported images (`/_next/static/media/**`) stay allowed whatever the app
+* lists, though like Next.js the pattern is unprefixed, so it never matches
+* under a basePath. An unset list stays unset; the image endpoint then applies the
+* Next.js default.
+*/
+function resolveImageLocalPatterns(localPatterns) {
+	if (localPatterns === void 0) return void 0;
+	if (!Array.isArray(localPatterns)) throw new Error(`Specified images.localPatterns should be an Array received ${localPatterns === null ? "null" : typeof localPatterns}.\nSee more info here: https://nextjs.org/docs/messages/invalid-images-config`);
+	if (localPatterns.length > 25) throw new Error("Specified images.localPatterns can have at most 25 entries.");
+	const patterns = Array.from(localPatterns, (pattern, index) => {
+		const entry = pattern;
+		let valid = typeof pattern === "object" && pattern !== null && !Array.isArray(pattern) && !(pattern instanceof Date) && !(pattern instanceof Map) && !(pattern instanceof Set) && !(typeof entry.then === "function" && typeof pattern.catch === "function") && (entry.pathname === void 0 || typeof entry.pathname === "string") && (entry.search === void 0 || typeof entry.search === "string");
+		if (valid) {
+			for (const key in pattern) if (key !== "pathname" && key !== "search") valid = false;
+		}
+		if (!valid) throw new Error(`Specified images.localPatterns[${index}] should be an object with optional string \`pathname\` and \`search\` fields.`);
+		const resolved = {};
+		if (entry.pathname !== void 0) resolved.pathname = entry.pathname;
+		if (entry.search !== void 0) resolved.search = entry.search;
+		return resolved;
+	});
+	if (!patterns.some((pattern) => pattern.pathname === "/_next/static/media/**" && pattern.search === "")) patterns.push({
+		pathname: "/_next/static/media/**",
+		search: ""
+	});
+	return patterns;
+}
+/**
 * Normalize the `assetPrefix` option from next.config.
 *
 * Accepts both absolute URLs (`https://cdn.example.com[/subpath]`) and
@@ -1094,7 +1123,8 @@ async function resolveNextConfig(config, root = toSlash(process.cwd()), options
 			port: pattern.port,
 			pathname: pattern.pathname,
 			search: pattern.search
-		} : { ...pattern })
+		} : { ...pattern }),
+		localPatterns: resolveImageLocalPatterns(config.images.localPatterns)
 	} : void 0;
 	const resolved = {
 		env: config.env ?? {},

package/dist/entries/app-rsc-entry.js

@@ -94,9 +94,10 @@ function appPageSegmentConfigPaths(route) {
 	];
 }
 /**
-* Patterns of the static App pages that answer a request whose raw pathname
-* reaches a dynamic sibling but whose segment-decoded pathname names them, so
-* `/%61` and `/caf%C3%A9` render `/a` and `/café` rather than `/[slug]`.
+* Patterns of the static App pages that may answer a request whose raw
+* pathname reaches a dynamic sibling but whose segment-decoded pathname names
+* them, so `/%61` and `/caf%C3%A9` can render `/a` and `/café` rather than
+* `/[slug]`.
 *
 * Next.js serves those requests from the response cached under the decoded
 * pathname, which exists only for a page it prerendered. The prerender listing
@@ -105,7 +106,10 @@ function appPageSegmentConfigPaths(route) {
 * runtime on any segment) and a Route Handler have no such entry, so the
 * dynamic sibling renders. So does a page whose sources can't be read here;
 * its sibling's render stays out of the shared caches. A cacheComponents
-* build lists every page route, as the prerender listing does.
+* build lists every page route, as the prerender listing does. Segment config
+* can't tell a page that reads request data, so the matcher renders the page
+* for another spelling (`/%61dmin`) only once the build recorded the decoded
+* pathname's prerender; the browser's own spelling needs none.
 */
 function buildAppDecodedPathnamePatterns(routes, config) {
 	const isPrerenderedPage = (route) => {
@@ -148,6 +152,10 @@ function buildAppRequestRouteMetadata(routes) {
 		slots: Object.fromEntries(route.parallelSlots.map((slot) => [slot.key, {
 			id: slot.id ?? null,
 			name: slot.name,
+			__loadPage: slot.pagePath ? true : null,
+			__loadDefault: slot.defaultPath ? true : null,
+			slotPatternParts: slot.slotPatternParts ?? null,
+			slotParamNames: slot.slotParamNames ?? null,
 			intercepts: slot.interceptingRoutes.map((intercept) => ({
 				id: intercept.id ?? null,
 				targetPattern: intercept.targetPattern,
@@ -244,6 +252,8 @@ import { dispatchAppRequestStage as __dispatchAppRequestStage } from ${JSON.stri
 import { registerConfiguredCacheAdapters as __registerConfiguredCacheAdapters } from "virtual:vinext-cdn-cache-adapter";
 import { clearAppRequestStageContext as __clearRequestContext, setAppRequestStageNavigationContext as setNavigationContext } from ${JSON.stringify(appRequestStageContextPath)};
 import { matchRoutePattern as __matchRoutePattern } from ${JSON.stringify(routePatternPath)};
+import { initPregeneratedPathsFromGlobals as __initPregeneratedPathsFromGlobals } from ${JSON.stringify(pregeneratedConcretePathsPath)};
+import "virtual:vinext-pregenerated-concrete-paths";
 import __pagesClientAssets from "virtual:vinext-pages-client-assets";
 ${middlewarePath ? `import { applyAppMiddleware as __applyAppMiddleware } from ${JSON.stringify(appMiddlewarePath)};` : ""}
 ${instrumentationPath ? `import * as _instrumentation from ${JSON.stringify(toSlash(instrumentationPath))};
@@ -278,12 +288,16 @@ export { __basePath };
 export const __imageAllowedWidths = ${JSON.stringify([...config?.imageConfig?.deviceSizes ?? DEFAULT_DEVICE_SIZES, ...config?.imageConfig?.imageSizes ?? DEFAULT_IMAGE_SIZES])};
 export const __imageConfig = ${JSON.stringify({
 		qualities: config?.imageConfig?.qualities,
+		localPatterns: config?.imageConfig?.localPatterns,
 		dangerouslyAllowSVG: config?.imageConfig?.dangerouslyAllowSVG,
 		dangerouslyAllowLocalIP: config?.imageConfig?.dangerouslyAllowLocalIP,
 		contentDispositionType: config?.imageConfig?.contentDispositionType,
 		contentSecurityPolicy: config?.imageConfig?.contentSecurityPolicy
 	})};
 export const __clientBuildFiles = __pagesClientAssets.clientBuildFiles ?? [];
+// The matcher reads recorded prerenders, and this stage can run without the
+// response entry that also loads them.
+__initPregeneratedPathsFromGlobals();
 const __routes = ${JSON.stringify(requestRoutes)};
 const __routeMatcher = __createAppRscRouteMatcher(__routes, ${JSON.stringify(buildAppDecodedPathnamePatterns(routes, config))});
 const __metadataRouteMatchers = ${JSON.stringify(metadataRouteMatchers)};
@@ -354,17 +368,21 @@ const __requestHandler = createAppRscRequestHandler({
     const intercept = __routeMatcher.findIntercept(pathname, sourcePathname, interceptionId);
     if (!intercept) return null;
     const route = __routes[intercept.sourceRouteIndex];
-    if (!route) return null;
-    const params = Object.create(null);
-    for (const name of route.params) {
-      if (Object.prototype.hasOwnProperty.call(intercept.sourceMatchedParams, name)) {
-        params[name] = intercept.sourceMatchedParams[name];
+    const authorizationRoute = __routes[intercept.authorizationSourceRouteIndex];
+    if (!route || !authorizationRoute) return null;
+    const pickParams = (targetRoute, source) => {
+      const params = Object.create(null);
+      for (const name of targetRoute.params) {
+        if (Object.prototype.hasOwnProperty.call(source, name)) params[name] = source[name];
       }
-    }
+      return params;
+    };
     return {
+      authorizationParams: pickParams(authorizationRoute, intercept.authorizationSourceParams),
+      authorizationRoute,
       interceptionSourceIsConcrete: intercept.sourceRouteIsConcrete,
       route,
-      params,
+      params: pickParams(route, intercept.sourceMatchedParams),
     };
   },
   ${middlewarePath ? `runMiddleware({ cleanPathname, context, externalRewriteRequest, hadBasePath, isDataRequest, middlewareRequest, request, validateExternalRewriteRequest }) {
@@ -482,6 +500,7 @@ function generateRscEntry(appDir, routes, middlewarePath, metadataRoutes, global
 	const imageAllowedWidths = [...config?.imageConfig?.deviceSizes ?? DEFAULT_DEVICE_SIZES, ...config?.imageConfig?.imageSizes ?? DEFAULT_IMAGE_SIZES];
 	const imageConfig = {
 		qualities: config?.imageConfig?.qualities,
+		localPatterns: config?.imageConfig?.localPatterns,
 		dangerouslyAllowSVG: config?.imageConfig?.dangerouslyAllowSVG,
 		dangerouslyAllowLocalIP: config?.imageConfig?.dangerouslyAllowLocalIP,
 		contentDispositionType: config?.imageConfig?.contentDispositionType,
@@ -1635,17 +1654,21 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
     const intercept = findIntercept(pathname, sourcePathname, interceptionId);
     if (!intercept) return null;
     const route = routes[intercept.sourceRouteIndex];
-    if (!route) return null;
-    const params = Object.create(null);
-    for (const name of route.params) {
-      if (Object.prototype.hasOwnProperty.call(intercept.sourceMatchedParams, name)) {
-        params[name] = intercept.sourceMatchedParams[name];
+    const authorizationRoute = routes[intercept.authorizationSourceRouteIndex];
+    if (!route || !authorizationRoute) return null;
+    const pickParams = (targetRoute, source) => {
+      const params = Object.create(null);
+      for (const name of targetRoute.params) {
+        if (Object.prototype.hasOwnProperty.call(source, name)) params[name] = source[name];
       }
-    }
+      return params;
+    };
     return {
+      authorizationParams: pickParams(authorizationRoute, intercept.authorizationSourceParams),
+      authorizationRoute,
       interceptionSourceIsConcrete: intercept.sourceRouteIsConcrete,
       route,
-      params,
+      params: pickParams(route, intercept.sourceMatchedParams),
     };
   },
   ${middlewarePath ? `runMiddleware({ cleanPathname, context, externalRewriteRequest, hadBasePath, isDataRequest, middlewareRequest, request, validateExternalRewriteRequest }) {

package/dist/entries/app-rsc-manifest.js

@@ -108,6 +108,7 @@ function registerRouteModules(routes, imports) {
 			if (slot.loadingPath) imports.getLazyLoaderVar(slot.loadingPath);
 			for (const loadingPath of slot.loadingPaths ?? []) imports.getLazyLoaderVar(loadingPath);
 			if (slot.errorPath) imports.getLazyLoaderVar(slot.errorPath);
+			for (const errorPath of slot.errorPaths ?? []) imports.getLazyLoaderVar(errorPath);
 			if (slot.notFoundPath) imports.getLazyLoaderVar(slot.notFoundPath);
 			for (const notFoundPath of slot.notFoundPaths ?? []) imports.getLazyLoaderVar(notFoundPath);
 			for (const ir of slot.interceptingRoutes) {
@@ -240,6 +241,9 @@ function buildRouteEntries(routes, imports) {
         loadingTreePositions: ${JSON.stringify(slot.loadingTreePositions ?? [])},
         error: null,
         __loadError: ${slot.errorPath ? imports.getLazyLoaderVar(slot.errorPath) : "null"},
+        errors: ${moduleArray(slot.errorPaths?.length ?? 0)},
+        __loadErrors: ${lazyLoaderArray(slot.errorPaths ?? [], imports)},
+        errorTreePositions: ${JSON.stringify(slot.errorTreePositions ?? [])},
         notFound: null,
         __loadNotFound: ${slot.notFoundPath ? imports.getLazyLoaderVar(slot.notFoundPath) : "null"},
         notFoundTreePosition: ${slot.notFoundTreePosition ?? "null"},

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

@@ -104,6 +104,7 @@ 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,
@@ -281,6 +282,7 @@ 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,

package/dist/index.js

@@ -14,7 +14,7 @@ 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";
@@ -89,6 +89,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";
@@ -1466,6 +1467,7 @@ function vinext(options = {}) {
 		}),
 		dataUrlCssPlugin(),
 		createCssModuleImportCompatibilityPlugin(),
+		createCssTargetPlugin(),
 		createDevServerLifecyclePlugin({}, (config) => config[VINEXT_DEV_CLI_LIFECYCLE] === true),
 		{
 			name: "vinext:config",
@@ -1764,12 +1766,6 @@ function vinext(options = {}) {
 					} } : {},
 					build: {
 						ssrEmitAssets: true,
-						cssTarget: [
-							"chrome111",
-							"edge111",
-							"firefox114",
-							"safari15"
-						],
 						assetsDir: clientAssetsDir,
 						...!isSSR && !hasClientBuildEnvironment ? { assetsInlineLimit: clientAssetsInlineLimit } : {},
 						...withBuildBundlerOptions({
@@ -2453,6 +2449,7 @@ 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,
@@ -3378,14 +3375,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 +3395,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 +3412,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("?")) : "";
@@ -3482,7 +3482,9 @@ 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
@@ -3628,7 +3630,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);

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/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,