vinext 1.0.0 → 1.1.0

package/dist/index.js

@@ -11,9 +11,10 @@ import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from "./shims/consta
 import { VINEXT_MW_CTX_HEADER } from "./utils/protocol-headers.js";
 import { encodeMiddlewareRequestHeaders } from "./utils/middleware-request-headers.js";
 import { matchesRewriteSource, proxyExternalRequest } from "./config/config-matchers.js";
-import { resolveAssetsDir } from "./utils/asset-prefix.js";
+import { omitUnusedBuildSourcemap } from "./plugins/transform-result.js";
+import { assetPrefixPathname, isNextStaticPath, resolveAssetsDir } from "./utils/asset-prefix.js";
 import { RESOLVED_VIRTUAL_GOOGLE_FONTS, VIRTUAL_GOOGLE_FONTS, createGoogleFontsPlugin, createLocalFontsPlugin, generateGoogleFontsVirtualModule, parseStaticObjectLiteral } from "./plugins/fonts.js";
-import { VINEXT_NEXT_CONFIG_PLUGIN_PROPERTY, createRscCompatibilityId, findNextConfigPath, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "./config/next-config.js";
+import { VINEXT_NEXT_CONFIG_PLUGIN_PROPERTY, createRscCompatibilityId, findNextConfigPath, lightningCssFeatureNamesToMask, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "./config/next-config.js";
 import { normalizePathnameForRouteMatchStrict } from "./routing/utils.js";
 import { hasBasePath, stripBasePath } from "./utils/base-path.js";
 import { appRouteGraph, appRouter, invalidateAppRouteCache, matchAppRoute } from "./routing/app-router.js";
@@ -23,8 +24,8 @@ import { resolveRuntimeEntryModule } from "./entries/runtime-entry-module.js";
 import { INTERNAL_HEADERS, NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_TIMING_HEADER } from "./server/headers.js";
 import { normalizePath as normalizePath$1 } from "./server/normalize-path.js";
 import { validateMiddlewareMatcherPatterns } from "./server/middleware-matcher-pattern.js";
-import { methodNotAllowedResponse } from "./server/http-error-responses.js";
-import { isOpenRedirectShaped } from "./server/open-redirect.js";
+import { methodNotAllowedResponse, notFoundStaticAssetResponse } from "./server/http-error-responses.js";
+import { isOpenRedirectShaped, sendRepeatedSlashRedirect } from "./server/open-redirect.js";
 import { canonicalizeRequestUrlPathname, filterInternalHeaders, normalizeTrailingSlash } from "./server/request-pipeline.js";
 import { resolvePagesI18nRequest, stripI18nLocaleForApiRoute } from "./server/pages-i18n.js";
 import { findInstrumentationClientFile, findInstrumentationFile, runInstrumentation } from "./server/instrumentation.js";
@@ -32,16 +33,17 @@ import { findMiddlewareFile, isProxyFile, runMiddleware } from "./server/middlew
 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";
@@ -78,6 +80,7 @@ import { dataUrlCssPlugin } from "./plugins/css-data-url.js";
 import { createCssModuleImportCompatibilityPlugin } from "./plugins/css-module-imports.js";
 import { createRscClientReferenceLoadersPlugin } from "./plugins/rsc-client-reference-loaders.js";
 import { createRscReferenceValidationNormalizerPlugin } from "./plugins/rsc-reference-validation-normalizer.js";
+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";
@@ -88,9 +91,11 @@ import { validateMiddlewareModuleExports } from "./plugins/middleware-export-val
 import { createOptimizeImportsPlugin } from "./plugins/optimize-imports.js";
 import { augmentSsrManifestFromBundle, relativeWithinRoot, tryRealpathSync } from "./build/ssr-manifest.js";
 import { createDynamicPreloadMetadataPlugin } from "./plugins/dynamic-preload-metadata.js";
+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";
@@ -102,17 +107,18 @@ 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 { hasExportAllCandidate, stripServerExports, validatePageExports } from "./plugins/strip-server-exports.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 { 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 { createTransformCache } from "./plugins/transform-cache.js";
 import { createExtensionlessDynamicImportPlugin } from "./plugins/extensionless-dynamic-import.js";
 import { createWasmModuleImportPlugin } from "./plugins/wasm-module-import.js";
-import { consumerEnvironmentConditionFilter, getTypeofWindowReplacement, replaceConsumerEnvironmentConditions } from "./plugins/typeof-window.js";
-import { hasMdxFiles } from "./utils/mdx-scan.js";
+import { consumerEnvironmentConditionFilter, getTypeofWindowReplacement, mayFoldChangeScannedImports, replaceConsumerEnvironmentConditions } from "./plugins/typeof-window.js";
+import { hasMdxFiles, loadMdxEsmReader, pageExtensionsIncludeMdx } from "./utils/mdx-scan.js";
 import { publicFilePathVariants } from "./utils/public-file-path.js";
 import { scanPublicFileRoutes } from "./utils/public-routes.js";
 import { createIgnoreDynamicRequestsPlugin } from "./plugins/ignore-dynamic-requests.js";
@@ -133,17 +139,23 @@ const PAGES_CLOUDFLARE_WORKER_OPTIMIZE_DEPS_INCLUDE = Object.freeze([
 	"react-dom",
 	"react-dom/server.edge",
 	"react/jsx-runtime",
-	"react/jsx-dev-runtime",
-	"use-sync-external-store/with-selector"
+	"react/jsx-dev-runtime"
+]);
+const APP_CLIENT_OPTIONAL_OPTIMIZE_DEPS_INCLUDE = Object.freeze([
+	"use-sync-external-store/shim",
+	"use-sync-external-store/shim/index.js",
+	"use-sync-external-store/shim/with-selector",
+	"use-sync-external-store/shim/with-selector.js",
+	"use-sync-external-store/with-selector",
+	"use-sync-external-store/with-selector.js"
 ]);
-const OPTIONAL_OPTIMIZE_DEPS_WARNING_RE = /Failed to resolve dependency: .*use-sync-external-store\/with-selector.*present in .* 'optimizeDeps\.include'/;
-const VINEXT_FILTERED_OPTIMIZE_DEPS_WARN = Symbol.for("vinext.filteredOptimizeDepsWarn");
 const ANSI_ESCAPE_RE = new RegExp(`${String.fromCharCode(27)}\\[[0-9;]*m`, "g");
 const RSC_ENVIRONMENTS = /* @__PURE__ */ new Set([
 	"rsc",
 	"ssr",
 	"client"
 ]);
+const VINEXT_GENERATED_DIR_RE = /(?:^|[/\\])\.vinext(?:[/\\]|$)/;
 function scopeRscPlugin(plugin) {
 	const applyToEnvironment = plugin.applyToEnvironment;
 	return {
@@ -544,15 +556,24 @@ function mergeStringArrayValues(value, additions) {
 function stripAnsi(value) {
 	return value.replace(ANSI_ESCAPE_RE, "");
 }
-function suppressOptionalOptimizeDepsWarnings(logger) {
-	const marker = logger;
-	if (marker[VINEXT_FILTERED_OPTIMIZE_DEPS_WARN]) return;
-	const warn = logger.warn.bind(logger);
-	logger.warn = (msg, options) => {
-		if (OPTIONAL_OPTIMIZE_DEPS_WARNING_RE.test(stripAnsi(msg))) return;
-		warn(msg, options);
+function createOptionalOptimizeDepsLogger(logger, warnings) {
+	if (warnings.size === 0) return logger;
+	return {
+		get hasWarned() {
+			return logger.hasWarned;
+		},
+		set hasWarned(value) {
+			logger.hasWarned = value;
+		},
+		info: logger.info.bind(logger),
+		warn(msg, options) {
+			if (!warnings.has(stripAnsi(msg))) logger.warn(msg, options);
+		},
+		warnOnce: logger.warnOnce.bind(logger),
+		error: logger.error.bind(logger),
+		clearScreen: logger.clearScreen.bind(logger),
+		hasErrorLogged: logger.hasErrorLogged.bind(logger)
 	};
-	marker[VINEXT_FILTERED_OPTIMIZE_DEPS_WARN] = true;
 }
 const _tsconfigAliasCache = /* @__PURE__ */ new Map();
 /**
@@ -847,6 +868,7 @@ function vinext(options = {}) {
 	let nitroBuildDir;
 	let fileMatcher;
 	let middlewarePath = null;
+	let canonicalMiddlewarePath = null;
 	let instrumentationPath = null;
 	let instrumentationClientPath = null;
 	let clientInjectModule = null;
@@ -996,7 +1018,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 });
@@ -1115,33 +1137,53 @@ function vinext(options = {}) {
 		}
 	};
 	const cachedConsumerConditionTransform = createTransformCache();
+	const cachedJsxInJsTransform = createTransformCache();
 	let transformProjectLocalCommonJs = false;
 	let transformBundledCommonJsDependencies = false;
 	const commonJsPlugin = commonjs({ filter(id) {
+		if (isPathInside(__dirname, toSlash(stripViteModuleQuery(id)))) return false;
 		return commonjsTransformFilter(id, transformProjectLocalCommonJs, transformBundledCommonJsDependencies, importMetaUrlCapability.isBundledCommonJsDependencyId);
 	} });
 	const commonJsTransform = commonJsPlugin.transform;
-	if (typeof commonJsTransform === "function") commonJsPlugin.transform = function environmentAwareCommonJsTransform(code, id, ...args) {
-		const normalizedId = toSlash(stripViteModuleQuery(id));
-		const nitroServicePath = this.environment.name === "nitro" && nitroBuildDir && normalizedId.endsWith("/entry.js") ? path.relative(path.join(canonicalize(nitroBuildDir), "vite/services"), normalizedId) : "";
-		if (/^[^/]+\/entry\.js$/.test(nitroServicePath)) return null;
-		if (isPathInside(__dirname, toSlash(stripViteModuleQuery(id)))) return null;
-		if (this.environment.mode === "dev" && this.environment.depsOptimizer?.isOptimizedDepFile(id)) return null;
-		const isDev = this.environment.mode === "dev";
-		const isServer = this.environment.config.consumer === "server";
-		const bundledDependency = isDev && isServer && (code.includes("__filename") || code.includes("__dirname")) && importMetaUrlCapability.isBundledCommonJsDependencyId(id);
-		const projectLocal = !bundledDependency && !id.includes("/node_modules/") && !id.includes("\\node_modules\\");
-		const previousProjectLocal = transformProjectLocalCommonJs;
-		const previous = transformBundledCommonJsDependencies;
-		transformProjectLocalCommonJs = projectLocal && isDev;
-		transformBundledCommonJsDependencies = bundledDependency;
-		try {
-			return commonJsTransform.call(this, code, id, ...args);
-		} finally {
-			transformProjectLocalCommonJs = previousProjectLocal;
-			transformBundledCommonJsDependencies = previous;
-		}
-	};
+	if (typeof commonJsTransform === "function") {
+		const environmentAwareCommonJsTransform = function(code, id, ...args) {
+			const normalizedId = toSlash(stripViteModuleQuery(id));
+			const nitroServicePath = this.environment.name === "nitro" && nitroBuildDir && normalizedId.endsWith("/entry.js") ? path.relative(path.join(canonicalize(nitroBuildDir), "vite/services"), normalizedId) : "";
+			if (/^[^/]+\/entry\.js$/.test(nitroServicePath)) return null;
+			if (isPathInside(__dirname, toSlash(stripViteModuleQuery(id)))) return null;
+			if (this.environment.mode === "dev" && this.environment.depsOptimizer?.isOptimizedDepFile(id)) return null;
+			const isDev = this.environment.mode === "dev";
+			const isServer = this.environment.config.consumer === "server";
+			const bundledDependency = isDev && isServer && (code.includes("__filename") || code.includes("__dirname")) && importMetaUrlCapability.isBundledCommonJsDependencyId(id);
+			const projectLocal = !bundledDependency && !id.includes("/node_modules/") && !id.includes("\\node_modules\\");
+			const userCondition = commonjsTransformFilter(id, projectLocal && isDev, bundledDependency, importMetaUrlCapability.isBundledCommonJsDependencyId);
+			if (userCondition === false) return null;
+			if (userCondition !== true && id.includes("node_modules")) return null;
+			const previousProjectLocal = transformProjectLocalCommonJs;
+			const previous = transformBundledCommonJsDependencies;
+			transformProjectLocalCommonJs = projectLocal && isDev;
+			transformBundledCommonJsDependencies = bundledDependency;
+			let result;
+			try {
+				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 } },
+			handler: environmentAwareCommonJsTransform
+		};
+	}
 	const buildLifecyclePlugins = createBuildLifecyclePlugins({
 		isEnabled: (builder) => buildLifecycleEnabled && builder.config.build.write !== false && !builder.config.build.lib && (buildLifecycleInvocation !== void 0 || !builder.config.build.watch && !builder.config.build.ssr && getBuildBundlerOptions(builder.config.build)?.input === void 0),
 		onComplete: () => buildLifecycleInvocation?.onComplete?.(),
@@ -1229,15 +1271,17 @@ function vinext(options = {}) {
 						if (!code.includes("use client") && !code.includes("use server")) return;
 						if (!hasReactDirective(code)) return;
 					}
-					const result = await transformWithOxc(code, id, {
-						lang: "jsx",
-						jsx: { runtime: "automatic" },
-						sourcemap: true
+					return cachedJsxInJsTransform(id, code, void 0, async () => {
+						const result = await transformWithOxc(code, id, {
+							lang: "jsx",
+							jsx: { runtime: "automatic" },
+							sourcemap: true
+						});
+						return {
+							code: result.code,
+							map: result.map
+						};
 					});
-					return {
-						code: result.code,
-						map: result.map
-					};
 				}
 			}
 		},
@@ -1366,6 +1410,8 @@ function vinext(options = {}) {
 				instrumentationClientPath = findInstrumentationClientFile(root, fileMatcher);
 				const middlewareConventionDir = canonicalize(baseDir) === canonicalize(path.join(root, "src")) ? path.join(root, "src") : root;
 				middlewarePath = findMiddlewareFile(root, fileMatcher, middlewareConventionDir);
+				pageTransformCanonicalPaths.clear();
+				canonicalMiddlewarePath = middlewarePath ? canonicalize(middlewarePath) : null;
 				if (middlewarePath) {
 					const staticMatcher = extractMiddlewareMatcherConfigValue(middlewarePath);
 					if (staticMatcher !== void 0) validateMiddlewareMatcherPatterns(staticMatcher);
@@ -1522,6 +1568,7 @@ function vinext(options = {}) {
 				const viteConfig = {
 					appType: "custom",
 					...devCliLifecycleEnabled ? { [VINEXT_DEV_CLI_LIFECYCLE]: true } : {},
+					...hasAppDir && hasNitroPlugin ? { rsc: { serverHandler: false } } : {},
 					...!hasAppDir && hasCloudflarePlugin ? { builder: {
 						...config.builder,
 						sharedConfigBuild: true
@@ -1553,6 +1600,10 @@ function vinext(options = {}) {
 					},
 					worker: { plugins: () => [createWorkerImageImportsPlugin({ deploymentId: nextConfig.deploymentId })] },
 					server: {
+						watch: config.server?.watch === null ? null : {
+							ignored: [VINEXT_GENERATED_DIR_RE],
+							exclude: [VINEXT_GENERATED_DIR_RE]
+						},
 						cors: {
 							preflightContinue: true,
 							origin: /^https?:\/\/(?:(?:[^:]+\.)?localhost|127\.0\.0\.1|\[::1\])(?::\d+)?$/
@@ -1604,7 +1655,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 } : {},
@@ -1654,7 +1706,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)] : [])] : [];
@@ -1714,8 +1766,10 @@ function vinext(options = {}) {
 					}
 					const appClientInput = { index: VIRTUAL_APP_BROWSER_ENTRY };
 					if (hasPagesDir) appClientInput["vinext-client-entry"] = VIRTUAL_CLIENT_ENTRY;
+					const nitroDevEnvironmentResolve = hasNitroPlugin && env?.command === "serve" ? { resolve: { noExternal: ["next"] } } : {};
 					viteConfig.environments = {
 						rsc: {
+							...nitroDevEnvironmentResolve,
 							...hasCloudflarePlugin || hasNitroPlugin ? {} : { resolve: {
 								external: userSsrExternal === true ? true : [
 									"satori",
@@ -1745,6 +1799,7 @@ function vinext(options = {}) {
 							}
 						},
 						ssr: {
+							...nitroDevEnvironmentResolve,
 							...hasCloudflarePlugin || hasNitroPlugin ? {} : { resolve: {
 								external: userSsrExternal === true ? true : [
 									...userSsrExternal,
@@ -1895,7 +1950,19 @@ function vinext(options = {}) {
 						if (!config.server.middlewareMode) applyDevServerDefaults(config.server, {});
 					}
 				}
-				if (isServeCommand && hasCloudflarePlugin && hasPagesDir && !hasAppDir) suppressOptionalOptimizeDepsWarnings(config.logger);
+				if (isServeCommand && (hasAppDir || hasCloudflarePlugin && hasPagesDir)) {
+					const optionalWarnings = /* @__PURE__ */ new Set();
+					for (const [name, environment] of Object.entries(config.environments)) {
+						const optimizer = environment.optimizeDeps;
+						const optionalIncludes = hasAppDir ? name === "client" && !optimizer.noDiscovery ? APP_CLIENT_OPTIONAL_OPTIMIZE_DEPS_INCLUDE : [] : name !== "client" ? ["use-sync-external-store/with-selector"] : [];
+						for (const id of optionalIncludes) {
+							if (optimizer.include?.includes(id) || optimizer.exclude?.some((excluded) => id === excluded || id.startsWith(`${excluded}/`))) continue;
+							(optimizer.include ??= []).push(id);
+							optionalWarnings.add(`Failed to resolve dependency: ${id}, present in ${name} 'optimizeDeps.include'`);
+						}
+					}
+					Object.assign(config, { logger: createOptionalOptimizeDepsLogger(config.logger, optionalWarnings) });
+				}
 				if (config.worker?.rolldownOptions) {
 					const workerFileNames = `${resolveAssetsDir(nextConfig.assetPrefix ?? "")}/workers/[name]-[hash].js`;
 					const workerOutputs = config.worker.rolldownOptions.output;
@@ -2145,6 +2212,7 @@ function vinext(options = {}) {
 							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,
@@ -2530,21 +2598,9 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				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];
 					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 = () => {
@@ -2841,6 +2897,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);
@@ -3116,7 +3188,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								const apiRouteUrl = stripI18nLocaleForApiRoute(pathname, nextConfig?.i18n ?? null);
 								filePathMatchesPagesRoute = matchRoute(pageRouteUrl, pageRoutes) !== null || matchRoute(apiRouteUrl, apiRoutes) !== null;
 							}
-							if (isFilePathRequest && !isDataReq && !filePathMatchesRewrite && !filePathMatchesPagesRoute && !isExistingPublicMutation) return next();
+							if (isFilePathRequest && !isDataReq && !filePathMatchesRewrite && !filePathMatchesPagesRoute && !isNextStaticPath(pathname, "", assetPrefixPathname(nextConfig?.assetPrefix ?? "")) && !isExistingPublicMutation) return next();
 							const rawHeaders = new Headers(Object.fromEntries(Object.entries(req.headers).filter(([k, v]) => v !== void 0 && !k.startsWith(":")).map(([k, v]) => [k, Array.isArray(v) ? v.join(", ") : String(v)])));
 							const isDataRequest = isDataReq;
 							const nodeRequestHeaders = filterInternalHeaders(rawHeaders);
@@ -3126,7 +3198,8 @@ 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) => {
 								for (const key of Object.keys(req.headers)) delete req.headers[key];
@@ -3137,7 +3210,8 @@ 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);
 								if (hasAppDir && result.continue) {
@@ -3161,6 +3235,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 							const getDevAppRoutes = () => devAppRoutesPromise ??= hasAppDir && appDir ? appRouter(appDir, nextConfig?.pageExtensions, fileMatcher) : Promise.resolve([]);
 							const classifyDevPageRoute = (route) => classifyDevPageFile(route.filePath);
 							const pipelineDeps = {
+								assetPrefix: nextConfig?.assetPrefix,
 								basePath: bp,
 								trailingSlash: nextConfig?.trailingSlash ?? false,
 								i18nConfig: nextConfig?.i18n ?? null,
@@ -3200,7 +3275,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");
@@ -3294,6 +3370,12 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 									const appMatch = matchAppRoute(resolvedPathname, appRoutes);
 									if (appMatch && !pagesRouteHasPriorityOverAppRoute(renderMatch.route, appMatch.route)) return next();
 								}
+								if (!renderMatch && isNextStaticPath(resolvedPathname, "", assetPrefixPathname(nextConfig?.assetPrefix ?? ""))) {
+									const headers = new Headers();
+									forEachStagedHeader((key, value) => headers.append(key, value));
+									await writeWebResponseToNodeRes(res, notFoundStaticAssetResponse(headers));
+									return;
+								}
 								if (!cachedSSRHandler || cachedSSRHandler.routes !== routes) cachedSSRHandler = {
 									routes,
 									handler: createSSRHandler(server, getPagesRunner(), routes, pagesDir, nextConfig?.i18n, fileMatcher, nextConfig?.basePath ?? "", nextConfig?.trailingSlash ?? false, middlewarePath !== null, (nextConfig?.rewrites.beforeFiles.length ?? 0) > 0 || (nextConfig?.rewrites.afterFiles.length ?? 0) > 0 || (nextConfig?.rewrites.fallback.length ?? 0) > 0, nextConfig?.clientTraceMetadata, nextConfig?.htmlLimitedBots, nextConfig?.reactStrictMode === true, nextConfig?.expireTime, nextConfig?.crossOrigin, devBuildId, middlewarePath ? compileClientMiddlewareMatchers(extractMiddlewareMatcherConfig(middlewarePath)) : void 0, classifyDevPageRoute)
@@ -3360,12 +3442,15 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 		{
 			name: "vinext:validate-middleware-exports",
 			enforce: "pre",
-			transform(code, id) {
-				if (!middlewarePath) return null;
-				const modulePath = stripViteModuleQuery(id);
-				if (canonicalize(modulePath) !== canonicalize(middlewarePath)) return null;
-				validateMiddlewareModuleExports(code, modulePath, middlewarePath, isProxyFile(middlewarePath));
-				return null;
+			transform: {
+				filter: { id: { exclude: VIRTUAL_MODULE_ID_RE } },
+				handler(code, id) {
+					if (!middlewarePath) return null;
+					const modulePath = stripViteModuleQuery(id);
+					if (canonicalizePageTransformPath(modulePath) !== canonicalMiddlewarePath) return null;
+					validateMiddlewareModuleExports(code, modulePath, middlewarePath, isProxyFile(middlewarePath));
+					return null;
+				}
 			}
 		},
 		{
@@ -3373,7 +3458,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 			transform: {
 				filter: {
 					id: { exclude: VIRTUAL_MODULE_ID_RE },
-					code: /\bexport\b[\s\S]*\*/
+					code: EXPORT_ALL_CANDIDATE_FILTER
 				},
 				handler(code, id) {
 					if (this.environment?.name !== "client") return null;
@@ -3470,6 +3555,8 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				filter: { code: consumerEnvironmentConditionFilter },
 				handler(code, id) {
 					const scansImports = this.environment.config.build.write === false;
+					const skipsUnobservableFold = scansImports && useNativeTypeofWindowFolding && this.environment.config.isBundled;
+					if (skipsUnobservableFold && !mayFoldChangeScannedImports(code)) return null;
 					const replaceTypeofWindow = !useNativeTypeofWindowFolding || scansImports;
 					const replaceProcessBrowser = scansImports;
 					if (!replaceTypeofWindow && !replaceProcessBrowser) return null;
@@ -3477,12 +3564,13 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					if (toSlash(id).startsWith(cacheDir)) return null;
 					const typeofWindow = getTypeofWindowReplacement(this.environment);
 					const processBrowser = this.environment.config.consumer === "client";
-					const variant = `${replaceTypeofWindow ? typeofWindow : "-"}:${replaceProcessBrowser ? processBrowser : "-"}`;
-					return cachedConsumerConditionTransform(id, code, variant, () => replaceConsumerEnvironmentConditions(code, {
+					const variant = `${replaceTypeofWindow ? typeofWindow : "-"}:${replaceProcessBrowser ? processBrowser : "-"}:${skipsUnobservableFold ? "gated" : "full"}`;
+					return omitUnusedBuildSourcemap(this.environment, cachedConsumerConditionTransform(id, code, variant, () => replaceConsumerEnvironmentConditions(code, {
 						...replaceTypeofWindow ? { typeofWindow } : {},
 						...replaceProcessBrowser ? { processBrowser } : {},
-						pruneUnreachableImports: scansImports
-					}, id));
+						pruneUnreachableImports: scansImports,
+						onlyIfScannedImportsChange: skipsUnobservableFold
+					}, id)));
 				}
 			}
 		},
@@ -3706,6 +3794,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);
@@ -4038,22 +4127,25 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 		}
 	});
 	if (rscPluginPromise) plugins.push(rscPluginPromise);
-	if (earlyAppDirExists) plugins.push(createActionOwnerManifestPlugin({
-		canonicalizeModuleId: canonicalize,
-		async getManager(config) {
-			return (await rscPluginModulePromise)?.getPluginApi(config)?.manager;
-		},
-		getRoutes: () => rscActionOwnerRoutes ?? [],
-		getSharedRoots: () => rscActionOwnerSharedRoots,
-		onComplete() {
-			rscActionOwnerRoutes = null;
-			rscActionOwnerSharedRoots = [];
-		}
-	}));
+	if (earlyAppDirExists) {
+		plugins.push(createActionOwnerManifestPlugin({
+			canonicalizeModuleId: canonicalize,
+			async getManager(config) {
+				return (await rscPluginModulePromise)?.getPluginApi(config)?.manager;
+			},
+			getRoutes: () => rscActionOwnerRoutes ?? [],
+			getSharedRoots: () => rscActionOwnerSharedRoots,
+			onComplete() {
+				rscActionOwnerRoutes = null;
+				rscActionOwnerSharedRoots = [];
+			}
+		}));
+		plugins.push(createScanBuildCssPlugin());
+	}
 	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",
@@ -4091,6 +4183,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;
@@ -4103,13 +4199,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();
 }

package/dist/init-cloudflare.d.ts

@@ -37,7 +37,7 @@ export declare function cssModulesConfigSource(indent?: string): string;
 /** Generate vite.config.ts for App Router */
 export declare function generateAppRouterViteConfig(info?: CloudflareProjectInfo, options?: CloudflareInitOptions, imagesBinding?: string, versionMetadataBinding?: string, serviceBinding?: boolean, assetsBinding?: string, assetsDirectory?: string, hasCssModules?: boolean): string;
 /** Generate vite.config.ts for Pages Router */
-export declare function generatePagesRouterViteConfig(info?: CloudflareProjectInfo, options?: CloudflareInitOptions, imagesBinding?: string, versionMetadataBinding?: string, serviceBinding?: boolean, hasCssModules?: boolean): string;
+export declare function generatePagesRouterViteConfig(info?: CloudflareProjectInfo, options?: CloudflareInitOptions, imagesBinding?: string, versionMetadataBinding?: string, serviceBinding?: boolean, hasCssModules?: boolean, assetsBinding?: string, assetsDirectory?: string): string;
 export declare function updateViteConfigForCssModules(filePath: string, code: string): {
   code: string;
   preservedExistingGenerateScopedName: boolean;