vinext 0.2.0 → 0.2.1

package/dist/index.js

@@ -1,7 +1,7 @@
 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 { VINEXT_MW_CTX_HEADER } from "./utils/protocol-headers.js";
@@ -11,15 +11,16 @@ import { matchesRewriteSource, proxyExternalRequest } from "./config/config-matc
 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 { extractMiddlewareMatcherConfig } from "./build/report.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 } from "./server/pages-i18n.js";
-import { isNextDataPathname, parseNextDataPathname } from "./server/pages-data-route.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";
@@ -36,7 +37,6 @@ import { generateBrowserEntry, isLinkPrefetchRoute, toDocumentOnlyAppRoute, toLi
 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";
@@ -55,7 +55,9 @@ 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";
@@ -70,9 +72,9 @@ import { VINEXT_CLIENT_ENTRY_MANIFEST } from "./utils/client-entry-manifest.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";
@@ -94,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);
@@ -172,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] : [
@@ -306,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);
@@ -483,10 +629,13 @@ 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;
@@ -626,9 +775,26 @@ function vinext(options = {}) {
 	}
 	const plugins = [
 		...viteMajorVersion >= 8 ? [] : [loadVite7TsconfigPathsPlugin(earlyBaseDir)],
+		createStyledJsxPlugin(earlyBaseDir),
 		reactPluginPromise,
 		createIgnoreDynamicRequestsPlugin(() => nextConfig?.turbopackTranspilePackages ?? []),
-		commonjs(),
+		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",
@@ -669,6 +835,7 @@ function vinext(options = {}) {
 			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;
@@ -721,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;
@@ -934,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) } } : {},
@@ -949,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,
@@ -982,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)] : []);
@@ -1046,7 +1230,8 @@ function vinext(options = {}) {
 									"react-dom/client",
 									"react/jsx-runtime",
 									"react/jsx-dev-runtime"
-								])]
+								])],
+								...depOptimizeNodeEnvOptions
 							},
 							build: {
 								manifest: true,
@@ -1062,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,
@@ -1077,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,
@@ -1121,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 ??= {};
@@ -1130,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([
@@ -1207,7 +1405,19 @@ function vinext(options = {}) {
 				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) return "export default { clientEntry: '/@id/__x00__virtual:vinext-client-entry' };";
+				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);
@@ -1232,6 +1442,7 @@ function vinext(options = {}) {
 						inlineCss: nextConfig?.inlineCss,
 						globalNotFound: nextConfig?.globalNotFound,
 						cacheComponents: nextConfig?.cacheComponents,
+						prefetchInlining: nextConfig?.prefetchInlining,
 						hasServerActions,
 						i18n: nextConfig?.i18n,
 						imageConfig: {
@@ -1478,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 [];
@@ -1531,6 +1767,14 @@ 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();
@@ -1578,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)}`);
 				}
@@ -1606,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;
@@ -1621,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;
@@ -1774,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");
@@ -1806,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) || "/";
@@ -1830,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;
@@ -1850,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,
@@ -1866,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
@@ -1890,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,
@@ -1908,8 +2201,9 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								rawSearch: url.includes("?") ? url.slice(url.indexOf("?")) : "",
 								runMiddleware: devRunMiddlewareAdapter,
 								matchPageRoute: (resolvedPathname, request) => {
-									const m = matchRoute(nextConfig?.i18n ? resolvePagesI18nRequest(resolvedPathname, nextConfig.i18n, request.headers, new URL(request.url).hostname, bp, nextConfig.trailingSlash ?? false).url : resolvedPathname, devPageRoutes);
+									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;
@@ -1980,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();
@@ -2692,6 +2986,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 	];
 	if (rscPluginPromise) {
 		plugins.push(rscPluginPromise);
+		plugins.push(createRscReferenceValidationNormalizerPlugin());
 		plugins.push(createRscClientReferenceLoadersPlugin());
 	}
 	return plugins;

package/dist/packages/cloudflare/src/cache/kv-data-adapter.runtime.js

@@ -46,6 +46,10 @@ function readStringArrayField(ctx, field) {
 	if (!Array.isArray(value)) return [];
 	return value.filter((item) => typeof item === "string");
 }
+function readPositiveNumberField(ctx, field) {
+	const value = ctx?.[field];
+	return typeof value === "number" && value > 0 ? value : void 0;
+}
 function validUniqueTags(tags) {
 	const result = [];
 	const seen = /* @__PURE__ */ new Set();
@@ -139,7 +143,10 @@ var KVCacheHandler = class {
 			this._deleteInBackground(kvKey);
 			return null;
 		}
-		if (entry.revalidateAt !== null && Date.now() > entry.revalidateAt) return {
+		const now = Date.now();
+		const requestedRevalidate = readPositiveNumberField(_ctx, "revalidate");
+		const requestedRevalidateAt = requestedRevalidate === void 0 ? null : entry.lastModified + requestedRevalidate * 1e3;
+		if (entry.revalidateAt !== null && now > entry.revalidateAt || requestedRevalidateAt !== null && now > requestedRevalidateAt) return {
 			lastModified: entry.lastModified,
 			value: restoredValue,
 			cacheState: "stale",

package/dist/packages/cloudflare/src/deploy.js

@@ -214,11 +214,7 @@ async function deploy(options) {
 	console.log(`  Project: ${info.projectName}`);
 	console.log(`  Router:  ${info.isAppRouter ? "App Router" : "Pages Router"}`);
 	console.log(`  ISR:     ${info.hasISR ? "detected" : "none"}`);
-	const missingScaffolding = [
-		!info.hasViteConfig && "Vite config",
-		!info.hasWranglerConfig && "Wrangler config",
-		info.isPagesRouter && !info.hasWorkerEntry && "Worker entry"
-	].filter((value) => Boolean(value));
+	const missingScaffolding = [!info.hasViteConfig && "Vite config", !info.hasWranglerConfig && "Wrangler config"].filter((value) => Boolean(value));
 	if (missingScaffolding.length > 0) throw new Error(`Missing Cloudflare deployment setup: ${missingScaffolding.join(", ")}. Run \`vinext init --platform=cloudflare\` first.`);
 	const missingDeps = getMissingDeps(info);
 	if (missingDeps.length > 0) throw new Error(`Missing deployment dependencies: ${missingDeps.map((dependency) => dependency.name).join(", ")}. Run \`vinext init --platform=cloudflare\` first.`);