vinext 0.1.8 → 0.2.1

package/dist/index.js

@@ -1,42 +1,46 @@
-import { detectPackageManager } from "./utils/project.js";
+import { detectPackageManager, formatMissingCloudflarePluginError, hasWranglerConfig } from "./utils/project.js";
+import { normalizePathSeparators, stripJsExtension, stripViteModuleQuery } from "./utils/path.js";
 import { normalizePathnameForRouteMatchStrict } from "./routing/utils.js";
 import { escapeRegExp } from "./utils/regex.js";
-import { normalizePathSeparators, stripJsExtension, stripViteModuleQuery } from "./utils/path.js";
 import { buildViteResolveExtensions, createValidFileMatcher, findFileWithExts, normalizeViteResolveExtensions } from "./routing/file-matcher.js";
 import { apiRouter, invalidateRouteCache, matchRoute, pagesRouter } from "./routing/pages-router.js";
-import { INTERNAL_HEADERS, NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_MW_CTX_HEADER, VINEXT_TIMING_HEADER } from "./server/headers.js";
+import { VINEXT_MW_CTX_HEADER } from "./utils/protocol-headers.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 { matchesRewriteSource, proxyExternalRequest } from "./config/config-matchers.js";
 import { isOpenRedirectShaped } from "./server/open-redirect.js";
 import { filterInternalHeaders, normalizeTrailingSlash } from "./server/request-pipeline.js";
 import { findMiddlewareFile, isProxyFile, runMiddleware } from "./server/middleware.js";
+import { extractMiddlewareMatcherConfig, hasExportedName } from "./build/report.js";
 import { generateServerEntry } from "./entries/pages-server-entry.js";
 import { generateClientEntry } from "./entries/pages-client-entry.js";
 import { appRouteGraph, appRouter, invalidateAppRouteCache, matchAppRoute } from "./routing/app-router.js";
 import { findInstrumentationClientFile, findInstrumentationFile, runInstrumentation } from "./server/instrumentation.js";
 import { isUnknownRecord } from "./utils/record.js";
 import { logRequest, now } from "./server/request-log.js";
+import { resolvePagesI18nRequest, stripI18nLocaleForApiRoute } from "./server/pages-i18n.js";
+import { isNextDataPathname, normalizeNextDataPagePathname, parseNextDataPathname } from "./server/pages-data-route.js";
+import { resolveAssetsDir } from "./utils/asset-prefix.js";
 import { createSSRHandler } from "./server/dev-server.js";
 import { handleApiRoute } from "./server/api-handler.js";
 import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, isImageOptimizationPath, resolveDevImageRedirect } from "./server/image-optimization.js";
 import { installSocketErrorBackstop } from "./server/socket-error-backstop.js";
-import { scanMetadataFiles } from "./server/metadata-routes.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";
 import { validateDevRequest } from "./server/dev-origin-check.js";
 import { generateRscEntry } from "./entries/app-rsc-entry.js";
 import { generateSsrEntry } from "./entries/app-ssr-entry.js";
 import { VIRTUAL_CACHE_ADAPTERS, generateCacheAdaptersModule } from "./cache/cache-adapters-virtual.js";
+import { VIRTUAL_IMAGE_ADAPTERS, generateImageAdaptersModule } from "./image/image-adapters-virtual.js";
 import { generateBrowserEntry, isLinkPrefetchRoute, toDocumentOnlyAppRoute, toLinkPrefetchRoute } from "./entries/app-browser-entry.js";
 import { collectRouteClassificationManifest } from "./build/route-classification-manifest.js";
 import { planRouteClassificationInjection } from "./build/route-classification-injector.js";
 import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from "./shims/constants.js";
-import { resolveAssetsDir } from "./utils/asset-prefix.js";
 import { RESOLVED_VIRTUAL_GOOGLE_FONTS, VIRTUAL_GOOGLE_FONTS, createGoogleFontsPlugin, createLocalFontsPlugin, generateGoogleFontsVirtualModule, parseStaticObjectLiteral } from "./plugins/fonts.js";
 import { getDepOptimizeNodeEnvOptions, getViteMajorVersion, serializeViteDefine } from "./utils/vite-version.js";
 import { createRscCompatibilityId, findNextConfigPath, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "./config/next-config.js";
 import { mergeServerExternalPackages } from "./config/server-external-packages.js";
-import { isNextDataPathname, parseNextDataPathname } from "./server/pages-data-route.js";
 import { precompressAssets } from "./build/precompress.js";
 import { ensureAssetsIgnore } from "./build/assets-ignore.js";
 import { emitNextClientRuntimeManifests } from "./build/next-client-runtime-manifests.js";
@@ -49,8 +53,11 @@ import { renderVinextBuiltUrl } from "./utils/built-asset-url.js";
 import { asyncHooksStubPlugin } from "./plugins/async-hooks-stub.js";
 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 { createRscClientReferenceLoadersPlugin } from "./plugins/rsc-client-reference-loaders.js";
+import { createRscReferenceValidationNormalizerPlugin } from "./plugins/rsc-reference-validation-normalizer.js";
 import { createInstrumentationClientTransformPlugin } 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 { validateMiddlewareModuleExports } from "./plugins/middleware-export-validation.js";
@@ -62,12 +69,12 @@ import { generateRouteTypes } from "./typegen.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 { VINEXT_CLIENT_ENTRY_MANIFEST } from "./utils/client-entry-manifest.js";
-import { buildRuntimeGlobalsScript, computeClientRuntimeMetadata } from "./utils/client-runtime-metadata.js";
-import { formatMissingCloudflarePluginError, hasWranglerConfig } from "./deploy.js";
+import { computeClientRuntimeMetadata } from "./utils/client-runtime-metadata.js";
+import { PAGES_CLIENT_ASSETS_MODULE, buildPagesClientAssetsModule, setPagesClientAssetsBuildMetadata, takePagesClientAssetsBuildMetadata, writePagesClientAssetsModuleIfMissing } from "./build/pages-client-assets-module.js";
 import { resolvePostcssStringPlugins } from "./plugins/postcss.js";
-import { buildSassPreprocessorOptions, createSassAwareFileSystemLoader, createSassTildeImporter } from "./plugins/sass.js";
-import { createClientAssetFileNames, createClientCodeSplittingConfig, createClientFileNameConfig, createClientManualChunks, createClientOutputConfig, createRscFrameworkChunkOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfigForVite, withBuildBundlerOptions } from "./build/client-build-config.js";
 import { markCssUrlAssetReferences, restoreDedupedCssAssetReferences } from "./build/css-url-assets.js";
+import { buildSassPreprocessorOptions, createSassAwareFileSystemLoader, createSassCssUrlAssetImporter, createSassTildeImporter } from "./plugins/sass.js";
+import { createClientAssetFileNames, createClientCodeSplittingConfig, createClientFileNameConfig, createClientManualChunks, createClientOutputConfig, createRscFrameworkChunkOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfigForVite, withBuildBundlerOptions } from "./build/client-build-config.js";
 import { hasExportAllCandidate, stripServerExports, validatePageExports } from "./plugins/strip-server-exports.js";
 import { removeConsoleCalls } from "./plugins/remove-console.js";
 import { createImportMetaUrlPlugin } from "./plugins/import-meta-url.js";
@@ -77,6 +84,8 @@ import { createWasmModuleImportPlugin } from "./plugins/wasm-module-import.js";
 import { getTypeofWindowReplacement, replaceTypeofWindow } from "./plugins/typeof-window.js";
 import { hasMdxFiles } from "./utils/mdx-scan.js";
 import { scanPublicFileRoutes } from "./utils/public-routes.js";
+import { createIgnoreDynamicRequestsPlugin } from "./plugins/ignore-dynamic-requests.js";
+import { VINEXT_PRERENDER_CONFIG_PLUGIN_PROPERTY, normalizeVinextPrerenderConfig } from "./config/prerender.js";
 import { staticExportApp, staticExportPages } from "./build/static-export.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
@@ -87,6 +96,18 @@ import { createHash, randomBytes, randomUUID } from "node:crypto";
 import commonjs from "vite-plugin-commonjs";
 import MagicString from "magic-string";
 //#region src/index.ts
+const PAGES_CLOUDFLARE_WORKER_OPTIMIZE_DEPS_EXCLUDE = Object.freeze(["vinext/server/fetch-handler", "vinext/server/pages-router-entry"]);
+const PAGES_CLOUDFLARE_WORKER_OPTIMIZE_DEPS_INCLUDE = Object.freeze([
+	"react",
+	"react-dom",
+	"react-dom/server.edge",
+	"react/jsx-runtime",
+	"react/jsx-dev-runtime",
+	"use-sync-external-store/with-selector"
+]);
+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");
 installSocketErrorBackstop();
 function getCacheDirPrefix(cacheDir) {
 	const normalizedCacheDir = normalizePathSeparators(cacheDir);
@@ -165,6 +186,122 @@ function isVinextOgShimImporter(importer) {
 function toRelativeFileEntry(root, absPath) {
 	return path.relative(root, absPath).split(path.sep).join("/");
 }
+const DEV_PAGES_CLIENT_ENTRY = "/@id/__x00__virtual:vinext-client-entry";
+const STYLESHEET_IMPORT_RE = /\.(?:css|scss|sass)$/i;
+const STYLESHEET_FILE_RE = /\.(?:css|scss|sass)$/i;
+const SCRIPT_IMPORT_RE = /\.(?:[cm]?[jt]sx?)$/i;
+const GLOBAL_NOT_FOUND_CSS_QUERY = "?vinext-global-not-found-css";
+function toMagicStringTransformResult(output) {
+	return {
+		code: output.toString(),
+		map: output.generateMap({ hires: "boundary" })
+	};
+}
+function parserLanguageForScript(id) {
+	const cleanId = stripViteModuleQuery(id).toLowerCase();
+	return cleanId.endsWith(".ts") || cleanId.endsWith(".mts") || cleanId.endsWith(".cts") ? "ts" : "tsx";
+}
+function isStylesheetSpecifier(specifier) {
+	if (specifier.includes("?") || specifier.includes("#")) return false;
+	return STYLESHEET_IMPORT_RE.test(specifier.toLowerCase());
+}
+function isMdxModuleId(id) {
+	return stripViteModuleQuery(id).toLowerCase().endsWith(".mdx");
+}
+function isolateMdxStylesheetImports(code) {
+	const importRe = /(^|[;\n])(\s*import\s*)(["'])([^"'\n;]+)(\3)/g;
+	let output = null;
+	for (const match of code.matchAll(importRe)) {
+		const specifier = match[4];
+		if (!isStylesheetSpecifier(specifier)) continue;
+		const specifierStart = match.index + match[1].length + match[2].length + match[3].length;
+		const specifierEnd = specifierStart + specifier.length;
+		output ??= new MagicString(code);
+		output.overwrite(specifierStart, specifierEnd, specifier + GLOBAL_NOT_FOUND_CSS_QUERY);
+	}
+	return output ? toMagicStringTransformResult(output) : null;
+}
+function isolateGlobalNotFoundStylesheetImports(code, id) {
+	if (isMdxModuleId(id)) return isolateMdxStylesheetImports(code);
+	let ast;
+	try {
+		ast = parseAst(code, { lang: parserLanguageForScript(id) });
+	} catch {
+		return null;
+	}
+	let output = null;
+	for (const statement of ast.body) {
+		if (statement.type !== "ImportDeclaration" || statement.importKind === "type") continue;
+		if (statement.specifiers && statement.specifiers.length > 0) continue;
+		if (statement.attributes && statement.attributes.length > 0) continue;
+		const source = statement.source;
+		const specifier = source?.value;
+		if (typeof specifier !== "string" || !isStylesheetSpecifier(specifier)) continue;
+		const range = source;
+		if (typeof range.start !== "number" || typeof range.end !== "number") continue;
+		output ??= new MagicString(code);
+		output.overwrite(range.start, range.end, JSON.stringify(specifier + GLOBAL_NOT_FOUND_CSS_QUERY));
+	}
+	return output ? toMagicStringTransformResult(output) : null;
+}
+function isScriptModuleId(id) {
+	return SCRIPT_IMPORT_RE.test(stripViteModuleQuery(id).toLowerCase());
+}
+function skipCommonjsForLocalCjs(id) {
+	const cleanId = normalizePathSeparators(stripViteModuleQuery(id));
+	return /\.c[jt]s$/i.test(cleanId) && !cleanId.includes("node_modules") ? false : void 0;
+}
+function hasOnlyTypeSpecifiers(statement) {
+	return statement.specifiers !== void 0 && statement.specifiers.length > 0 && statement.specifiers.every((specifier) => specifier.importKind === "type" || specifier.exportKind === "type");
+}
+function resolvedStylesheetToDevManifestAsset(root, resolvedId) {
+	const cleanId = stripViteModuleQuery(resolvedId);
+	if (!path.isAbsolute(cleanId)) return null;
+	const rootForRelative = tryRealpathSync(root) ?? root;
+	const fileForRelative = tryRealpathSync(cleanId) ?? cleanId;
+	const relativePath = path.relative(rootForRelative, fileForRelative);
+	if (relativePath !== "" && !relativePath.startsWith("..") && !path.isAbsolute(relativePath)) return normalizePathSeparators(relativePath);
+	return `@fs/${normalizePathSeparators(cleanId).replace(/^\/+/, "")}`;
+}
+async function collectDevPagesAppStylesheetAssets(root, appFilePath, resolve) {
+	const stylesheetAssets = [];
+	const seenAssets = /* @__PURE__ */ new Set();
+	const seenModules = /* @__PURE__ */ new Set();
+	async function visitModule(modulePath) {
+		const cleanModulePath = stripViteModuleQuery(modulePath);
+		if (!path.isAbsolute(cleanModulePath) || !fs.existsSync(cleanModulePath)) return;
+		if (seenModules.has(cleanModulePath)) return;
+		seenModules.add(cleanModulePath);
+		let ast;
+		try {
+			ast = parseAst(fs.readFileSync(cleanModulePath, "utf-8"), { lang: parserLanguageForScript(cleanModulePath) });
+		} catch {
+			return;
+		}
+		for (const statement of ast.body) {
+			if (statement.type !== "ImportDeclaration" && statement.type !== "ExportNamedDeclaration" && statement.type !== "ExportAllDeclaration") continue;
+			if (statement.importKind === "type") continue;
+			if (statement.exportKind === "type") continue;
+			if (hasOnlyTypeSpecifiers(statement)) continue;
+			if (statement.attributes && statement.attributes.length > 0) continue;
+			const specifier = statement.source?.value;
+			if (typeof specifier !== "string") continue;
+			const resolved = await resolve(specifier, cleanModulePath, { skipSelf: true });
+			if (!resolved?.id) continue;
+			if (isStylesheetSpecifier(specifier)) {
+				const asset = resolvedStylesheetToDevManifestAsset(root, resolved.id);
+				if (!asset || seenAssets.has(asset)) continue;
+				seenAssets.add(asset);
+				stylesheetAssets.push(asset);
+				continue;
+			}
+			if (specifier.includes("?") || specifier.includes("#")) continue;
+			if (isScriptModuleId(resolved.id)) await visitModule(resolved.id);
+		}
+	}
+	await visitModule(appFilePath);
+	return stylesheetAssets;
+}
 const TSCONFIG_FILES = ["tsconfig.json", "jsconfig.json"];
 function resolveTsconfigPathCandidate(candidate) {
 	const candidates = candidate.endsWith(".json") ? [candidate] : [
@@ -235,6 +372,20 @@ function toViteAliasReplacement(absolutePath, projectRoot) {
 	}
 	return normalizedPath;
 }
+function resolveSwcHelpersAlias(root) {
+	const rootRequire = createRequire(path.join(root, "package.json"));
+	const resolvers = [];
+	try {
+		const nextPackageJson = rootRequire.resolve("next/package.json");
+		const realNextPackageJson = tryRealpathSync(nextPackageJson) ?? nextPackageJson;
+		resolvers.push(createRequire(realNextPackageJson));
+	} catch {}
+	resolvers.push(rootRequire, createRequire(import.meta.url));
+	for (const resolver of resolvers) try {
+		const packageJsonPath = resolver.resolve("@swc/helpers/package.json");
+		return normalizePathSeparators(path.join(path.dirname(packageJsonPath), "_"));
+	} catch {}
+}
 function loadTsconfigPathAliases(configPath, projectRoot, seen = /* @__PURE__ */ new Set()) {
 	const normalizedPath = tryRealpathSync(configPath) ?? configPath;
 	if (seen.has(normalizedPath)) return {};
@@ -285,6 +436,22 @@ function getVinextVersion() {
 	}
 	return _vinextVersionCache;
 }
+function mergeStringArrayValues(value, additions) {
+	return [...new Set([...value === void 0 ? [] : Array.isArray(value) ? value : [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);
+	};
+	marker[VINEXT_FILTERED_OPTIMIZE_DEPS_WARN] = true;
+}
 const _tsconfigAliasCache = /* @__PURE__ */ new Map();
 function resolveTsconfigAliases(projectRoot) {
 	if (_tsconfigAliasCache.has(projectRoot)) return _tsconfigAliasCache.get(projectRoot);
@@ -298,10 +465,14 @@ function resolveTsconfigAliases(projectRoot) {
 	_tsconfigAliasCache.set(projectRoot, aliases);
 	return aliases;
 }
+const VIRTUAL_WORKER_ENTRY = "virtual:vinext-worker-entry";
+const RESOLVED_WORKER_ENTRY = "\0virtual:vinext-worker-entry";
 const VIRTUAL_SERVER_ENTRY = "virtual:vinext-server-entry";
 const RESOLVED_SERVER_ENTRY = "\0virtual:vinext-server-entry";
 const VIRTUAL_CLIENT_ENTRY = "virtual:vinext-client-entry";
 const RESOLVED_CLIENT_ENTRY = "\0virtual:vinext-client-entry";
+const VIRTUAL_PAGES_CLIENT_ASSETS = "virtual:vinext-pages-client-assets";
+const RESOLVED_PAGES_CLIENT_ASSETS = "\0virtual:vinext-pages-client-assets";
 const VIRTUAL_RSC_ENTRY = "virtual:vinext-rsc-entry";
 const RESOLVED_RSC_ENTRY = "\0virtual:vinext-rsc-entry";
 const VIRTUAL_APP_SSR_ENTRY = "virtual:vinext-app-ssr-entry";
@@ -313,6 +484,8 @@ const RESOLVED_APP_CAPABILITIES = "\0virtual:vinext-app-capabilities";
 const RESOLVED_ROOT_PARAMS = "\0virtual:vinext-root-params";
 /** Virtual module that registers config-driven cache adapters (see VinextOptions.cache). */
 const RESOLVED_CACHE_ADAPTERS = "\0" + VIRTUAL_CACHE_ADAPTERS;
+/** Virtual module that registers the config-driven image optimizer (see VinextOptions.images). */
+const RESOLVED_IMAGE_ADAPTERS = "\0" + VIRTUAL_IMAGE_ADAPTERS;
 /** Virtual module for composed instrumentation-client bootstrap. */
 const VIRTUAL_INSTRUMENTATION_CLIENT = "private-next-instrumentation-client";
 const RESOLVED_INSTRUMENTATION_CLIENT = `${VIRTUAL_INSTRUMENTATION_CLIENT}.mjs`;
@@ -338,9 +511,11 @@ function createStaticImageAsset(imagePath) {
 * the `id.startsWith(_shimsDir)` checks would never match.
 */
 const _shimsDir = normalizePathSeparators(path.resolve(__dirname, "shims")) + "/";
+const _serverDir = normalizePathSeparators(path.resolve(__dirname, "server"));
 const _fontGoogleShimPath = resolveShimModulePath(_shimsDir, "font-google");
-const _appBrowserServerActionClientPath = resolveShimModulePath(normalizePathSeparators(path.resolve(__dirname, "server")), "app-browser-server-action-client");
-const _appRscHandlerPath = resolveShimModulePath(normalizePathSeparators(path.resolve(__dirname, "server")), "app-rsc-handler");
+const _appBrowserServerActionClientPath = resolveShimModulePath(_serverDir, "app-browser-server-action-client");
+const _appRscHandlerPath = resolveShimModulePath(_serverDir, "app-rsc-handler");
+const _pagesClientAssetsPath = resolveShimModulePath(_serverDir, "pages-client-assets");
 const _canExternalizeAppRscHandler = _appRscHandlerPath.endsWith(".js");
 function isValidExportIdentifier(name) {
 	return /^[$A-Z_a-z][$\w]*$/.test(name);
@@ -440,6 +615,7 @@ function getClientOutputConfigForVite(viteMajorVersion, assetsDir, preserveAppRo
 	} : createClientOutputConfig(manualChunks, assetsDir);
 }
 function vinext(options = {}) {
+	const prerenderConfig = normalizeVinextPrerenderConfig(options.prerender);
 	const viteMajorVersion = getViteMajorVersion();
 	let root;
 	let pagesDir;
@@ -453,10 +629,15 @@ function vinext(options = {}) {
 	let instrumentationPath = null;
 	let instrumentationClientPath = null;
 	let clientInjectModule = null;
+	let globalNotFoundCssIsolationPath = null;
 	let clientAssetsInlineLimit = 0;
 	let hasCloudflarePlugin = false;
 	let warnedInlineNextConfigOverride = false;
 	let hasNitroPlugin = false;
+	let isServeCommand = false;
+	let pagesOptimizeEntries = [];
+	const pagesClientAssetsOutputDirs = /* @__PURE__ */ new Set();
+	let pagesClientAssetsModule = null;
 	let rscCompatibilityId;
 	const draftModeSecret = randomUUID();
 	const sassComposesLoader = createSassAwareFileSystemLoader();
@@ -502,7 +683,9 @@ function vinext(options = {}) {
 		const appPrefetchRoutes = hasAppDir ? (await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher)).map((route) => isLinkPrefetchRoute(route) ? toLinkPrefetchRoute(route) : toDocumentOnlyAppRoute(route)) : [];
 		return generateClientEntry(pagesDir, nextConfig, fileMatcher, {
 			appPrefetchRoutes,
-			instrumentationClientPath
+			instrumentationClientPath,
+			middlewareMatcher: middlewarePath ? extractMiddlewareMatcherConfig(middlewarePath) : void 0,
+			reactPreamble: options.react !== false
 		});
 	}
 	async function writeRouteTypes() {
@@ -592,8 +775,26 @@ function vinext(options = {}) {
 	}
 	const plugins = [
 		...viteMajorVersion >= 8 ? [] : [loadVite7TsconfigPathsPlugin(earlyBaseDir)],
+		createStyledJsxPlugin(earlyBaseDir),
 		reactPluginPromise,
-		commonjs(),
+		createIgnoreDynamicRequestsPlugin(() => nextConfig?.turbopackTranspilePackages ?? []),
+		commonjs({ filter: skipCommonjsForLocalCjs }),
+		{
+			name: "vinext:global-not-found-css-isolation",
+			apply: "build",
+			enforce: "pre",
+			transform: {
+				filter: {
+					id: /(?:^|[/\\])global-not-found(?:\.[^./?\\]+)+(?:\?.*)?$/,
+					code: /\.(?:css|scss|sass)['"]/
+				},
+				handler(code, id) {
+					const cleanId = normalizePathSeparators(stripViteModuleQuery(id));
+					if (!globalNotFoundCssIsolationPath || canonicalize(cleanId) !== canonicalize(globalNotFoundCssIsolationPath)) return null;
+					return isolateGlobalNotFoundStylesheetImports(code, cleanId);
+				}
+			}
+		},
 		...viteMajorVersion >= 8 ? [{
 			name: "vinext:jsx-in-js",
 			enforce: "pre",
@@ -628,14 +829,18 @@ function vinext(options = {}) {
 			serverOnlyShimPath: resolveShimModulePath(shimsDir, "server-only")
 		}),
 		dataUrlCssPlugin(),
+		createCssModuleImportCompatibilityPlugin(),
 		{
 			name: "vinext:config",
 			enforce: "pre",
+			[VINEXT_PRERENDER_CONFIG_PLUGIN_PROPERTY]: prerenderConfig,
 			async config(config, env) {
+				isServeCommand = env.command === "serve";
 				root = normalizePathSeparators(config.root ?? process.cwd());
 				const userResolve = config.resolve;
 				const shouldEnableNativeTsconfigPaths = viteMajorVersion >= 8 && userResolve?.tsconfigPaths === void 0;
 				const tsconfigPathAliases = resolveTsconfigAliases(root);
+				const swcHelpersAlias = resolveSwcHelpersAlias(root);
 				const mode = env?.mode ?? "development";
 				const dotenvVars = loadEnv(mode, config.envDir ?? root, "");
 				for (const [key, value] of Object.entries(dotenvVars)) if (process.env[key] === void 0) process.env[key] = value;
@@ -683,6 +888,7 @@ function vinext(options = {}) {
 					rscCompatibilityId = sharedRscCompatibilityId && sharedRscCompatibilityId.length > 0 ? sharedRscCompatibilityId : createRscCompatibilityId(nextConfig);
 				}
 				fileMatcher = createValidFileMatcher(nextConfig.pageExtensions);
+				globalNotFoundCssIsolationPath = env?.command === "build" && nextConfig.globalNotFound ? findFileWithExts(appDir, "global-not-found", fileMatcher) : null;
 				instrumentationPath = findInstrumentationFile(root, fileMatcher);
 				instrumentationClientPath = findInstrumentationClientFile(root, fileMatcher);
 				const middlewareConventionDir = canonicalize(baseDir) === canonicalize(path.posix.join(root, "src")) ? path.posix.join(root, "src") : root;
@@ -701,6 +907,7 @@ function vinext(options = {}) {
 				}
 				defines["process.env.__NEXT_ROUTER_BASEPATH"] = JSON.stringify(nextConfig.basePath);
 				defines["process.env.__VINEXT_HAS_PAGES_ROUTER"] = JSON.stringify(String(hasPagesDir));
+				defines["process.env.__NEXT_CLIENT_ROUTER_DYNAMIC_STALETIME"] = JSON.stringify(String(nextConfig.staleTimes.dynamic));
 				defines["process.env.__NEXT_CLIENT_ROUTER_STATIC_STALETIME"] = JSON.stringify(String(nextConfig.staleTimes.static));
 				defines["process.env.__VINEXT_PREFETCH_INLINING"] = JSON.stringify(nextConfig.prefetchInlining ? "true" : "false");
 				defines["process.env.__NEXT_GESTURE_TRANSITION"] = JSON.stringify(nextConfig.gestureTransition);
@@ -736,6 +943,7 @@ function vinext(options = {}) {
 				}
 				defines["process.env.__VINEXT_IMAGE_DANGEROUSLY_ALLOW_SVG"] = JSON.stringify(String(nextConfig.images?.dangerouslyAllowSVG ?? false));
 				defines["process.env.__VINEXT_IMAGE_DANGEROUSLY_ALLOW_LOCAL_IP"] = JSON.stringify(String(nextConfig.images?.dangerouslyAllowLocalIP ?? false));
+				defines["process.env.__VINEXT_IMAGE_UNOPTIMIZED"] = JSON.stringify(String(nextConfig.images?.unoptimized === true));
 				defines["process.env.__VINEXT_BUILD_ID"] = JSON.stringify(nextConfig.buildId);
 				defines["process.env.__VINEXT_RSC_COMPATIBILITY_ID"] = JSON.stringify(rscCompatibilityId);
 				defines["process.env.__VINEXT_DEPLOYMENT_ID"] = JSON.stringify(nextConfig.deploymentId ?? "");
@@ -802,7 +1010,7 @@ function vinext(options = {}) {
 					"vinext/cache": path.resolve(__dirname, "cache"),
 					"vinext/instrumentation": path.resolve(__dirname, "server", "instrumentation"),
 					"vinext/instrumentation-client": path.resolve(__dirname, "client", "instrumentation-client"),
-					"vinext/dev-error-overlay": path.resolve(__dirname, "server", "dev-error-overlay"),
+					"vinext/dev-error-overlay": path.resolve(__dirname, "client", "dev-error-overlay"),
 					"vinext/html": path.resolve(__dirname, "server", "html"),
 					...clientInjectModule === null ? { "private-next-instrumentation-client": instrumentationClientPath ?? INSTRUMENTATION_CLIENT_EMPTY_MODULE } : {}
 				}).flatMap(([k, v]) => k.startsWith("next/") ? [[k, v], [`${k}.js`, v]] : [[k, v]]));
@@ -820,7 +1028,8 @@ function vinext(options = {}) {
 				hasUserMdxPlugin = pluginsFlat.some((p) => p && typeof p === "object" && "name" in p && typeof p.name === "string" && (p.name === "@mdx-js/rollup" || p.name === "mdx"));
 				if (!hasUserMdxPlugin && hasMdxFiles(root, hasAppDir ? appDir : null, hasPagesDir ? pagesDir : null)) await ensureMdxDelegate("detected");
 				const isSSR = !!config.build?.ssr;
-				const nextServerExternal = mergeServerExternalPackages(nextConfig?.serverExternalPackages, nextConfig?.transpilePackages);
+				const serverTranspilePackages = [...nextConfig?.turbopackTranspilePackages ?? [], ...nextConfig?.optimizePackageImports ?? []];
+				const nextServerExternal = mergeServerExternalPackages(nextConfig?.serverExternalPackages, serverTranspilePackages);
 				const isMultiEnv = hasAppDir || hasCloudflarePlugin || hasNitroPlugin;
 				const hasBuildInput = getBuildBundlerOptions(config.build)?.input !== void 0;
 				const shouldInjectPlainPagesEnvironments = !hasAppDir && !hasCloudflarePlugin && !isSSR && !hasBuildInput;
@@ -879,9 +1088,11 @@ function vinext(options = {}) {
 					} },
 					resolve: {
 						alias: {
+							...swcHelpersAlias ? { "@swc/helpers/_": swcHelpersAlias } : {},
 							...tsconfigPathAliases,
 							...nextConfig.aliases,
-							...nextShimMap
+							...nextShimMap,
+							"vinext/server/pages-client-assets": _pagesClientAssetsPath
 						},
 						dedupe: [
 							"react",
@@ -891,7 +1102,13 @@ function vinext(options = {}) {
 						],
 						...shouldEnableNativeTsconfigPaths ? { tsconfigPaths: true } : {}
 					},
-					...viteMajorVersion >= 8 ? { oxc: { jsx: { runtime: "automatic" } } } : { esbuild: { jsx: "automatic" } },
+					...viteMajorVersion >= 8 ? { oxc: {
+						jsx: { runtime: "automatic" },
+						typescript: { onlyRemoveTypeImports: false }
+					} } : { esbuild: {
+						jsx: "automatic",
+						tsconfigRaw: { compilerOptions: { verbatimModuleSyntax: false } }
+					} },
 					define: defines,
 					...nextConfig.basePath ? { base: nextConfig.basePath + "/" } : {},
 					...nextConfig.assetPrefix || nextConfig.deploymentId ? { experimental: { renderBuiltUrl: (filename, context) => renderVinextBuiltUrl(filename, nextConfig.assetPrefix, nextConfig.deploymentId, context.hostType) } } : {},
@@ -906,9 +1123,19 @@ function vinext(options = {}) {
 						...postcssOverride ? { postcss: postcssOverride } : {},
 						preprocessorOptions: (() => {
 							const tildeImporter = createSassTildeImporter(root);
+							const cssUrlAssetImporter = env.command === "build" ? createSassCssUrlAssetImporter() : null;
+							const userAdditionalData = sassPreprocessorOptions?.additionalData;
 							const baseOpts = {
 								...sassPreprocessorOptions,
-								importers: [tildeImporter, ...sassPreprocessorOptions?.importers ?? []]
+								...cssUrlAssetImporter ? { additionalData: async (source, filename) => {
+									const withUserData = typeof userAdditionalData === "function" ? await userAdditionalData(source, filename) : typeof userAdditionalData === "string" ? `${userAdditionalData}${source}` : source;
+									return cssUrlAssetImporter.rewriteImports(withUserData, filename);
+								} } : {},
+								importers: [
+									tildeImporter,
+									...cssUrlAssetImporter ? [cssUrlAssetImporter] : [],
+									...sassPreprocessorOptions?.importers ?? []
+								]
 							};
 							return {
 								scss: baseOpts,
@@ -939,7 +1166,7 @@ function vinext(options = {}) {
 						plugins: [depOptimizeAliasPlugin]
 					}
 				};
-				const pagesOptimizeEntries = !hasAppDir ? [...hasPagesDir ? [toRelativeFileEntry(root, pagesDir) + "/**/*.{tsx,ts,jsx,js}"] : [], ...[instrumentationPath, instrumentationClientPath].flatMap((entry) => entry ? [toRelativeFileEntry(root, entry)] : [])] : [];
+				pagesOptimizeEntries = !hasAppDir ? [...hasPagesDir ? [toRelativeFileEntry(root, pagesDir) + "/**/*.{tsx,ts,jsx,js}"] : [], ...[instrumentationPath, instrumentationClientPath].flatMap((entry) => entry ? [toRelativeFileEntry(root, entry)] : [])] : [];
 				if (hasAppDir) {
 					const appEntries = [`${path.relative(root, appDir)}/**/*.{tsx,ts,jsx,js}`];
 					const explicitInstrumentationEntries = [instrumentationPath, instrumentationClientPath].flatMap((entry) => entry ? [toRelativeFileEntry(root, entry)] : []);
@@ -1003,7 +1230,8 @@ function vinext(options = {}) {
 									"react-dom/client",
 									"react/jsx-runtime",
 									"react/jsx-dev-runtime"
-								])]
+								])],
+								...depOptimizeNodeEnvOptions
 							},
 							build: {
 								manifest: true,
@@ -1019,7 +1247,10 @@ function vinext(options = {}) {
 					};
 				} else if (hasCloudflarePlugin) viteConfig.environments = { client: {
 					consumer: "client",
-					optimizeDeps: pagesOptimizeEntries.length > 0 ? { entries: pagesOptimizeEntries } : void 0,
+					optimizeDeps: {
+						...pagesOptimizeEntries.length > 0 ? { entries: pagesOptimizeEntries } : {},
+						...depOptimizeNodeEnvOptions
+					},
 					build: {
 						manifest: true,
 						ssrManifest: true,
@@ -1034,7 +1265,10 @@ function vinext(options = {}) {
 				else if (shouldInjectPlainPagesEnvironments) viteConfig.environments = {
 					client: {
 						consumer: "client",
-						optimizeDeps: pagesOptimizeEntries.length > 0 ? { entries: pagesOptimizeEntries } : void 0,
+						optimizeDeps: {
+							...pagesOptimizeEntries.length > 0 ? { entries: pagesOptimizeEntries } : {},
+							...depOptimizeNodeEnvOptions
+						},
 						build: {
 							outDir: "dist/client",
 							manifest: true,
@@ -1078,6 +1312,12 @@ function vinext(options = {}) {
 				return viteConfig;
 			},
 			configEnvironment(name, config) {
+				if (isServeCommand && hasCloudflarePlugin && hasPagesDir && !hasAppDir && name !== "client") {
+					config.optimizeDeps ??= {};
+					config.optimizeDeps.entries = mergeStringArrayValues(config.optimizeDeps.entries, pagesOptimizeEntries);
+					config.optimizeDeps.include = mergeStringArrayValues(config.optimizeDeps.include, PAGES_CLOUDFLARE_WORKER_OPTIMIZE_DEPS_INCLUDE);
+					config.optimizeDeps.exclude = mergeOptimizeDepsExclude(config.optimizeDeps.exclude ?? [], VINEXT_OPTIMIZE_DEPS_EXCLUDE, PAGES_CLOUDFLARE_WORKER_OPTIMIZE_DEPS_EXCLUDE);
+				}
 				const configuredExtensions = name === "client" ? nextConfig.resolveExtensions : nextConfig.serverResolveExtensions;
 				const extensions = configuredExtensions === null ? buildViteResolveExtensions(nextConfig.pageExtensions, config.resolve?.extensions) : normalizeViteResolveExtensions(configuredExtensions);
 				config.resolve ??= {};
@@ -1087,6 +1327,7 @@ function vinext(options = {}) {
 			async configResolved(config) {
 				const cacheDirPrefix = getCacheDirPrefix(config.cacheDir);
 				typeofWindowIdFilter.exclude = new RegExp(`^${escapeRegExp(cacheDirPrefix)}`);
+				if (isServeCommand && hasCloudflarePlugin && hasPagesDir && !hasAppDir) suppressOptionalOptimizeDepsWarnings(config.logger);
 				sassComposesLoader.setResolvedConfig(config);
 				if (config.command === "build" && hasAppDir && hasPagesDir) {
 					const [appRoutes, pageRoutes, apiRoutes] = await Promise.all([
@@ -1135,6 +1376,8 @@ function vinext(options = {}) {
 					}
 					if (isVercelOgImport(cleanId) && !isVinextOgShimImporter(importer)) return resolveShimModulePath(_shimsDir, "og");
 					if (cleanId.startsWith("vinext/shims/")) return resolveShimModulePath(_shimsDir, stripJsExtension(stripViteModuleQuery(cleanId.slice(13))));
+					if (cleanId === VIRTUAL_WORKER_ENTRY) return RESOLVED_WORKER_ENTRY;
+					if (cleanId.endsWith("/virtual:vinext-worker-entry")) return RESOLVED_WORKER_ENTRY;
 					if (cleanId === VIRTUAL_SERVER_ENTRY) return RESOLVED_SERVER_ENTRY;
 					if (cleanId === VIRTUAL_CLIENT_ENTRY) return RESOLVED_CLIENT_ENTRY;
 					if (cleanId.endsWith("/virtual:vinext-server-entry")) return RESOLVED_SERVER_ENTRY;
@@ -1145,6 +1388,7 @@ function vinext(options = {}) {
 					if (cleanId === VIRTUAL_APP_CAPABILITIES) return RESOLVED_APP_CAPABILITIES;
 					if (cleanId === "next/root-params" || cleanId === "next/root-params.js") return RESOLVED_ROOT_PARAMS;
 					if (cleanId === "virtual:vinext-cache-adapters" || cleanId.endsWith("/virtual:vinext-cache-adapters")) return RESOLVED_CACHE_ADAPTERS;
+					if (cleanId === "virtual:vinext-image-adapters" || cleanId.endsWith("/virtual:vinext-image-adapters")) return RESOLVED_IMAGE_ADAPTERS;
 					if (cleanId.startsWith("virtual:vinext-google-fonts?")) return RESOLVED_VIRTUAL_GOOGLE_FONTS + cleanId.slice(VIRTUAL_GOOGLE_FONTS.length);
 					if (cleanId.endsWith("/virtual:vinext-rsc-entry")) return RESOLVED_RSC_ENTRY;
 					if (cleanId.endsWith("/virtual:vinext-app-ssr-entry")) return RESOLVED_APP_SSR_ENTRY;
@@ -1158,14 +1402,28 @@ function vinext(options = {}) {
 				}
 			},
 			async load(id) {
+				if (id === RESOLVED_WORKER_ENTRY) return `export { default } from ${JSON.stringify(hasAppDir ? "vinext/server/app-router-entry" : "vinext/server/pages-router-entry")};`;
 				if (id === RESOLVED_SERVER_ENTRY) return await generateServerEntry$1();
 				if (id === RESOLVED_CLIENT_ENTRY) return await generateClientEntry$1();
+				if (id === RESOLVED_PAGES_CLIENT_ASSETS) {
+					const metadata = { clientEntry: DEV_PAGES_CLIENT_ENTRY };
+					const ssrManifest = {};
+					const appFilePath = findFileWithExts(pagesDir, "_app", fileMatcher);
+					const pagesRoutes = await pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
+					const moduleFilePaths = [...appFilePath ? [appFilePath] : [], ...pagesRoutes.map((route) => route.filePath)];
+					for (const moduleFilePath of moduleFilePaths) {
+						const stylesheetAssets = await collectDevPagesAppStylesheetAssets(root, moduleFilePath, this.resolve.bind(this));
+						if (stylesheetAssets.length > 0) ssrManifest[normalizePathSeparators(moduleFilePath)] = stylesheetAssets;
+					}
+					if (Object.keys(ssrManifest).length > 0) metadata.ssrManifest = ssrManifest;
+					return `export default ${JSON.stringify(metadata)};`;
+				}
 				if (id === RESOLVED_RSC_ENTRY && hasAppDir) {
 					const routes = await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher);
 					const metaRoutes = scanMetadataFiles(appDir);
 					const hasServerActions = await resolveHasServerActions(this.environment.config);
 					const globalErrorPath = findFileWithExts(appDir, "global-error", fileMatcher);
-					const globalNotFoundPath = findFileWithExts(appDir, "global-not-found", fileMatcher);
+					const globalNotFoundPath = nextConfig?.globalNotFound ? findFileWithExts(appDir, "global-not-found", fileMatcher) : null;
 					rscClassificationManifest = collectRouteClassificationManifest(routes);
 					return generateRscEntry(appDir, routes, middlewarePath, metaRoutes, globalErrorPath, nextConfig?.basePath, nextConfig?.trailingSlash, {
 						redirects: nextConfig?.redirects,
@@ -1182,13 +1440,19 @@ function vinext(options = {}) {
 						reactMaxHeadersLength: nextConfig?.reactMaxHeadersLength,
 						cacheMaxMemorySize: nextConfig?.cacheMaxMemorySize,
 						inlineCss: nextConfig?.inlineCss,
+						globalNotFound: nextConfig?.globalNotFound,
 						cacheComponents: nextConfig?.cacheComponents,
+						prefetchInlining: nextConfig?.prefetchInlining,
 						hasServerActions,
 						i18n: nextConfig?.i18n,
 						imageConfig: {
 							deviceSizes: nextConfig?.images?.deviceSizes,
 							imageSizes: nextConfig?.images?.imageSizes,
-							qualities: nextConfig?.images?.qualities
+							qualities: nextConfig?.images?.qualities,
+							dangerouslyAllowSVG: nextConfig?.images?.dangerouslyAllowSVG,
+							dangerouslyAllowLocalIP: nextConfig?.images?.dangerouslyAllowLocalIP,
+							contentDispositionType: nextConfig?.images?.contentDispositionType,
+							contentSecurityPolicy: nextConfig?.images?.contentSecurityPolicy
 						},
 						hasPagesDir,
 						publicFiles: scanPublicFileRoutes(root),
@@ -1198,6 +1462,7 @@ function vinext(options = {}) {
 				}
 				if (id === RESOLVED_ROOT_PARAMS) return generateRootParamsModule((hasAppDir ? await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher) : []).flatMap((route) => route.rootParamNames ?? []));
 				if (id === RESOLVED_CACHE_ADAPTERS) return generateCacheAdaptersModule(options.cache);
+				if (id === RESOLVED_IMAGE_ADAPTERS) return generateImageAdaptersModule(options.images);
 				if (id === RESOLVED_APP_SSR_ENTRY && hasAppDir) return generateSsrEntry(hasPagesDir);
 				if (id === RESOLVED_APP_BROWSER_ENTRY && hasAppDir) {
 					const graph = await appRouteGraph(appDir, nextConfig?.pageExtensions, fileMatcher);
@@ -1257,6 +1522,28 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				}
 			}
 		},
+		{
+			name: "vinext:pages-client-assets-resolver",
+			sharedDuringBuild: true,
+			resolveId: {
+				filter: { id: /virtual:vinext-pages-client-assets$/ },
+				handler(id) {
+					const cleanId = normalizePathSeparators(id.startsWith("\0") ? id.slice(1) : id);
+					if (cleanId !== VIRTUAL_PAGES_CLIENT_ASSETS && !cleanId.endsWith("/virtual:vinext-pages-client-assets")) return;
+					if (this.environment?.config.command !== "build") return RESOLVED_PAGES_CLIENT_ASSETS;
+					const buildRoot = this.environment.config.root ?? process.cwd();
+					const environmentOutDir = path.resolve(buildRoot, this.environment.config.build.outDir);
+					const sidecarDir = !hasAppDir && this.environment.name === "ssr" ? path.dirname(environmentOutDir) : environmentOutDir;
+					let externalId = normalizePathSeparators(path.relative(environmentOutDir, path.join(sidecarDir, PAGES_CLIENT_ASSETS_MODULE)));
+					if (!externalId.startsWith(".")) externalId = `./${externalId}`;
+					pagesClientAssetsOutputDirs.add(sidecarDir);
+					return {
+						id: externalId,
+						external: true
+					};
+				}
+			}
+		},
 		{
 			name: "vinext:css-url-assets-mark",
 			enforce: "pre",
@@ -1277,11 +1564,14 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 			}
 		},
 		{
-			name: "vinext:client-css-url-assets-defaults",
+			name: "vinext:css-url-assets-defaults",
 			apply: "build",
-			configEnvironment(name) {
-				if (name !== "client") return null;
-				return { build: { assetsInlineLimit: clientAssetsInlineLimit } };
+			configEnvironment(name, config) {
+				if (name === "client") return { build: { assetsInlineLimit: clientAssetsInlineLimit } };
+				if (!hasAppDir || name !== "rsc" && name !== "ssr") return null;
+				const output = getBuildBundlerOptions(config.build)?.output;
+				if (Array.isArray(output) || output?.assetFileNames !== void 0) return null;
+				return { build: { ...withBuildBundlerOptions(viteMajorVersion, { output: { assetFileNames: createClientAssetFileNames(resolveAssetsDir(nextConfig.assetPrefix ?? "")) } }) } };
 			}
 		},
 		{
@@ -1364,6 +1654,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				}
 			}
 		},
+		createCssModuleImportCompatibilityPlugin({ compiledMdx: true }),
 		{
 			name: "vinext:react-canary",
 			enforce: "pre",
@@ -1398,7 +1689,32 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 		{
 			name: "vinext:pages-router",
 			hotUpdate(options) {
-				if (!hasPagesDir || hasAppDir) return;
+				if (!hasPagesDir) return;
+				const isPagesAppFile = (filePath) => {
+					const relativePath = normalizePathSeparators(path.relative(pagesDir, filePath));
+					return !relativePath.includes("/") && relativePath.startsWith("_app.") && fileMatcher.extensionRegex.test(filePath);
+				};
+				const isPotentialPagesAssetGraphScript = (filePath) => {
+					const cleanPath = stripViteModuleQuery(filePath);
+					if (!path.isAbsolute(cleanPath)) return false;
+					if (!isScriptModuleId(cleanPath) || cleanPath.endsWith(".d.ts")) return false;
+					const relativeRootPath = normalizePathSeparators(path.relative(root, cleanPath));
+					if (relativeRootPath.startsWith("..") || path.isAbsolute(relativeRootPath)) return false;
+					if (relativeRootPath.includes("/node_modules/") || relativeRootPath.startsWith("node_modules/")) return false;
+					const relativeAppPath = normalizePathSeparators(path.relative(appDir, cleanPath));
+					return relativeAppPath.startsWith("..") || path.isAbsolute(relativeAppPath);
+				};
+				const pagesAppChanged = isPagesAppFile(options.file);
+				const pagesAssetGraphScriptChanged = isPotentialPagesAssetGraphScript(options.file);
+				if (pagesAppChanged || STYLESHEET_FILE_RE.test(options.file) || pagesAssetGraphScriptChanged) for (const env of Object.values(options.server.environments)) {
+					const mod = env.moduleGraph.getModuleById(RESOLVED_PAGES_CLIENT_ASSETS);
+					if (mod) env.moduleGraph.invalidateModule(mod);
+				}
+				if (pagesAppChanged || !hasAppDir && pagesAssetGraphScriptChanged) {
+					options.server.ws.send({ type: "full-reload" });
+					return [];
+				}
+				if (hasAppDir) return;
 				if (options.file.startsWith(pagesDir) && fileMatcher.extensionRegex.test(options.file)) {
 					options.server.environments.client.hot.send({ type: "full-reload" });
 					return [];
@@ -1451,8 +1767,17 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					}
 					pagesRunner?.clearCache();
 				}
+				function invalidatePagesClientAssetsModule(reloadDocument = false) {
+					for (const env of Object.values(server.environments)) {
+						const mod = env.moduleGraph.getModuleById(RESOLVED_PAGES_CLIENT_ASSETS);
+						if (mod) env.moduleGraph.invalidateModule(mod);
+					}
+					pagesRunner?.clearCache();
+					if (reloadDocument) server.ws.send({ type: "full-reload" });
+				}
 				function invalidateAppRoutingModules() {
 					invalidateAppRouteCache();
+					invalidateMetadataFileCache();
 					invalidateRscEntryModule();
 					invalidateRootParamsModule();
 				}
@@ -1497,6 +1822,20 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				}
 				let appRouteTypeGeneration = null;
 				let appRouteTypeGenerationPending = false;
+				function isPagesAppFile(filePath) {
+					const relativePath = normalizePathSeparators(path.relative(pagesDir, filePath));
+					return !relativePath.includes("/") && relativePath.startsWith("_app.") && fileMatcher.extensionRegex.test(filePath);
+				}
+				function isPotentialPagesAssetGraphScript(filePath) {
+					const cleanPath = stripViteModuleQuery(filePath);
+					if (!path.isAbsolute(cleanPath)) return false;
+					if (!isScriptModuleId(cleanPath) || cleanPath.endsWith(".d.ts")) return false;
+					const relativeRootPath = normalizePathSeparators(path.relative(root, cleanPath));
+					if (relativeRootPath.startsWith("..") || path.isAbsolute(relativeRootPath)) return false;
+					if (relativeRootPath.includes("/node_modules/") || relativeRootPath.startsWith("node_modules/")) return false;
+					const relativeAppPath = normalizePathSeparators(path.relative(appDir, cleanPath));
+					return relativeAppPath.startsWith("..") || path.isAbsolute(relativeAppPath);
+				}
 				function warnRouteTypeGenerationFailure(error) {
 					server.config.logger.warn(`[vinext] Failed to regenerate route types: ${error instanceof Error ? error.message : String(error)}`);
 				}
@@ -1525,6 +1864,9 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				});
 				server.watcher.on("add", (filePath) => {
 					let routeChanged = false;
+					const pagesAppChanged = isPagesAppFile(filePath);
+					const pagesAssetGraphScriptChanged = isPotentialPagesAssetGraphScript(filePath);
+					if (hasPagesDir && (pagesAppChanged || STYLESHEET_FILE_RE.test(filePath) || pagesAssetGraphScriptChanged)) invalidatePagesClientAssetsModule(pagesAppChanged || !hasAppDir && pagesAssetGraphScriptChanged);
 					if (hasPagesDir && filePath.startsWith(pagesDir) && pageExtensions.test(filePath)) {
 						invalidateRouteCache(pagesDir);
 						routeChanged = true;
@@ -1540,8 +1882,16 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 						revalidateHybridRoutes();
 					}
 				});
+				server.watcher.on("change", (filePath) => {
+					const pagesAppChanged = isPagesAppFile(filePath);
+					const pagesAssetGraphScriptChanged = isPotentialPagesAssetGraphScript(filePath);
+					if (hasPagesDir && (pagesAppChanged || STYLESHEET_FILE_RE.test(filePath) || pagesAssetGraphScriptChanged)) invalidatePagesClientAssetsModule(pagesAppChanged || !hasAppDir && pagesAssetGraphScriptChanged);
+				});
 				server.watcher.on("unlink", (filePath) => {
 					let routeChanged = false;
+					const pagesAppChanged = isPagesAppFile(filePath);
+					const pagesAssetGraphScriptChanged = isPotentialPagesAssetGraphScript(filePath);
+					if (hasPagesDir && (pagesAppChanged || STYLESHEET_FILE_RE.test(filePath) || pagesAssetGraphScriptChanged)) invalidatePagesClientAssetsModule(pagesAppChanged || !hasAppDir && pagesAssetGraphScriptChanged);
 					if (hasPagesDir && filePath.startsWith(pagesDir) && pageExtensions.test(filePath)) {
 						invalidateRouteCache(pagesDir);
 						routeChanged = true;
@@ -1693,8 +2043,11 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								res.end("Forbidden");
 								return;
 							}
+							const requestHost = (Array.isArray(req.headers.host) ? req.headers.host[0] : req.headers.host) || "localhost";
+							const requestOrigin = `http://${requestHost}`;
+							const getUrlHostname = (requestUrl) => new URL(requestUrl).hostname;
 							if (isImageOptimizationPath(url.split("?")[0])) {
-								const encodedLocation = resolveDevImageRedirect(new URL(url, `http://${req.headers.host || "localhost"}`), [...nextConfig.images?.deviceSizes ?? DEFAULT_DEVICE_SIZES, ...nextConfig.images?.imageSizes ?? DEFAULT_IMAGE_SIZES], nextConfig.images?.qualities);
+								const encodedLocation = resolveDevImageRedirect(new URL(url, requestOrigin), [...nextConfig.images?.deviceSizes ?? DEFAULT_DEVICE_SIZES, ...nextConfig.images?.imageSizes ?? DEFAULT_IMAGE_SIZES], nextConfig.images?.qualities);
 								if (!encodedLocation) {
 									res.writeHead(400);
 									res.end("Invalid image optimization parameters");
@@ -1725,6 +2078,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								const qs = url.includes("?") ? url.slice(url.indexOf("?")) : "";
 								url = pathname + qs;
 							}
+							const capturedMiddlewarePath = middlewarePath;
 							const bp = nextConfig?.basePath ?? "";
 							if (bp && pathname.startsWith(bp)) {
 								const stripped = pathname.slice(bp.length) || "/";
@@ -1749,8 +2103,9 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								if (dataMatch) {
 									isDataReq = true;
 									const qs = url.includes("?") ? url.slice(url.indexOf("?")) : "";
-									url = dataMatch.pagePathname + qs;
-									pathname = dataMatch.pagePathname;
+									const pagePathname = normalizeNextDataPagePathname(dataMatch.pagePathname, capturedMiddlewarePath !== null && nextConfig?.trailingSlash === true);
+									url = pagePathname + qs;
+									pathname = pagePathname;
 									req.url = url;
 								} else {
 									const deploymentId = process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID;
@@ -1769,13 +2124,21 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								basePath: bp,
 								hadBasePath: true
 							}));
-							if (pathname.includes(".") && !pathname.endsWith(".html") && !filePathMatchesRewrite) return next();
+							const isFilePathRequest = pathname.includes(".") && !pathname.endsWith(".html");
+							let filePathMatchesPagesRoute = false;
+							const requestHostname = getUrlHostname(requestOrigin);
+							if (isFilePathRequest && !filePathMatchesRewrite) {
+								const [pageRoutes, apiRoutes] = await Promise.all([pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher), apiRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher)]);
+								const pageRouteUrl = nextConfig?.i18n ? resolvePagesI18nRequest(pathname, nextConfig.i18n, req.headers, requestHostname, bp, nextConfig.trailingSlash ?? false).url : pathname;
+								const apiRouteUrl = stripI18nLocaleForApiRoute(pathname, nextConfig?.i18n ?? null);
+								filePathMatchesPagesRoute = matchRoute(pageRouteUrl, pageRoutes) !== null || matchRoute(apiRouteUrl, apiRoutes) !== null;
+							}
+							if (isFilePathRequest && !filePathMatchesRewrite && !filePathMatchesPagesRoute) 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);
 							for (const header of INTERNAL_HEADERS) delete req.headers[header];
 							for (const header of VINEXT_INTERNAL_HEADERS) delete req.headers[header];
-							const requestOrigin = `http://${req.headers.host || "localhost"}`;
 							const method = req.method ?? "GET";
 							const webRequest = new Request(new URL(url, requestOrigin), {
 								method,
@@ -1785,10 +2148,9 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								for (const key of Object.keys(req.headers)) delete req.headers[key];
 								for (const [key, value] of nextRequestHeaders) req.headers[key] = value;
 							};
-							const capturedMiddlewarePath = middlewarePath;
 							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"}://${req.headers.host || "localhost"}`;
+								const mwOrigin = `${rawProto === "https" || rawProto === "http" ? rawProto : "http"}://${requestHost}`;
 								const middlewareRequest = new Request(new URL(url, mwOrigin), {
 									method: req.method,
 									headers: nodeRequestHeaders
@@ -1809,6 +2171,18 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								return result;
 							} : null;
 							const devPageRoutes = await pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
+							const devPageRouteDataKinds = /* @__PURE__ */ new Map();
+							const classifyDevPageRoute = (route) => {
+								const cached = devPageRouteDataKinds.get(route.filePath);
+								if (cached) return cached;
+								let dataKind = "none";
+								try {
+									const source = fs.readFileSync(route.filePath, "utf8");
+									dataKind = hasExportedName(source, "getStaticProps") ? "static" : hasExportedName(source, "getServerSideProps") ? "server" : "none";
+								} catch {}
+								devPageRouteDataKinds.set(route.filePath, dataKind);
+								return dataKind;
+							};
 							const pipelineResult = await runPagesRequest(webRequest, {
 								basePath: bp,
 								trailingSlash: nextConfig?.trailingSlash ?? false,
@@ -1823,11 +2197,16 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								hadBasePath: true,
 								isDataReq,
 								isDataRequest,
+								hasMiddleware: capturedMiddlewarePath !== null,
 								rawSearch: url.includes("?") ? url.slice(url.indexOf("?")) : "",
 								runMiddleware: devRunMiddlewareAdapter,
-								matchPageRoute: (resolvedPathname) => {
-									const m = matchRoute(resolvedPathname, devPageRoutes);
-									return m ? { route: { isDynamic: m.route.isDynamic } } : null;
+								matchPageRoute: (resolvedPathname, request) => {
+									const m = matchRoute(nextConfig?.i18n ? resolvePagesI18nRequest(resolvedPathname, nextConfig.i18n, request.headers, getUrlHostname(request.url), bp, nextConfig.trailingSlash ?? false).url : resolvedPathname, devPageRoutes);
+									return m ? { route: {
+										dataKind: classifyDevPageRoute(m.route),
+										isDynamic: m.route.isDynamic,
+										pattern: m.route.pattern
+									} } : null;
 								},
 								proxyExternal: async (currentRequest, externalUrl) => {
 									const externalMethod = req.method ?? "GET";
@@ -1895,7 +2274,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								}
 								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)
+									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)
 								};
 								flushStagedHeaders();
 								flushRequestHeaders();
@@ -2014,7 +2393,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				handler(code, id) {
 					const cacheDirPrefix = getCacheDirPrefix(this.environment.config.cacheDir);
 					if (normalizePathSeparators(id).startsWith(cacheDirPrefix)) return null;
-					return replaceTypeofWindow(code, getTypeofWindowReplacement(this.environment));
+					return replaceTypeofWindow(code, getTypeofWindowReplacement(this.environment), id);
 				}
 			}
 		},
@@ -2268,29 +2647,6 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 		createOgInlineFetchAssetsPlugin(),
 		createOgAssetsPlugin(),
 		createServerExternalsManifestPlugin(),
-		{
-			name: "vinext:image-config",
-			apply: "build",
-			enforce: "post",
-			writeBundle: {
-				sequential: true,
-				order: "post",
-				handler(options) {
-					if (this.environment?.name !== "rsc") return;
-					const outDir = options.dir;
-					if (!outDir) return;
-					const imageConfig = {
-						deviceSizes: nextConfig?.images?.deviceSizes,
-						imageSizes: nextConfig?.images?.imageSizes,
-						qualities: nextConfig?.images?.qualities,
-						dangerouslyAllowSVG: nextConfig?.images?.dangerouslyAllowSVG,
-						contentDispositionType: nextConfig?.images?.contentDispositionType,
-						contentSecurityPolicy: nextConfig?.images?.contentSecurityPolicy
-					};
-					fs.writeFileSync(path.join(outDir, "image-config.json"), JSON.stringify(imageConfig));
-				}
-			}
-		},
 		(() => {
 			let buildIdWritten = false;
 			return {
@@ -2463,6 +2819,65 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				}
 			};
 		})(),
+		{
+			name: "vinext:pages-client-assets",
+			apply: "build",
+			enforce: "post",
+			sharedDuringBuild: true,
+			closeBundle: {
+				sequential: true,
+				order: "post",
+				handler() {
+					const envConfig = this.environment.config;
+					if (this.environment.name === "client") {
+						const buildRoot = envConfig.root ?? process.cwd();
+						const clientDir = path.resolve(buildRoot, envConfig.build.outDir);
+						const runtimeMetadata = computeClientRuntimeMetadata({
+							clientDir,
+							assetBase: envConfig.base ?? "/",
+							assetPrefix: nextConfig.assetPrefix,
+							includeClientEntry: !hasAppDir ? true : hasPagesDir ? "pages-client-entry" : false
+						});
+						let ssrManifest;
+						const ssrManifestPath = path.join(clientDir, ".vite", "ssr-manifest.json");
+						if (fs.existsSync(ssrManifestPath)) try {
+							ssrManifest = JSON.parse(fs.readFileSync(ssrManifestPath, "utf-8"));
+						} catch {}
+						pagesClientAssetsModule = buildPagesClientAssetsModule({
+							clientEntry: runtimeMetadata.clientEntryFile ?? void 0,
+							appBootstrapPreinitModules: runtimeMetadata.appBootstrapPreinitModules,
+							ssrManifest,
+							lazyChunks: runtimeMetadata.lazyChunks ?? void 0,
+							dynamicPreloads: runtimeMetadata.dynamicPreloads ?? void 0
+						});
+						const buildSession = process.env.__VINEXT_PAGES_CLIENT_ASSETS_BUILD_SESSION;
+						if (hasAppDir && hasPagesDir && buildSession) setPagesClientAssetsBuildMetadata(buildSession, pagesClientAssetsModule);
+					}
+					if (pagesClientAssetsModule === null) {
+						if (pagesClientAssetsOutputDirs.size === 0) return;
+						const buildSession = process.env.__VINEXT_PAGES_CLIENT_ASSETS_BUILD_SESSION;
+						if (buildSession) pagesClientAssetsModule = takePagesClientAssetsBuildMetadata(buildSession);
+					}
+					if (pagesClientAssetsModule === null) {
+						const emptyModule = buildPagesClientAssetsModule({});
+						for (const outputDir of pagesClientAssetsOutputDirs) writePagesClientAssetsModuleIfMissing(outputDir, emptyModule);
+						return;
+					}
+					for (const outputDir of pagesClientAssetsOutputDirs) {
+						fs.mkdirSync(outputDir, { recursive: true });
+						fs.writeFileSync(path.join(outputDir, PAGES_CLIENT_ASSETS_MODULE), pagesClientAssetsModule);
+					}
+				}
+			},
+			buildApp() {
+				if (pagesClientAssetsModule === null) return Promise.resolve();
+				for (const outputDir of pagesClientAssetsOutputDirs) {
+					fs.mkdirSync(outputDir, { recursive: true });
+					fs.writeFileSync(path.join(outputDir, PAGES_CLIENT_ASSETS_MODULE), pagesClientAssetsModule);
+				}
+				return Promise.resolve();
+			}
+		},
 		{
 			name: "vinext:inline-css-manifest",
 			apply: "build",
@@ -2496,61 +2911,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					const envConfig = this.environment?.config;
 					if (!envConfig) return;
 					const buildRoot = envConfig.root ?? process.cwd();
-					const distDir = path.resolve(buildRoot, "dist");
-					if (!fs.existsSync(distDir)) return;
-					const clientDir = path.resolve(buildRoot, "dist", "client");
-					const runtimeMetadata = computeClientRuntimeMetadata({
-						clientDir,
-						assetBase: envConfig.base ?? "/",
-						assetPrefix: nextConfig.assetPrefix,
-						includeClientEntry: !hasAppDir ? true : hasPagesDir ? "pages-client-entry" : false
-					});
-					const lazyChunksData = runtimeMetadata.lazyChunks ?? null;
-					const dynamicPreloadsData = runtimeMetadata.dynamicPreloads ?? null;
-					let clientEntryFile = runtimeMetadata.clientEntryFile ?? null;
-					let ssrManifestData = null;
-					const ssrManifestPath = path.join(clientDir, ".vite", "ssr-manifest.json");
-					if (fs.existsSync(ssrManifestPath)) try {
-						ssrManifestData = JSON.parse(fs.readFileSync(ssrManifestPath, "utf-8"));
-					} catch {}
-					if (hasAppDir) {
-						const workerEntry = path.resolve(distDir, "server", "index.js");
-						if (fs.existsSync(workerEntry)) {
-							const script = buildRuntimeGlobalsScript({
-								clientEntryFile,
-								ssrManifest: ssrManifestData,
-								lazyChunks: lazyChunksData,
-								dynamicPreloads: dynamicPreloadsData
-							});
-							if (script) {
-								const code = fs.readFileSync(workerEntry, "utf-8");
-								fs.writeFileSync(workerEntry, script + "\n" + code);
-							}
-						}
-					} else {
-						let workerOutDir = null;
-						for (const entry of fs.readdirSync(distDir)) {
-							const candidate = path.join(distDir, entry);
-							if (entry === "client") continue;
-							if (fs.statSync(candidate).isDirectory() && fs.existsSync(path.join(candidate, "wrangler.json"))) {
-								workerOutDir = candidate;
-								break;
-							}
-						}
-						if (!workerOutDir) return;
-						const workerEntry = path.join(workerOutDir, "index.js");
-						if (!fs.existsSync(workerEntry)) return;
-						const script = buildRuntimeGlobalsScript({
-							clientEntryFile,
-							ssrManifest: ssrManifestData,
-							lazyChunks: lazyChunksData,
-							dynamicPreloads: dynamicPreloadsData
-						});
-						if (script) {
-							const code = fs.readFileSync(workerEntry, "utf-8");
-							fs.writeFileSync(workerEntry, script + "\n" + code);
-						}
-					}
+					const clientDir = path.resolve(buildRoot, envConfig.build.outDir);
 					const headersPath = path.join(clientDir, "_headers");
 					if (!fs.existsSync(headersPath)) {
 						const headersContent = [
@@ -2625,6 +2986,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 	];
 	if (rscPluginPromise) {
 		plugins.push(rscPluginPromise);
+		plugins.push(createRscReferenceValidationNormalizerPlugin());
 		plugins.push(createRscClientReferenceLoadersPlugin());
 	}
 	return plugins;