vinext 1.4.0 → 1.4.2

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

@@ -21,6 +21,7 @@ const _pagesI18nPath = resolveEntryPath("../server/pages-i18n.js", import.meta.u
 const _pagesDataRoutePath = resolveEntryPath("../server/pages-data-route.js", import.meta.url);
 const _pagesDefault404Path = resolveEntryPath("../server/pages-default-404.js", import.meta.url);
 const _pagesApiRoutePath = resolveEntryPath("../server/pages-api-route.js", import.meta.url);
+const _requestErrorLogPath = resolveEntryPath("../server/request-error-log.js", import.meta.url);
 const _serverGlobalsPath = resolveEntryPath("../server/server-globals.js", import.meta.url);
 const _queryUtilsPath = resolveEntryPath("../utils/query.js", import.meta.url);
 const _pagesPageHandlerPath = resolveEntryPath("../server/pages-page-handler.js", import.meta.url);
@@ -103,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,
@@ -280,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,
@@ -370,6 +373,7 @@ import { buildRouteTrie as _buildRouteTrie, trieMatch as _trieMatch } from ${JSO
 import { reportRequestError as _reportRequestError } from "vinext/instrumentation";
 import { resolvePagesI18nRequest } from ${JSON.stringify(_pagesI18nPath)};
 import { handlePagesApiRoute as __handlePagesApiRoute } from ${JSON.stringify(_pagesApiRoutePath)};
+import { logRequestError as __logRequestError } from ${JSON.stringify(_requestErrorLogPath)};
 import { normalizePagesDataRequest as __normalizePagesDataRequest, shouldAddTrailingSlashToPagesDataPath as __shouldAddTrailingSlashToPagesDataPath, buildNextDataNotFoundResponse as __buildNextDataNotFoundResponse } from ${JSON.stringify(_pagesDataRoutePath)};
 import { buildDefaultPagesNotFoundResponse as __buildDefaultPagesNotFoundResponse } from ${JSON.stringify(_pagesDefault404Path)};
 import { createPagesPageHandler as __createPagesPageHandler } from ${JSON.stringify(_pagesPageHandlerPath)};
@@ -618,7 +622,7 @@ export async function handleApiRoute(request, url, ctx, trustedRevalidateOrigin,
     trustedRevalidateOrigin,
     url,
     reportRequestError(error, routePattern) {
-      console.error("[vinext] API error:", error);
+      __logRequestError("[vinext] API error:", error);
       return _reportRequestError(
         error,
         { path: url, method: request.method, headers: Object.fromEntries(request.headers.entries()) },

package/dist/index.js

@@ -11,9 +11,10 @@ import { getReactUpgradeDeps, reactUpgradeRequiredMessage } from "./utils/react-
 import { resolvePluginReactPath } from "./utils/plugin-react-version.js";
 import { loadDotenv } from "./config/dotenv.js";
 import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from "./shims/constants.js";
+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";
@@ -88,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";
@@ -1373,6 +1375,29 @@ function vinext(options = {}) {
 	});
 	const plugins = [
 		buildLifecyclePlugins[0],
+		{
+			name: "vinext:dev-origin-check",
+			apply: "serve",
+			enforce: "pre",
+			configureServer(server) {
+				server.middlewares.use((req, res, next) => {
+					const blockReason = validateDevRequest({
+						origin: req.headers.origin,
+						host: req.headers.host,
+						"x-forwarded-host": req.headers["x-forwarded-host"],
+						"sec-fetch-site": req.headers["sec-fetch-site"],
+						"sec-fetch-mode": req.headers["sec-fetch-mode"]
+					}, nextConfig?.allowedDevOrigins);
+					if (blockReason) {
+						console.warn(`[vinext] Blocked dev request: ${blockReason} (${req.url})`);
+						res.writeHead(403, { "Content-Type": "text/plain" });
+						res.end("Forbidden");
+						return;
+					}
+					next();
+				});
+			}
+		},
 		createStyledJsxPlugin(earlyBaseDir),
 		mdxProxyPlugin,
 		reactPluginPromise,
@@ -1442,6 +1467,7 @@ function vinext(options = {}) {
 		}),
 		dataUrlCssPlugin(),
 		createCssModuleImportCompatibilityPlugin(),
+		createCssTargetPlugin(),
 		createDevServerLifecyclePlugin({}, (config) => config[VINEXT_DEV_CLI_LIFECYCLE] === true),
 		{
 			name: "vinext:config",
@@ -1595,6 +1621,7 @@ function vinext(options = {}) {
 				defines["process.env.__VINEXT_TRAILING_SLASH"] = JSON.stringify(nextConfig.trailingSlash ? "true" : "false");
 				defines["process.env.__VINEXT_MANUAL_TRAILING_SLASH"] = JSON.stringify(nextConfig.skipTrailingSlashRedirect ? "true" : "false");
 				defines["process.env.__NEXT_CONFIG_OUTPUT"] = JSON.stringify(nextConfig.output ?? "");
+				defines["process.env.__VINEXT_CACHE_LIFE_PROFILES"] = JSON.stringify(serializeCacheLifeProfiles(nextConfig.cacheLife));
 				defines["process.env.__VINEXT_IMAGE_REMOTE_PATTERNS"] = JSON.stringify(JSON.stringify(nextConfig.images?.remotePatterns ?? []));
 				defines["process.env.__VINEXT_IMAGE_DOMAINS"] = JSON.stringify(JSON.stringify(nextConfig.images?.domains ?? []));
 				{
@@ -1739,12 +1766,6 @@ function vinext(options = {}) {
 					} } : {},
 					build: {
 						ssrEmitAssets: true,
-						cssTarget: [
-							"chrome111",
-							"edge111",
-							"firefox114",
-							"safari15"
-						],
 						assetsDir: clientAssetsDir,
 						...!isSSR && !hasClientBuildEnvironment ? { assetsInlineLimit: clientAssetsInlineLimit } : {},
 						...withBuildBundlerOptions({
@@ -2428,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,
@@ -3147,22 +3169,6 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					}
 					return isExistingDevPublicFile(pathname);
 				};
-				server.middlewares.use((req, res, next) => {
-					const blockReason = validateDevRequest({
-						origin: req.headers.origin,
-						host: req.headers.host,
-						"x-forwarded-host": req.headers["x-forwarded-host"],
-						"sec-fetch-site": req.headers["sec-fetch-site"],
-						"sec-fetch-mode": req.headers["sec-fetch-mode"]
-					}, nextConfig?.allowedDevOrigins);
-					if (blockReason) {
-						console.warn(`[vinext] Blocked dev request: ${blockReason} (${req.url})`);
-						res.writeHead(403, { "Content-Type": "text/plain" });
-						res.end("Forbidden");
-						return;
-					}
-					next();
-				});
 				server.middlewares.use((req, res, next) => {
 					if (!sendRepeatedSlashRedirect(req.url ?? "/", res)) next();
 				});
@@ -3253,7 +3259,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					if (hasAppDir) server.middlewares.use((req, res, next) => {
 						const url = req.url ?? "/";
 						const [pathname] = url.split("?");
-						if (url.startsWith("/@") || url.startsWith("/__vite") || url.startsWith("/node_modules") || url.includes(".") && !pathname.endsWith(".html") && !pathname.endsWith(".rsc")) return next();
+						if (url.startsWith("/@") || url.startsWith("/__vite") || url.startsWith("/node_modules") || url.includes(".") && !pathname.endsWith(".html")) return next();
 						const _reqStart = now();
 						const _reqWallStart = Date.now();
 						let _compileMs;
@@ -3287,12 +3293,11 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 							return _origWriteHead(statusCode, ...args);
 						};
 						res.on("finish", () => {
-							const logUrl = url.replace(/\.rsc(\?|$)/, "$1");
 							const totalMs = now() - _reqStart;
 							const resolvedRenderMs = _renderMs !== void 0 ? _renderMs : _compileMs !== void 0 ? Math.max(0, Math.round(totalMs - _compileMs)) : void 0;
 							logRequest({
 								method: req.method ?? "GET",
-								url: logUrl,
+								url,
 								status: res.statusCode,
 								totalMs,
 								compileMs: _compileMs,
@@ -3370,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;
 								}
@@ -3387,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);
@@ -3404,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("?")) : "";
@@ -3468,11 +3476,15 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								removeForwardedMiddlewareContext(req);
 								for (const key of Object.keys(req.headers)) delete req.headers[key];
 								for (const [key, value] of nextRequestHeaders) req.headers[key] = value;
+								const setCookies = nextRequestHeaders.getSetCookie();
+								if (setCookies.length > 1) req.headers["set-cookie"] = setCookies;
 							};
 							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
@@ -3618,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);
@@ -3662,7 +3675,6 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 						const url = req.url ?? "/";
 						if (!hasPagesDir) return next();
 						if (url.startsWith("/@") || url.startsWith("/__vite") || url.startsWith("/node_modules")) return next();
-						if (url.split("?")[0].endsWith(".rsc")) return next();
 						if (hasCloudflarePlugin) return next();
 						await pagesInstrumentationReady;
 						const traceHeaders = new Headers();

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/plugins/strip-server-exports.js

@@ -89,7 +89,8 @@ function isReferenceIdentifier(node, parent) {
 	if (parent.type === "ImportSpecifier" || parent.type === "ImportDefaultSpecifier" || parent.type === "ImportNamespaceSpecifier") return false;
 	if (parent.type === "ExportSpecifier") return false;
 	if (parent.type === "MemberExpression" && parent.property === node && !parent.computed) return false;
-	if ((parent.type === "Property" || parent.type === "MethodDefinition") && parent.key === node && !parent.computed && !(parent.type === "Property" && parent.shorthand)) return false;
+	if ((parent.type === "Property" || parent.type === "MethodDefinition" || parent.type === "PropertyDefinition" || parent.type === "AccessorProperty" || parent.type === "ImportAttribute") && parent.key === node && !parent.computed && !(parent.type === "Property" && parent.shorthand)) return false;
+	if (parent.type === "MetaProperty") return false;
 	if ((parent.type === "LabeledStatement" || parent.type === "BreakStatement" || parent.type === "ContinueStatement") && parent.label === node) return false;
 	const parameters = "params" in parent ? parent.params : void 0;
 	if (Array.isArray(parameters) && parameters.includes(node)) return false;

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,

package/dist/server/api-handler.d.ts

@@ -14,5 +14,7 @@ export declare function handleApiRoute(runner: ModuleImporter, req: IncomingMess
   allowedRevalidateHeaderKeys?: readonly string[];
   trailingSlash?: boolean;
   skipTrailingSlashRedirect?: boolean;
+  /** Edge API request pathname, with any basePath the dev server stripped restored. */
+  requestPathname?: string;
 }): Promise<boolean>;
 //#endregion

package/dist/server/api-handler.js

@@ -1,9 +1,9 @@
-import { hasBasePath } from "../utils/base-path.js";
 import { matchRoute } from "../routing/pages-router.js";
 import "./server-globals.js";
 import { resolveRequestHost, resolveRequestProtocol } from "./proxy-trust.js";
 import { NextRequest } from "../shims/server.js";
 import { importModule, reportRequestError } from "./instrumentation.js";
+import { logRequestError } from "./request-error-log.js";
 import { mergeRouteParamsIntoQuery, parseQueryString, urlQueryToSearchParams } from "../utils/query.js";
 import { tracePagesApiHandler } from "./pages-execution-tracing.js";
 import { DEFAULT_PAGES_API_BODY_SIZE_LIMIT, resolveBodyParserConfig } from "./pages-body-parser-config.js";
@@ -93,7 +93,7 @@ function readEdgeRequestBody(req) {
 		req.on("error", (error) => controller.error(error));
 	} });
 }
-function createEdgeApiRequest(req, res, url, params, nextConfig) {
+function createEdgeApiRequest(req, res, url, params, requestPathname) {
 	const headers = new Headers();
 	for (const [name, value] of Object.entries(req.headers)) {
 		if (name.startsWith(":")) continue;
@@ -103,8 +103,7 @@ function createEdgeApiRequest(req, res, url, params, nextConfig) {
 	const proto = resolveRequestProtocol(req);
 	const host = resolveRequestHost(req, "localhost");
 	const requestUrl = new URL(req.url ?? url, `${proto}://${host}`);
-	const basePath = nextConfig?.basePath;
-	if (basePath && !hasBasePath(requestUrl.pathname, basePath)) requestUrl.pathname = `${basePath}${requestUrl.pathname}`;
+	if (requestPathname !== void 0) requestUrl.pathname = requestPathname;
 	const query = mergeRouteParamsIntoQuery(parseQueryString(url), params);
 	requestUrl.search = urlQueryToSearchParams(query).toString();
 	const signal = signalFromNodeResponse(res);
@@ -249,7 +248,7 @@ async function handleApiRoute(runner, req, res, url, apiRoutes, nextConfig) {
 	try {
 		const apiModule = await importModule(runner, route.filePath);
 		if (isEdgeApiRouteModule(apiModule)) {
-			const nextRequest = new NextRequest(createEdgeApiRequest(req, res, url, params, nextConfig), nextConfig ? { nextConfig: {
+			const nextRequest = new NextRequest(createEdgeApiRequest(req, res, url, params, nextConfig?.requestPathname), nextConfig ? { nextConfig: {
 				basePath: nextConfig.basePath,
 				i18n: nextConfig.i18n ?? void 0,
 				trailingSlash: nextConfig.trailingSlash,
@@ -287,7 +286,7 @@ async function handleApiRoute(runner, req, res, url, apiRoutes, nextConfig) {
 			res.end(e.message);
 			return true;
 		}
-		console.error(e);
+		logRequestError(e);
 		await reportRequestError(e, {
 			path: url,
 			method: req.method ?? "GET",

package/dist/server/app-action-forwarding.js

@@ -6,6 +6,7 @@ import { RequestCookies, ResponseCookies } from "../shims/server.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { getSetCookieName } from "./cookie-utils.js";
 import "../shims/internal/cookies.js";
+import { isStreamedActionRedirectResponse, markStreamedActionRedirectResponse } from "./app-rsc-response-finalizer.js";
 import { createServerActionNotFoundResponse, getServerActionNotFoundMessage } from "./server-action-not-found.js";
 //#region src/server/app-action-forwarding.ts
 const ACTION_FORWARD_FORBIDDEN_HEADERS = /* @__PURE__ */ new Set([
@@ -71,11 +72,12 @@ function filterActionForwardResponse(response, sourceMiddlewareHeaders, sourceMi
 	for (const [key, value] of response.headers) if (!ACTION_FORWARD_FORBIDDEN_HEADERS.has(key.toLowerCase())) headers.set(key, value);
 	for (const setCookie of response.headers.getSetCookie()) headers.append("set-cookie", setCookie);
 	const preserveResponseStatus = response.headers.get("x-nextjs-action-not-found") === "1" || response.headers.has("x-action-redirect");
-	return new Response(response.body, {
+	const forwardedResponse = new Response(response.body, {
 		headers,
 		status: preserveResponseStatus ? response.status : sourceMiddlewareStatus ?? response.status,
 		statusText: response.statusText
 	});
+	return isStreamedActionRedirectResponse(response) ? markStreamedActionRedirectResponse(forwardedResponse) : forwardedResponse;
 }
 function emptyActionForwardResponse(middlewareContext) {
 	const headers = new Headers(middlewareContext.headers ?? void 0);