vinext 1.0.1 → 1.2.0

package/dist/index.js

@@ -14,8 +14,8 @@ import { matchesRewriteSource, proxyExternalRequest } from "./config/config-matc
 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";
-import { VINEXT_NEXT_CONFIG_PLUGIN_PROPERTY, createRscCompatibilityId, findNextConfigPath, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "./config/next-config.js";
-import { normalizePathnameForRouteMatchStrict } from "./routing/utils.js";
+import { VINEXT_NEXT_CONFIG_PLUGIN_PROPERTY, createRscCompatibilityId, findNextConfigPath, lightningCssFeatureNamesToMask, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "./config/next-config.js";
+import { normalizePathnameForRouteMatch, normalizePathnameForRouteMatchStrict } from "./routing/utils.js";
 import { hasBasePath, stripBasePath } from "./utils/base-path.js";
 import { appRouteGraph, appRouter, invalidateAppRouteCache, matchAppRoute } from "./routing/app-router.js";
 import { generateRouteTypes } from "./typegen.js";
@@ -25,24 +25,25 @@ import { INTERNAL_HEADERS, NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_INTERNAL_HEADERS,
 import { normalizePath as normalizePath$1 } from "./server/normalize-path.js";
 import { validateMiddlewareMatcherPatterns } from "./server/middleware-matcher-pattern.js";
 import { methodNotAllowedResponse, notFoundStaticAssetResponse } from "./server/http-error-responses.js";
-import { isOpenRedirectShaped } from "./server/open-redirect.js";
+import { isOpenRedirectShaped, sendRepeatedSlashRedirect } from "./server/open-redirect.js";
 import { canonicalizeRequestUrlPathname, filterInternalHeaders, normalizeTrailingSlash } from "./server/request-pipeline.js";
 import { resolvePagesI18nRequest, stripI18nLocaleForApiRoute } 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";
 import { extractMiddlewareMatcherConfig, extractMiddlewareMatcherConfigValue, hasExportedName } from "./build/report.js";
 import { generatePagesRequestEntry, generatePagesResponseEntry, generateServerEntry } from "./entries/pages-server-entry.js";
 import { compileClientMiddlewareMatchers, generateClientEntry } from "./entries/pages-client-entry.js";
+import { isPathInside, isPathInsideOrEqual, stripJsExtension, stripViteModuleQuery } from "./utils/path.js";
 import { logRequest, now } from "./server/request-log.js";
-import { encodeUrlParserIgnoredCharacters, isNextDataPathname, normalizeNextDataPagePathname, parseNextDataPathname, shouldAddTrailingSlashToPagesDataPath, urlParserCreatesPagesDataPath } from "./server/pages-data-route.js";
 import { getPagesPreviewModeId } from "./server/pages-preview.js";
 import { createSSRHandler } from "./server/dev-server.js";
+import { signalFromNodeResponse } from "./server/node-response-signal.js";
 import { handleApiRoute } from "./server/api-handler.js";
 import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, isImageOptimizationPath, resolveDevImageRedirect } from "./server/image-optimization.js";
 import { CACHEABILITY_MANIFEST_MODULE, CACHEABILITY_REQUEST_PROJECTION_MODULE } from "./server/cacheability-manifest.js";
 import { PREGENERATED_CONCRETE_PATHS_MODULE } from "./server/pregenerated-concrete-paths.js";
 import { installSocketErrorBackstop } from "./server/socket-error-backstop.js";
-import { isPathInside, isPathInsideOrEqual, stripJsExtension, stripViteModuleQuery } from "./utils/path.js";
 import { invalidateMetadataFileCache, scanMetadataFiles } from "./server/metadata-routes.js";
 import { shouldInvalidateAppRouteFile } from "./server/dev-route-files.js";
 import { createDirectRunner } from "./server/dev-module-runner.js";
@@ -55,16 +56,19 @@ import { VIRTUAL_IMAGE_ADAPTERS, generateImageAdaptersModule } from "./image/ima
 import { generateBrowserEntry, toLinkPrefetchRoutes } from "./entries/app-browser-entry.js";
 import { collectRouteClassificationManifest } from "./build/route-classification-manifest.js";
 import { planRouteClassificationInjection } from "./build/route-classification-injector.js";
+import { createRscScanGlobImportsPlugin, isRscScanGlobImportsAffected } from "./plugins/rsc-scan-glob-imports.js";
 import { findOpenTelemetryPackages, mergeServerExternalPackages } from "./config/server-external-packages.js";
 import { precompressAssets } from "./build/precompress.js";
 import { VINEXT_PRERENDER_CONFIG_PLUGIN_PROPERTY, VINEXT_ROUTE_ROOT_CONFIG_PLUGIN_PROPERTY, normalizeVinextPrerenderConfig } from "./config/prerender.js";
-import { PAGES_CLIENT_ASSETS_MODULE, buildPagesClientAssetsModule, writePagesClientAssetsModuleIfMissing } from "./build/pages-client-assets-module.js";
+import { VINEXT_CLIENT_ENTRY_MANIFEST } from "./utils/client-entry-manifest.js";
+import { PAGES_CLIENT_ASSETS_MODULE, buildPagesClientAssetsModule, collectClientBuildFiles, writePagesClientAssetsModuleIfMissing } from "./build/pages-client-assets-module.js";
 import { createPreviewBuildCredentials, getPreviewBuildCredentials } from "./build/preview-credentials.js";
 import { VINEXT_BUILD_LIFECYCLE_CONFIG, createBuildLifecyclePlugins } from "./build/lifecycle.js";
 import { ensureAssetsIgnore } from "./build/assets-ignore.js";
 import { emitNextClientRuntimeManifests } from "./build/next-client-runtime-manifests.js";
 import { collectInlineCssManifest, injectInlineCssManifestGlobal } from "./build/inline-css.js";
 import { readTrustedRevalidationHostname } from "./server/revalidation-host.js";
+import { sealForwardedMiddlewareContext } from "./server/forwarded-middleware-context.js";
 import { installDevStackSourcemapMiddleware } from "./server/dev-stack-sourcemap.js";
 import { traceFrameworkRequest } from "./server/request-tracing.js";
 import { runPagesRequest } from "./server/pages-request-pipeline.js";
@@ -83,8 +87,8 @@ import { createScanBuildCssPlugin } from "./plugins/scan-build-css.js";
 import { createInstrumentationClientTransformPlugin, createInstrumentationServerTransformPlugin } from "./plugins/instrumentation-client.js";
 import { createStyledJsxPlugin } from "./plugins/styled-jsx.js";
 import { INSTRUMENTATION_CLIENT_EMPTY_MODULE, generateInstrumentationClientInjectModule } from "./client/instrumentation-client-inject.js";
-import { createMiddlewareServerOnlyPlugin } from "./plugins/middleware-server-only.js";
 import { isServerEnvironment } from "./plugins/environment.js";
+import { createMiddlewareServerOnlyPlugin } from "./plugins/middleware-server-only.js";
 import { createPagesNodeExternalsPlugin } from "./plugins/pages-node-externals.js";
 import { validateMiddlewareModuleExports } from "./plugins/middleware-export-validation.js";
 import { createOptimizeImportsPlugin } from "./plugins/optimize-imports.js";
@@ -94,31 +98,35 @@ import { createTransformCache } from "./plugins/transform-cache.js";
 import { createOgHarfbuzzPlugin } from "./plugins/og-harfbuzz.js";
 import { createOgAssetsPlugin, createOgInlineFetchAssetsPlugin } from "./plugins/og-assets.js";
 import { createUseCacheCallablePlugin } from "./plugins/use-cache-callable.js";
+import { cacheFlightCodecPlugin } from "./plugins/cache-flight-codec.js";
 import { SSR_EXTERNAL_REACT_ENTRIES, VINEXT_OPTIMIZE_DEPS_EXCLUDE, mergeOptimizeDepsExclude } from "./plugins/rsc-client-shim-excludes.js";
 import { createServerExternalsManifestPlugin } from "./plugins/server-externals-manifest.js";
 import { createTransitiveExternalsPlugin } from "./plugins/transitive-externals.js";
 import public_shim_map_default from "./shims/public-shim-map.json.js";
-import { VINEXT_CLIENT_ENTRY_MANIFEST } from "./utils/client-entry-manifest.js";
 import { computeClientRuntimeMetadata } from "./utils/client-runtime-metadata.js";
 import { readPrerenderSecret, readServerRuntimeOutputDirs } from "./build/server-manifest.js";
 import { createModuleDependencyCache } from "./build/module-dependency-cache.js";
 import { markCssUrlAssetReferences, restoreDedupedCssAssetReferences } from "./build/css-url-assets.js";
 import { buildSassPreprocessorOptions, createSassAwareFileSystemLoader, createSassCssUrlAssetImporter, createSassTildeImporter, createSassTsconfigPathImporters } from "./plugins/sass.js";
-import { createClientAssetFileNames, createClientCodeSplittingConfig, createClientFileNameConfig, createClientManualChunks, createMultiStageChunkFileNames, createMultiStageCodeSplittingConfig, createRscFrameworkChunkOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfig, withBuildBundlerOptions } from "./build/client-build-config.js";
+import { assertClientOutDirIsSeparate, createClientAssetFileNames, createClientCodeSplittingConfig, createClientFileNameConfig, createClientManualChunks, createMultiStageChunkFileNames, createMultiStageCodeSplittingConfig, createRscFrameworkChunkOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfig, withBuildBundlerOptions } from "./build/client-build-config.js";
 import { EXPORT_ALL_CANDIDATE_FILTER, hasExportAllCandidate, stripServerExports, validatePageExports } from "./plugins/strip-server-exports.js";
 import { removeConsoleCalls } from "./plugins/remove-console.js";
 import { createImportMetaUrlPlugin } from "./plugins/import-meta-url.js";
 import { createWorkerImageImportsPlugin } from "./plugins/worker-image-imports.js";
+import { SERVER_ONLY_SPECIFIER_RE, createWorkerServerOnlyImportsPlugin } from "./plugins/worker-server-only-imports.js";
+import { createWorkerUseServerPlugins } from "./plugins/worker-use-server.js";
 import { createRequireContextPlugin } from "./plugins/require-context.js";
+import { commonJsEsmFacadeOptimizeDepsPlugin, stripEsmCommonJsExportFacade } from "./plugins/commonjs-esm-facade.js";
 import { COMMONJS_SYNTAX_CODE_FILTER } from "./plugins/commonjs-syntax.js";
 import { createRequireConditionResolutionPlugin, isConditionalRequireScriptModuleId } from "./plugins/require-condition-resolution.js";
 import { createExtensionlessDynamicImportPlugin } from "./plugins/extensionless-dynamic-import.js";
 import { createWasmModuleImportPlugin } from "./plugins/wasm-module-import.js";
 import { consumerEnvironmentConditionFilter, getTypeofWindowReplacement, mayFoldChangeScannedImports, replaceConsumerEnvironmentConditions } from "./plugins/typeof-window.js";
-import { hasMdxFiles } from "./utils/mdx-scan.js";
-import { publicFilePathVariants } from "./utils/public-file-path.js";
+import { hasMdxFiles, loadMdxEsmReader, pageExtensionsIncludeMdx } from "./utils/mdx-scan.js";
+import { publicFileRouteKey } from "./utils/public-file-path.js";
 import { scanPublicFileRoutes } from "./utils/public-routes.js";
 import { createIgnoreDynamicRequestsPlugin } from "./plugins/ignore-dynamic-requests.js";
+import { assertPluginRscVersion } from "./utils/plugin-rsc-version.js";
 import { assertSupportedViteVersion, getDepOptimizeNodeEnvOptions, serializeViteDefine } from "./utils/vite-version.js";
 import { staticExportApp, staticExportPages } from "./build/static-export.js";
 import { createRequire } from "node:module";
@@ -153,6 +161,17 @@ const RSC_ENVIRONMENTS = /* @__PURE__ */ new Set([
 	"client"
 ]);
 const VINEXT_GENERATED_DIR_RE = /(?:^|[/\\])\.vinext(?:[/\\]|$)/;
+function removeForwardedMiddlewareContext(req) {
+	delete req.headers[VINEXT_MW_CTX_HEADER];
+	const rawHeaders = req.rawHeaders;
+	for (let i = rawHeaders.length - 2; i >= 0; i -= 2) if (rawHeaders[i].toLowerCase() === "x-vinext-mw-ctx") rawHeaders.splice(i, 2);
+}
+function setForwardedMiddlewareContext(req, key, context) {
+	removeForwardedMiddlewareContext(req);
+	const value = sealForwardedMiddlewareContext(key, context);
+	req.headers[VINEXT_MW_CTX_HEADER] = value;
+	req.rawHeaders.push(VINEXT_MW_CTX_HEADER, value);
+}
 function scopeRscPlugin(plugin) {
 	const applyToEnvironment = plugin.applyToEnvironment;
 	return {
@@ -173,6 +192,11 @@ if (earlyViteCliInvocation) {
 	});
 }
 installSocketErrorBackstop();
+const INVALID_SERVER_ONLY_ID_PREFIX = "\0vinext:invalid-server-only:";
+const INVALID_SERVER_ONLY_ID_RE = /^\0vinext:invalid-server-only:/;
+function createServerOnlyClientImportError(importer) {
+	return /* @__PURE__ */ new Error(`You're importing a module that depends on "server-only". This API is only available in Server Components in the App Router, but ${importer || "this module"} is reachable from a client bundle.`);
+}
 function hasServerOnlyMarkerImport(code) {
 	if (!code.includes("server-only")) return false;
 	let ast;
@@ -900,6 +924,7 @@ function vinext(options = {}) {
 	const pagesClientAssetsOutputDirs = /* @__PURE__ */ new Set();
 	const resolvePagesClientAssetsOutputDir = (environmentName, outputDir) => !selectedMultiStageOutput && !hasAppDir && !hasCloudflarePlugin && environmentName === "ssr" ? path.dirname(outputDir) : outputDir;
 	let pagesClientAssetsModule = internalOptions.__pagesClientAssetsModule ?? null;
+	let clientBuildFiles = [];
 	let devPublicFileRoutes = null;
 	let publicDirConflictOptions = null;
 	let copyPublicDirIntoStaticExportBasePath = false;
@@ -908,6 +933,7 @@ function vinext(options = {}) {
 	let draftModeSecret = getPagesPreviewModeId();
 	const prerenderSecret = process.env.__VINEXT_SHARED_PRERENDER_SECRET ?? randomBytes(32).toString("hex");
 	let revalidateSecret = process.env.__VINEXT_SHARED_REVALIDATE_SECRET;
+	const devForwardedMiddlewareContextKey = randomBytes(32).toString("hex");
 	let previewBuildCredentials;
 	const sassComposesLoader = createSassAwareFileSystemLoader();
 	const rscClassificationManifests = /* @__PURE__ */ new Map();
@@ -996,6 +1022,7 @@ function vinext(options = {}) {
 	let rscPluginModulePromise = null;
 	resolvedReactPath = resolveOptionalDependency(earlyBaseDir, "@vitejs/plugin-react");
 	resolvedRscPath = resolveOptionalDependency(earlyBaseDir, "@vitejs/plugin-rsc");
+	const rscVersion = earlyAppDirExists && resolvedRscPath ? assertPluginRscVersion(resolvedRscPath) : null;
 	let rscPluginPromise = null;
 	let manualUseCachePluginPromise = null;
 	if (earlyAppDirExists && autoRsc) {
@@ -1015,7 +1042,7 @@ function vinext(options = {}) {
 			});
 			const useServerIndex = plugins.findIndex((plugin) => plugin.name === "rsc:use-server");
 			if (useServerIndex === -1) throw new Error("vinext: Failed to locate @vitejs/plugin-rsc use-server plugin.");
-			plugins.splice(useServerIndex, 0, useCachePlugin);
+			plugins.splice(useServerIndex, 0, cacheFlightCodecPlugin(), useCachePlugin);
 			return plugins.map(scopeRscPlugin);
 		}).catch((cause) => {
 			throw new Error("vinext: Failed to load @vitejs/plugin-rsc.", { cause });
@@ -1160,12 +1187,21 @@ function vinext(options = {}) {
 			const previous = transformBundledCommonJsDependencies;
 			transformProjectLocalCommonJs = projectLocal && isDev;
 			transformBundledCommonJsDependencies = bundledDependency;
+			let result;
 			try {
-				return commonJsTransform.call(this, code, id, ...args);
+				result = commonJsTransform.call(this, code, id, ...args);
 			} finally {
 				transformProjectLocalCommonJs = previousProjectLocal;
 				transformBundledCommonJsDependencies = previous;
 			}
+			return Promise.resolve(result).then((transformed) => {
+				if (typeof transformed !== "object" || typeof transformed?.code !== "string") return transformed;
+				const stripped = stripEsmCommonJsExportFacade(transformed.code);
+				return stripped === void 0 ? transformed : {
+					...transformed,
+					code: stripped
+				};
+			});
 		};
 		commonJsPlugin.transform = {
 			filter: { code: { include: COMMONJS_SYNTAX_CODE_FILTER } },
@@ -1313,6 +1349,7 @@ function vinext(options = {}) {
 				buildEmptyOutDir = typeof config.build?.emptyOutDir === "boolean" ? config.build.emptyOutDir : void 0;
 				isServeCommand = env.command === "serve";
 				root = path.resolve(toSlash(process.cwd()), config.root ?? ".");
+				if (env.command === "build") assertClientOutDirIsSeparate(root, options);
 				const devCliLifecycleEnabled = env.command === "serve" && env.isPreview !== true && claimViteCliDevInvocation(root, config["__vinextDevRestart"] === true, reservedDevCliInvocation && config.configFile === false);
 				buildLifecycleInvocation = config[VINEXT_BUILD_LIFECYCLE_CONFIG];
 				buildLifecycleEnabled = env.command === "build" && !internalOptions.__skipBuildLifecycle && (buildLifecycleInvocation !== void 0 || claimViteCliBuildInvocation());
@@ -1430,6 +1467,7 @@ function vinext(options = {}) {
 				defines["process.env.__NEXT_TEST_MODE"] = JSON.stringify(process.env.__NEXT_TEST_MODE ?? false);
 				defines["process.env.__NEXT_SCROLL_RESTORATION"] = JSON.stringify(nextConfig.scrollRestoration ? "true" : "false");
 				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_IMAGE_REMOTE_PATTERNS"] = JSON.stringify(JSON.stringify(nextConfig.images?.remotePatterns ?? []));
 				defines["process.env.__VINEXT_IMAGE_DOMAINS"] = JSON.stringify(JSON.stringify(nextConfig.images?.domains ?? []));
@@ -1495,6 +1533,7 @@ function vinext(options = {}) {
 					"vinext/head-state": path.join(shimsDir, "head-state"),
 					"vinext/i18n-state": path.join(shimsDir, "i18n-state"),
 					"vinext/i18n-context": path.join(shimsDir, "i18n-context"),
+					"vinext/document-placeholders": path.join(shimsDir, "document-placeholders"),
 					"vinext/client": path.resolve(__dirname, "client", "index"),
 					"vinext/cache": path.resolve(__dirname, "cache"),
 					"vinext/instrumentation": path.resolve(__dirname, "server", "instrumentation"),
@@ -1586,7 +1625,14 @@ function vinext(options = {}) {
 							...!isSSR && !isMultiEnv ? { output: getClientOutputConfig(clientAssetsDir) } : {}
 						})
 					},
-					worker: { plugins: () => [createWorkerImageImportsPlugin({ deploymentId: nextConfig.deploymentId })] },
+					worker: { plugins: () => [
+						createWorkerImageImportsPlugin({ deploymentId: nextConfig.deploymentId }),
+						createWorkerServerOnlyImportsPlugin(),
+						...rscPluginModulePromise && resolvedRscPath ? [createWorkerUseServerPlugins({
+							rscPluginModule: rscPluginModulePromise,
+							rscPluginPath: resolvedRscPath
+						})] : []
+					] },
 					server: {
 						watch: config.server?.watch === null ? null : {
 							ignored: [VINEXT_GENERATED_DIR_RE],
@@ -1643,7 +1689,8 @@ function vinext(options = {}) {
 							transformer: "lightningcss",
 							lightningcss: {
 								...nextConfig.lightningCssFeatures.include ? { include: nextConfig.lightningCssFeatures.include } : {},
-								...nextConfig.lightningCssFeatures.exclude ? { exclude: nextConfig.lightningCssFeatures.exclude } : {}
+								...nextConfig.lightningCssFeatures.exclude ? { exclude: nextConfig.lightningCssFeatures.exclude } : {},
+								...(nextConfig.lightningCssFeatures.include & ~nextConfig.lightningCssFeatures.exclude & lightningCssFeatureNamesToMask(["custom-media-queries"])) !== 0 ? { drafts: { customMedia: true } } : {}
 							}
 						} : {},
 						...postcssOverride ? { postcss: postcssOverride } : {},
@@ -1693,7 +1740,7 @@ function vinext(options = {}) {
 					...depOptimizeNodeEnvOptions,
 					rolldownOptions: {
 						...depOptimizeNodeEnvOptions.rolldownOptions,
-						plugins: [depOptimizeAliasPlugin]
+						plugins: [depOptimizeAliasPlugin, commonJsEsmFacadeOptimizeDepsPlugin]
 					}
 				};
 				pagesOptimizeEntries = !hasAppDir ? [...hasPagesDir ? [toRelativeFileEntry(root, pagesDir) + "/**/*.{tsx,ts,jsx,js}"] : [], ...[instrumentationPath, instrumentationClientPath].flatMap((entry) => entry ? [toRelativeFileEntry(root, entry)] : [])] : [];
@@ -1822,6 +1869,7 @@ function vinext(options = {}) {
 								...depOptimizeNodeEnvOptions
 							},
 							build: {
+								...options.clientOutDir ? { outDir: options.clientOutDir } : {},
 								manifest: true,
 								...hasPagesDir ? { ssrManifest: true } : {},
 								assetsInlineLimit: clientAssetsInlineLimit,
@@ -1841,6 +1889,7 @@ function vinext(options = {}) {
 						...depOptimizeNodeEnvOptions
 					},
 					build: {
+						...options.clientOutDir ? { outDir: options.clientOutDir } : {},
 						manifest: true,
 						ssrManifest: true,
 						assetsInlineLimit: clientAssetsInlineLimit,
@@ -1861,7 +1910,7 @@ function vinext(options = {}) {
 								...depOptimizeNodeEnvOptions
 							},
 							build: {
-								outDir: "dist/client",
+								outDir: options.clientOutDir ?? "dist/client",
 								manifest: true,
 								ssrManifest: true,
 								assetsInlineLimit: clientAssetsInlineLimit,
@@ -2193,12 +2242,14 @@ function vinext(options = {}) {
 							nodeOpenTelemetryLoader: registerNodeOpenTelemetryLoader,
 							assetPrefix: nextConfig?.assetPrefix,
 							crossOrigin: nextConfig?.crossOrigin,
+							skipTrailingSlashRedirect: nextConfig?.skipTrailingSlashRedirect,
 							expireTime: nextConfig?.expireTime,
 							reactMaxHeadersLength: nextConfig?.reactMaxHeadersLength,
 							cacheMaxMemorySize: nextConfig?.cacheMaxMemorySize,
 							inlineCss: nextConfig?.inlineCss,
 							globalNotFound: nextConfig?.globalNotFound,
 							cacheComponents: nextConfig?.cacheComponents,
+							readMdxEsm: !nextConfig?.cacheComponents && pageExtensionsIncludeMdx(nextConfig?.pageExtensions ?? []) ? await loadMdxEsmReader(root) : null,
 							prefetchInlining: nextConfig?.prefetchInlining,
 							hasServerActions,
 							actionOwners: this.environment.config.command === "build" ? void 0 : null,
@@ -2216,7 +2267,8 @@ function vinext(options = {}) {
 							publicFiles: isServeCommand && devPublicFileRoutes ? [...devPublicFileRoutes].sort() : scanPublicFileRoutes(root, this.environment.config.publicDir === "" ? false : this.environment.config.publicDir),
 							globalNotFoundPath,
 							draftModeSecret,
-							prerenderSecret
+							prerenderSecret,
+							devForwardedMiddlewareContextKey: isServeCommand && this.environment.config.consumer === "server" ? devForwardedMiddlewareContextKey : void 0
 						}, instrumentationPath);
 					}
 					if (id === RESOLVED_ROOT_PARAMS) return generateRootParamsModule((hasAppDir ? await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher) : []).flatMap((route) => route.rootParamNames ?? []));
@@ -2581,25 +2633,13 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				}
 			},
 			configureServer(server) {
+				installSocketErrorBackstop({ runningServer: true });
 				const devBuildId = nextConfig?.buildId ?? process.env.__VINEXT_BUILD_ID ?? "development";
 				server.middlewares.use((req, _res, next) => {
 					req.__vinextOriginalEncodedUrl ??= req.url;
-					delete req.headers[VINEXT_MW_CTX_HEADER];
+					removeForwardedMiddlewareContext(req);
 					next();
 				});
-				server.middlewares.use((req, _res, next) => {
-					try {
-						assertNoPublicNextRequestConflict({
-							root: server.config.root,
-							publicDir: server.config.publicDir === "" ? null : server.config.publicDir,
-							basePath: nextConfig.basePath ?? "",
-							requestUrl: req.url ?? "/"
-						});
-						next();
-					} catch (error) {
-						next(error);
-					}
-				});
 				const pageExtensions = fileMatcher.extensionRegex;
 				let pagesRunner = null;
 				const getTrustedDevRevalidateOrigin = () => {
@@ -2776,7 +2816,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					const cleanPath = toSlash(stripViteModuleQuery(filePath));
 					const relativePath = path.relative(devPublicDir, cleanPath);
 					if (relativePath === "" || relativePath.startsWith("../") || path.isAbsolute(relativePath)) return null;
-					return publicFilePathVariants(`/${relativePath}`);
+					return [publicFileRouteKey(`/${relativePath}`)];
 				};
 				const updatePublicFileRoute = (filePath, present) => {
 					const routes = publicRoutesForFile(filePath);
@@ -2896,6 +2936,22 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					}
 					next();
 				});
+				server.middlewares.use((req, res, next) => {
+					if (!sendRepeatedSlashRedirect(req.url ?? "/", res)) next();
+				});
+				server.middlewares.use((req, _res, next) => {
+					try {
+						assertNoPublicNextRequestConflict({
+							root: server.config.root,
+							publicDir: server.config.publicDir === "" ? null : server.config.publicDir,
+							basePath: nextConfig.basePath ?? "",
+							requestUrl: req.url ?? "/"
+						});
+						next();
+					} catch (error) {
+						next(error);
+					}
+				});
 				server.middlewares.use((req, res, next) => {
 					if (!hasPagesDir || !handlePagesMiddleware || !isUnsupportedDevPublicRequest(req)) return next();
 					handlePagesMiddleware(req, res, next).catch(next);
@@ -3055,16 +3111,8 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 							}
 							const canonicalOriginalUrl = canonicalizeRequestUrlPathname(originalEncodedUrl);
 							url = canonicalizeRequestUrlPathname(url);
-							const rawPathname = url.split("?")[0];
-							if (rawPathname.endsWith("/index.html")) url = url.replace("/index.html", "/");
-							else if (rawPathname.endsWith(".html")) url = url.replace(/\.html(?=\?|$)/, "");
 							let middlewareUrl = canonicalOriginalUrl;
 							let routeUrl = middlewareUrl;
-							{
-								const routePathname = routeUrl.split("?")[0];
-								if (routePathname.endsWith("/index.html")) routeUrl = routeUrl.replace("/index.html", "/");
-								else if (routePathname.endsWith(".html")) routeUrl = routeUrl.replace(/\.html(?=\?|$)/, "");
-							}
 							let pathname = url.split("?")[0];
 							if (isOpenRedirectShaped(pathname)) {
 								res.writeHead(404);
@@ -3112,7 +3160,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								}
 							}
 							let configMatchPathname = stripBasePath(middlewareUrl.split("?")[0], routingBasePath);
-							if (nextConfig) {
+							if (nextConfig && !nextConfig.skipTrailingSlashRedirect) {
 								const qs = url.includes("?") ? url.slice(url.indexOf("?")) : "";
 								const trailingSlashRedirect = normalizeTrailingSlash(routeUrl.split("?")[0], bp, nextConfig.trailingSlash, qs);
 								if (trailingSlashRedirect) {
@@ -3125,18 +3173,22 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 							if (hasCloudflarePlugin) return next();
 							let isDataReq = false;
 							let dataNotFoundResponse = null;
-							if (isNextDataPathname(pathname)) {
-								const dataMatch = parseNextDataPathname(pathname, devBuildId);
-								if (dataMatch) {
+							const rawRoutePathname = routeUrl.split("?")[0];
+							if (isNextDataPathname(rawRoutePathname)) {
+								const rawDataMatch = parseNextDataPathname(rawRoutePathname, devBuildId);
+								const dataMatch = rawDataMatch ? parseNextDataPathname(pathname, devBuildId) : null;
+								if (dataMatch && rawDataMatch) {
 									isDataReq = true;
 									const qs = url.includes("?") ? url.slice(url.indexOf("?")) : "";
-									const pagePathname = normalizeNextDataPagePathname(dataMatch.pagePathname, shouldAddTrailingSlashToPagesDataPath(capturedMiddlewarePath !== null, nextConfig?.trailingSlash === true, nextConfig?.skipProxyUrlNormalize === true));
+									const addTrailingSlash = shouldAddTrailingSlashToPagesDataPath(capturedMiddlewarePath !== null, nextConfig?.trailingSlash === true, nextConfig?.skipProxyUrlNormalize === true);
+									const pagePathname = normalizeNextDataPagePathname(dataMatch.pagePathname, addTrailingSlash);
+									const rawPagePathname = normalizeNextDataPagePathname(rawDataMatch.pagePathname, addTrailingSlash);
 									url = pagePathname + qs;
-									if (!nextConfig?.skipProxyUrlNormalize) middlewareUrl = url;
-									routeUrl = url;
+									routeUrl = rawPagePathname + qs;
+									if (!nextConfig?.skipProxyUrlNormalize) middlewareUrl = routeUrl;
 									pathname = pagePathname;
-									configMatchPathname = pagePathname;
-									req.url = url;
+									configMatchPathname = rawPagePathname;
+									req.url = routeUrl;
 								} else {
 									const deploymentId = process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID;
 									const notFoundHeaders = { "Content-Type": "application/json" };
@@ -3181,9 +3233,11 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 							const method = req.method ?? "GET";
 							const webRequest = new Request(new URL(routeUrl, requestOrigin), {
 								method,
-								headers: nodeRequestHeaders
+								headers: nodeRequestHeaders,
+								signal: signalFromNodeResponse(res)
 							});
 							const applyRequestHeadersToNodeRequest = (nextRequestHeaders) => {
+								removeForwardedMiddlewareContext(req);
 								for (const key of Object.keys(req.headers)) delete req.headers[key];
 								for (const [key, value] of nextRequestHeaders) req.headers[key] = value;
 							};
@@ -3192,20 +3246,22 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								const mwOrigin = `${rawProto === "https" || rawProto === "http" ? rawProto : "http"}://${requestHost}`;
 								const middlewareRequest = new Request(new URL(middlewareUrl, mwOrigin), {
 									method: req.method,
-									headers: nodeRequestHeaders
+									headers: nodeRequestHeaders,
+									signal: webRequest.signal
 								});
-								const result = await runMiddleware(getPagesRunner(), capturedMiddlewarePath, middlewareRequest, nextConfig?.i18n, nextConfig?.basePath, nextConfig?.trailingSlash, opts.isDataRequest, pathname);
+								const result = await runMiddleware(getPagesRunner(), capturedMiddlewarePath, middlewareRequest, nextConfig?.i18n, nextConfig?.basePath, nextConfig?.trailingSlash, opts.isDataRequest, pathname, opts.isStaleDataRequest, nextConfig?.skipTrailingSlashRedirect);
 								if (hasAppDir && result.continue) {
 									const mwCtxEntries = [];
 									if (result.responseHeaders) {
 										for (const [key, value] of result.responseHeaders) if (key !== "x-middleware-next" && key !== "x-middleware-rewrite") mwCtxEntries.push([key, value]);
 									}
 									const mwStatus = result.status ?? result.rewriteStatus;
-									req.headers[VINEXT_MW_CTX_HEADER] = JSON.stringify({
+									setForwardedMiddlewareContext(req, devForwardedMiddlewareContextKey, JSON.stringify({
 										h: mwCtxEntries,
 										s: mwStatus ?? null,
-										r: result.rewriteUrl ?? null
-									});
+										r: result.rewriteUrl ?? null,
+										b: result.rewriteHadBasePath ?? null
+									}));
 								}
 								return result;
 							} : null;
@@ -3219,6 +3275,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								assetPrefix: nextConfig?.assetPrefix,
 								basePath: bp,
 								trailingSlash: nextConfig?.trailingSlash ?? false,
+								skipTrailingSlashRedirect: nextConfig?.skipTrailingSlashRedirect ?? false,
 								i18nConfig: nextConfig?.i18n ?? null,
 								configRedirects: nextConfig?.redirects ?? [],
 								configRewrites: nextConfig?.rewrites ?? {
@@ -3256,7 +3313,8 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 									const hasBody = externalMethod !== "GET" && externalMethod !== "HEAD";
 									const externalInit = {
 										method: externalMethod,
-										headers: currentRequest.headers
+										headers: currentRequest.headers,
+										signal: currentRequest.signal
 									};
 									if (hasBody) {
 										const { Readable } = await import("node:stream");
@@ -3266,8 +3324,8 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 									const reqWithBody = new Request(new URL(url, requestOrigin), externalInit);
 									return proxyExternalRequest(reqWithBody, externalUrl);
 								},
-								serveFilesystemRoute: async (requestPathname, stagedHeaders, phase, resolvedUrl) => {
-									if (isImageOptimizationPath(requestPathname)) {
+								serveFilesystemRoute: async (requestPathname, stagedHeaders, phase, resolvedUrl, _request, resolvedPathnameHasBasePath) => {
+									if (resolvedPathnameHasBasePath && isImageOptimizationPath(requestPathname)) {
 										const imageRequestUrl = new URL(resolvedUrl, requestOrigin);
 										const allowedWidths = [...nextConfig.images?.deviceSizes ?? DEFAULT_DEVICE_SIZES, ...nextConfig.images?.imageSizes ?? DEFAULT_IMAGE_SIZES];
 										const encodedLocation = resolveDevImageRedirect(imageRequestUrl, allowedWidths, nextConfig.images?.qualities);
@@ -3278,7 +3336,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 									}
 									const isRetrievalMethod = req.method === "GET" || req.method === "HEAD";
 									if (phase === "direct" && isRetrievalMethod || requestPathname === "/" || requestPathname === "/api" || requestPathname.startsWith("/api/")) return false;
-									if (!isRetrievalMethod) return isExistingDevPublicFile(requestPathname) ? methodNotAllowedResponse("GET, HEAD") : false;
+									if (!isRetrievalMethod) return isExistingDevPublicFile(normalizePathnameForRouteMatch(requestPathname)) ? methodNotAllowedResponse("GET, HEAD") : false;
 									return serveRewrittenViteFilesystemRoute(req, res, requestPathname, stagedHeaders);
 								}
 							};
@@ -3305,12 +3363,12 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								const requestHeaders = new Headers();
 								encodeMiddlewareRequestHeaders(requestHeaders, pipelineResult.requestHeaders);
 								flushRequestHeaders();
-								req.headers[VINEXT_MW_CTX_HEADER] = JSON.stringify({
+								setForwardedMiddlewareContext(req, devForwardedMiddlewareContextKey, JSON.stringify({
 									h: responseHeaders,
 									q: [...requestHeaders],
 									s: pipelineResult.middlewareStatus ?? null,
 									r: apiUrl
-								});
+								}));
 							};
 							if (pipelineResult.type === "api") {
 								const devApiRoutes = await getDevApiRoutes();
@@ -3330,7 +3388,8 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 									i18n: nextConfig?.i18n,
 									trustedRevalidateOrigin: getTrustedDevRevalidateOrigin(),
 									allowedRevalidateHeaderKeys: nextConfig?.allowedRevalidateHeaderKeys,
-									trailingSlash: nextConfig?.trailingSlash
+									trailingSlash: nextConfig?.trailingSlash,
+									skipTrailingSlashRedirect: nextConfig?.skipTrailingSlashRedirect
 								})) return;
 								if (hasAppDir) {
 									if (pipelineResult.configRewriteFired) forwardInternalApiRewriteToApp(pipelineResult.apiUrl);
@@ -3478,6 +3537,25 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 		},
 		{
 			name: "vinext:validate-server-only-client-imports",
+			resolveId: {
+				order: "pre",
+				filter: { id: SERVER_ONLY_SPECIFIER_RE },
+				handler(_source, importer) {
+					const environment = this.environment;
+					if (environment?.name !== "client" || hasAppDir) return null;
+					if (environment.mode === "dev" && !(importer && environment.moduleGraph.getModuleById(importer))) return {
+						id: INVALID_SERVER_ONLY_ID_PREFIX + (importer ?? ""),
+						moduleSideEffects: true
+					};
+					throw createServerOnlyClientImportError(importer);
+				}
+			},
+			load: {
+				filter: { id: INVALID_SERVER_ONLY_ID_RE },
+				handler(id) {
+					throw createServerOnlyClientImportError(id.slice(28));
+				}
+			},
 			transform: {
 				filter: {
 					id: {
@@ -3487,7 +3565,8 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					code: "server-only"
 				},
 				handler(code) {
-					if (this.environment?.name !== "client") return null;
+					if (this.environment?.name !== "client" || !hasAppDir) return null;
+					// @vitejs/plugin-rsc replaces a "use server" module in the client
 					if (getLeadingReactDirective(code) === "use server") return null;
 					if (!hasServerOnlyMarkerImport(code)) return null;
 					throw new Error(`You're importing a module that depends on "server-only". This API is only available in Server Components in the App Router, but this module is reachable from a client bundle.`);
@@ -3715,7 +3794,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 		createGoogleFontsPlugin(_fontGoogleShimPath, _shimsDir),
 		createLocalFontsPlugin(_shimsDir),
 		createOptimizeImportsPlugin(() => nextConfig, () => root),
-		createDynamicPreloadMetadataPlugin(),
+		createDynamicPreloadMetadataPlugin(() => nextConfig?.turbopackTranspilePackages ?? []),
 		importMetaUrlCapability.vitePlugin,
 		createExtensionlessDynamicImportPlugin(),
 		createRequireContextPlugin(),
@@ -3774,6 +3853,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					}
 					const manifest = {
 						prerenderSecret,
+						compress: nextConfig?.compress !== false,
 						...serverRuntimeOutputDirs.size === 0 ? {} : { runtimeOutputDirs: [...serverRuntimeOutputDirs].map((runtimeOutputDir) => path.relative(root, runtimeOutputDir) || ".").sort() }
 					};
 					const source = JSON.stringify(manifest);
@@ -3920,6 +4000,10 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 			apply: "build",
 			enforce: "post",
 			sharedDuringBuild: true,
+			writeBundle(_options, bundle) {
+				if (this.environment.name !== "client") return;
+				clientBuildFiles = collectClientBuildFiles(Object.keys(bundle));
+			},
 			closeBundle: {
 				sequential: true,
 				order: "post",
@@ -3946,7 +4030,8 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 							cssGraph: runtimeMetadata.cssGraph,
 							lazyChunks: runtimeMetadata.lazyChunks ?? void 0,
 							dynamicPreloads: runtimeMetadata.dynamicPreloads ?? void 0,
-							crossOrigin: nextConfig.crossOrigin ?? ""
+							crossOrigin: nextConfig.crossOrigin ?? "",
+							clientBuildFiles: clientBuildFiles.length > 0 ? clientBuildFiles : void 0
 						});
 					}
 					if (pagesClientAssetsModule === null && pagesClientAssetsOutputDirs.size === 0) return;
@@ -3983,13 +4068,37 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					const envConfig = this.environment?.config;
 					if (!envConfig) return;
 					const buildRoot = envConfig.root ?? process.cwd();
-					const clientDir = path.resolve(buildRoot, "dist", "client");
+					const clientDir = path.resolve(buildRoot, envConfig.build.outDir);
 					const manifest = collectInlineCssManifest(clientDir, nextConfig.assetPrefix);
 					const rscOutDir = path.resolve(buildRoot, options.rscOutDir ?? path.join("dist", "server"));
 					for (const entryFile of ["index.js", "index.mjs"]) if (injectInlineCssManifestGlobal(path.join(rscOutDir, entryFile), manifest)) break;
 				}
 			}
 		},
+		(
+		// @vitejs/plugin-rsc's preview handler, and Cloudflare and Nitro builds
+		{
+			name: "vinext:preview-server",
+			async configurePreviewServer(server) {
+				if (hasAppDir || hasCloudflarePlugin || hasNitroPlugin) return;
+				if (nextConfig?.output === "export") return;
+				const { createPagesPreviewHandler } = await import("./server/prod-server.js");
+				const { environments, preview, root } = server.config;
+				const handler = await createPagesPreviewHandler({
+					clientDir: path.resolve(root, environments.client?.build.outDir ?? "dist/client"),
+					serverDir: path.resolve(root, environments.ssr?.build.outDir ?? "dist/server"),
+					host: typeof preview.host === "string" ? preview.host : "localhost",
+					port: preview.port ?? 4173
+				});
+				if (!handler) return;
+				return () => {
+					server.middlewares.use((req, res) => {
+						if (nextConfig?.basePath) req.url = nextConfig.basePath + (req.url ?? "/");
+						handler(req, res);
+					});
+				};
+			}
+		}),
 		{
 			name: "vinext:cloudflare-build",
 			apply: "build",
@@ -4106,6 +4215,9 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 		}
 	});
 	if (rscPluginPromise) plugins.push(rscPluginPromise);
+	if (rscVersion && isRscScanGlobImportsAffected(rscVersion)) plugins.push(createRscScanGlobImportsPlugin({ async getManager(config) {
+		return (await rscPluginModulePromise)?.getPluginApi(config)?.manager;
+	} }));
 	if (earlyAppDirExists) {
 		plugins.push(createActionOwnerManifestPlugin({
 			canonicalizeModuleId: canonicalize,
@@ -4124,7 +4236,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 	if (rscPluginPromise) {
 		plugins.push(createRscReferenceValidationNormalizerPlugin());
 		plugins.push(createRscClientReferenceLoadersPlugin());
-	} else if (manualUseCachePluginPromise) plugins.push(manualUseCachePluginPromise);
+	} else if (manualUseCachePluginPromise) plugins.push(cacheFlightCodecPlugin(), manualUseCachePluginPromise);
 	plugins.push({
 		name: "vinext:plain-pages-build-config",
 		apply: "build",
@@ -4162,6 +4274,10 @@ function getNextPublicEnvDefines() {
 * Handles multi-value headers (Set-Cookie) correctly.
 */
 async function writeWebResponseToNodeRes(res, response) {
+	if (res.destroyed) {
+		response.body?.cancel().catch(() => {});
+		return;
+	}
 	const nodeHeaders = {};
 	response.headers.forEach((value, key) => {
 		if (key === "set-cookie") return;
@@ -4174,13 +4290,17 @@ async function writeWebResponseToNodeRes(res, response) {
 	if (response.statusText) res.writeHead(response.status, response.statusText, nodeHeaders);
 	else res.writeHead(response.status, nodeHeaders);
 	if (response.body) {
-		const { Readable } = await import("node:stream");
+		const { Readable, pipeline } = await import("node:stream");
 		const nodeStream = Readable.fromWeb(response.body);
+		let clientDisconnected = false;
+		res.once("close", () => {
+			clientDisconnected = !res.writableFinished && !nodeStream.errored;
+		});
 		await new Promise((resolve, reject) => {
-			nodeStream.on("error", reject);
-			res.on("error", reject);
-			nodeStream.pipe(res);
-			nodeStream.on("end", resolve);
+			pipeline(nodeStream, res, (error) => {
+				if (error && !(clientDisconnected && error.code === "ERR_STREAM_PREMATURE_CLOSE")) reject(error);
+				else resolve();
+			});
 		});
 	} else res.end();
 }