vinext 1.3.1 → 1.4.0

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

@@ -29,11 +29,34 @@ const _isrCachePath = resolveEntryPath("../server/isr-cache.js", import.meta.url
 const _revalidationRequestPath = resolveEntryPath("../server/revalidation-request.js", import.meta.url);
 const _instrumentationRuntimePath = resolveEntryPath("../server/instrumentation-runtime.js", import.meta.url);
 const _isolateSharedPromisePath = resolveEntryPath("../server/isolate-shared-promise.js", import.meta.url);
-async function getPagesDataKind(filePath) {
+const GET_INITIAL_PROPS_NAME = /\bgetInitialProps\b/;
+/**
+* Whether a module's source names getInitialProps. Next.js serves a page
+* without data functions as one static file only when neither it nor a
+* custom _app defines getInitialProps, which it checks on the loaded modules:
+* https://github.com/vercel/next.js/blob/canary/packages/next/src/build/utils.ts
+* https://github.com/vercel/next.js/blob/canary/packages/next/src/build/index.ts
+* The source is all the request stage has. A getInitialProps an imported
+* wrapper attaches is only seen once the page renders.
+*/
+async function namesGetInitialProps(filePath) {
+	if (filePath === null) return false;
+	return GET_INITIAL_PROPS_NAME.test(await readFile(filePath, "utf8"));
+}
+async function getPagesRouteData(filePath, appRunsInitialProps) {
 	const source = await readFile(filePath, "utf8");
-	if (hasExportedName(source, "getStaticProps")) return "static";
-	if (hasExportedName(source, "getServerSideProps")) return "server";
-	return "none";
+	if (hasExportedName(source, "getStaticProps")) return {
+		dataKind: "static",
+		runsInitialProps: false
+	};
+	if (hasExportedName(source, "getServerSideProps")) return {
+		dataKind: "server",
+		runsInitialProps: false
+	};
+	return {
+		dataKind: "none",
+		runsInitialProps: appRunsInitialProps || GET_INITIAL_PROPS_NAME.test(source)
+	};
 }
 /**
 * Generate the request-only Pages Worker entry used by a multi-stage output.
@@ -43,9 +66,10 @@ async function generatePagesRequestEntry(pagesDir, nextConfig, fileMatcher, midd
 	const pageRoutes = await pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
 	const apiRoutes = await apiRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
 	const hasRequestAwareDocument = findFileWithExts(pagesDir, "_document", fileMatcher) !== null;
+	const appRunsInitialProps = await namesGetInitialProps(findFileWithExts(pagesDir, "_app", fileMatcher));
 	const pageRouteEntries = await Promise.all(pageRoutes.map(async (route) => {
-		const dataKind = await getPagesDataKind(route.filePath);
-		return `  { pattern: ${JSON.stringify(route.pattern)}, patternParts: ${JSON.stringify(route.patternParts)}, isDynamic: ${route.isDynamic}, params: ${JSON.stringify(route.params)}, dataKind: ${JSON.stringify(dataKind)} }`;
+		const { dataKind, runsInitialProps } = await getPagesRouteData(route.filePath, appRunsInitialProps);
+		return `  { pattern: ${JSON.stringify(route.pattern)}, patternParts: ${JSON.stringify(route.patternParts)}, isDynamic: ${route.isDynamic}, params: ${JSON.stringify(route.params)}, dataKind: ${JSON.stringify(dataKind)}, runsInitialProps: ${runsInitialProps} }`;
 	}));
 	const apiRouteEntries = apiRoutes.map((route) => `  { pattern: ${JSON.stringify(route.pattern)}, patternParts: ${JSON.stringify(route.patternParts)}, isDynamic: ${route.isDynamic}, params: ${JSON.stringify(route.params)} }`);
 	const i18nConfigJson = nextConfig?.i18n ? JSON.stringify({
@@ -210,9 +234,10 @@ async function generateServerEntry(pagesDir, nextConfig, fileMatcher, middleware
 	const pageImportInitializers = pageRoutes.map((r, i) => `page_${i} = await import(${JSON.stringify(r.filePath)});`);
 	const apiImports = apiRoutes.map((r, i) => instrumentationPath ? `let api_${i};` : `import * as api_${i} from ${JSON.stringify(r.filePath)};`);
 	const apiImportInitializers = apiRoutes.map((r, i) => `api_${i} = await import(${JSON.stringify(r.filePath)});`);
+	const appRunsInitialProps = await namesGetInitialProps(findFileWithExts(pagesDir, "_app", fileMatcher));
 	const pageRouteEntries = await Promise.all(pageRoutes.map(async (r, i) => {
-		const dataKind = await getPagesDataKind(r.filePath);
-		return `  { pattern: ${JSON.stringify(r.pattern)}, patternParts: ${JSON.stringify(r.patternParts)}, isDynamic: ${r.isDynamic}, params: ${JSON.stringify(r.params)}, module: ${instrumentationPath ? "null" : `page_${i}`}, filePath: ${JSON.stringify(r.filePath)}, dataKind: ${JSON.stringify(dataKind)} }`;
+		const { dataKind, runsInitialProps } = await getPagesRouteData(r.filePath, appRunsInitialProps);
+		return `  { pattern: ${JSON.stringify(r.pattern)}, patternParts: ${JSON.stringify(r.patternParts)}, isDynamic: ${r.isDynamic}, params: ${JSON.stringify(r.params)}, module: ${instrumentationPath ? "null" : `page_${i}`}, filePath: ${JSON.stringify(r.filePath)}, dataKind: ${JSON.stringify(dataKind)}, runsInitialProps: ${runsInitialProps} }`;
 	}));
 	const apiRouteEntries = apiRoutes.map((r, i) => `  { pattern: ${JSON.stringify(r.pattern)}, patternParts: ${JSON.stringify(r.patternParts)}, isDynamic: ${r.isDynamic}, params: ${JSON.stringify(r.params)}, module: ${instrumentationPath ? "null" : `api_${i}`} }`);
 	const appFilePath = findFileWithExts(pagesDir, "_app", fileMatcher);

package/dist/index.js

@@ -60,8 +60,6 @@ import { generateSsrEntry } from "./entries/app-ssr-entry.js";
 import { VINEXT_CACHE_CONFIG_PLUGIN_PROPERTY, VIRTUAL_CACHE_ADAPTERS, VIRTUAL_CDN_CACHE_ADAPTER, generateCacheAdaptersModule, generateCdnCacheAdapterModule } from "./cache/cache-adapters-virtual.js";
 import { VIRTUAL_IMAGE_ADAPTERS, generateImageAdaptersModule } from "./image/image-adapters-virtual.js";
 import { generateBrowserEntry, generateBrowserRouteManifestModule, toHashedRouteHandlerRoutes, toLinkPrefetchRoutes } from "./entries/app-browser-entry.js";
-import { collectRouteClassificationManifest } from "./build/route-classification-manifest.js";
-import { planRouteClassificationInjection } from "./build/route-classification-injector.js";
 import { createRscScanGlobImportsPlugin, isRscScanGlobImportsAffected } from "./plugins/rsc-scan-glob-imports.js";
 import { loadOrGenerateServerActionsEncryptionKey } from "./build/server-actions-encryption-key.js";
 import { findOpenTelemetryPackages, mergeServerExternalPackages } from "./config/server-external-packages.js";
@@ -96,6 +94,7 @@ import { createRouteClientReferencesFallbackPlugin, createRscClientReferenceLoad
 import { createRscReferenceValidationNormalizerPlugin } from "./plugins/rsc-reference-validation-normalizer.js";
 import { createScanBuildCssPlugin } from "./plugins/scan-build-css.js";
 import { createInstrumentationClientTransformPlugin, createInstrumentationServerTransformPlugin } from "./plugins/instrumentation-client.js";
+import { createNextIntlCatalogPlugin } from "./plugins/next-intl-catalog.js";
 import { createStyledJsxPlugin } from "./plugins/styled-jsx.js";
 import { INSTRUMENTATION_CLIENT_EMPTY_MODULE, generateInstrumentationClientInjectModule } from "./client/instrumentation-client-inject.js";
 import { isServerEnvironment } from "./plugins/environment.js";
@@ -155,7 +154,12 @@ const PAGES_CLOUDFLARE_WORKER_OPTIMIZE_DEPS_INCLUDE = Object.freeze([
 	"react/jsx-runtime",
 	"react/jsx-dev-runtime"
 ]);
-const PAGES_CLOUDFLARE_WORKER_OPTIONAL_OPTIMIZE_DEPS_INCLUDE = Object.freeze(["use-sync-external-store/with-selector", "vinext > @vitejs/plugin-rsc/react/rsc"]);
+const PAGES_CLOUDFLARE_WORKER_OPTIONAL_OPTIMIZE_DEPS_INCLUDE = Object.freeze([
+	"use-sync-external-store/with-selector",
+	"vinext > @vitejs/plugin-rsc/react/rsc",
+	"vinext > @unpic/react",
+	"vinext > ipaddr.js"
+]);
 const APP_CLIENT_OPTIONAL_OPTIMIZE_DEPS_INCLUDE = Object.freeze([
 	"use-sync-external-store/shim",
 	"use-sync-external-store/shim/index.js",
@@ -499,6 +503,7 @@ function hasZeroOrOneAsterisk(value) {
 }
 function materializeTsconfigPathAliases(pathsConfig, baseUrl, projectRoot) {
 	const vite = {};
+	const viteExact = {};
 	const sass = [];
 	for (const [find, rawTargets] of Object.entries(pathsConfig)) {
 		const targets = Array.isArray(rawTargets) ? rawTargets.filter((value) => typeof value === "string") : typeof rawTargets === "string" ? [rawTargets] : [];
@@ -521,10 +526,11 @@ function materializeTsconfigPathAliases(pathsConfig, baseUrl, projectRoot) {
 			vite[aliasKey] = toViteAliasReplacement(path.resolve(baseUrl, targetDir), projectRoot);
 			continue;
 		}
-		vite[find] = toViteAliasReplacement(path.resolve(baseUrl, target), projectRoot);
+		viteExact[find] = toViteAliasReplacement(path.resolve(baseUrl, target), projectRoot);
 	}
 	return {
 		vite,
+		viteExact,
 		sass
 	};
 }
@@ -561,6 +567,7 @@ function loadTsconfigPathAliases(configPath, projectRoot, seen = /* @__PURE__ */
 	const normalizedPath = tryRealpathSync(configPath) ?? configPath;
 	if (seen.has(normalizedPath)) return {
 		vite: {},
+		viteExact: {},
 		sass: []
 	};
 	seen.add(normalizedPath);
@@ -570,15 +577,18 @@ function loadTsconfigPathAliases(configPath, projectRoot, seen = /* @__PURE__ */
 	} catch {
 		return {
 			vite: {},
+			viteExact: {},
 			sass: []
 		};
 	}
 	if (!parsed) return {
 		vite: {},
+		viteExact: {},
 		sass: []
 	};
 	let aliases = {
 		vite: {},
+		viteExact: {},
 		sass: []
 	};
 	for (const extendsSpecifier of normalizeTsconfigExtends(parsed.extends)) {
@@ -590,6 +600,10 @@ function loadTsconfigPathAliases(configPath, projectRoot, seen = /* @__PURE__ */
 					...aliases.vite,
 					...parent.vite
 				},
+				viteExact: {
+					...aliases.viteExact,
+					...parent.viteExact
+				},
 				sass: mergeSassTsconfigPathAliases(aliases.sass, parent.sass)
 			};
 		}
@@ -604,6 +618,10 @@ function loadTsconfigPathAliases(configPath, projectRoot, seen = /* @__PURE__ */
 			...aliases.vite,
 			...own.vite
 		},
+		viteExact: {
+			...aliases.viteExact,
+			...own.viteExact
+		},
 		sass: mergeSassTsconfigPathAliases(aliases.sass, own.sass)
 	};
 }
@@ -672,17 +690,20 @@ function resolveTsconfigAliases(projectRoot, configuredPath) {
 	if (_tsconfigAliasCache.has(cacheKey)) return _tsconfigAliasCache.get(cacheKey);
 	let aliases = {
 		vite: {},
+		viteExact: {},
 		sass: []
 	};
 	for (const candidate of configPath ? [configPath] : TSCONFIG_FILES.map((name) => path.join(projectRoot, name))) {
 		if (!fs.existsSync(candidate)) continue;
 		const materialized = loadTsconfigPathAliases(candidate, projectRoot);
 		aliases = {
-			vite: sortTsconfigAliasesBySpecificity(materialized.vite),
-			sass: materialized.sass
+			...materialized,
+			vite: sortTsconfigAliasesBySpecificity(materialized.vite)
 		};
 		break;
 	}
+	aliases.vite = Object.fromEntries(Object.entries(aliases.vite).filter(([find]) => !_reactServerShims.has(find)));
+	aliases.viteExact = Object.fromEntries(Object.entries(aliases.viteExact).filter(([find]) => !_reactServerShims.has(find)));
 	_tsconfigAliasCache.set(cacheKey, aliases);
 	return aliases;
 }
@@ -726,20 +747,38 @@ const tsconfigAliasCustomResolver = async function(updatedId, importer, options)
 		skipSelf: true
 	}) ?? { id: updatedId };
 };
+function aliasFindMatches(find, id) {
+	if (typeof find === "string") return id === find || id.startsWith(`${find}/`);
+	const { lastIndex } = find;
+	find.lastIndex = 0;
+	const matches = find.test(id);
+	find.lastIndex = lastIndex;
+	return matches;
+}
 /**
 * Convert the merged alias map into Vite alias entries, attaching the
 * stylesheet-scoping resolver to entries that came from tsconfig `paths`.
 * Array order preserves the map's first-match ordering.
+*
+* Exact tsconfig keys come first as anchored RegExps: a string `find` would
+* also match paths below the key, so `"@acme/pkg": ["./src/index.ts"]` would
+* rewrite `@acme/pkg/runtime` to `./src/index.ts/runtime`. TypeScript and
+* Next.js match such keys only against the exact specifier and prefer them over
+* `*` patterns.
 */
-function buildResolveAliasEntries(aliasMap, tsconfigPathAliases, explicitAliases) {
-	return Object.entries(aliasMap).map(([find, replacement]) => Object.hasOwn(tsconfigPathAliases, find) && !Object.hasOwn(explicitAliases, find) ? {
+function buildResolveAliasEntries(aliasMap, tsconfigPathAliases, tsconfigExactPathAliases, explicitAliases) {
+	return [...Object.entries(tsconfigExactPathAliases).filter(([find]) => !Object.hasOwn(explicitAliases, find)).map(([find, replacement]) => ({
+		find: new RegExp(`^${escapeRegExp(find)}$`),
+		replacement,
+		customResolver: tsconfigAliasCustomResolver
+	})), ...Object.entries(aliasMap).map(([find, replacement]) => Object.hasOwn(tsconfigPathAliases, find) && !Object.hasOwn(explicitAliases, find) ? {
 		find,
 		replacement,
 		customResolver: tsconfigAliasCustomResolver
 	} : {
 		find,
 		replacement
-	});
+	})];
 }
 const ALIAS_CUSTOM_RESOLVER_DEPRECATION_RE = /`resolve\.alias` contains an alias with `customResolver` option/;
 const VINEXT_FILTERED_ALIAS_DEPRECATION_WARN = Symbol.for("vinext.filteredAliasDeprecationWarn");
@@ -973,6 +1012,7 @@ function vinext(options = {}) {
 	let resolvedServerExternalPackages = [];
 	let registerNodeOpenTelemetryLoader = false;
 	let pagesTsconfigAliases = {};
+	let pagesTsconfigExactAliases = {};
 	let pagesBundledPackages = /* @__PURE__ */ new Set();
 	let isServeCommand = false;
 	let buildEmptyOutDir;
@@ -1006,7 +1046,6 @@ function vinext(options = {}) {
 	const devForwardedMiddlewareContextKey = randomBytes(32).toString("hex");
 	let previewBuildCredentials;
 	const sassComposesLoader = createSassAwareFileSystemLoader();
-	const rscClassificationManifests = /* @__PURE__ */ new Map();
 	let rscActionOwnerRoutes = null;
 	let rscActionOwnerSharedRoots = [];
 	let clientReferenceRoutes = null;
@@ -1027,6 +1066,7 @@ function vinext(options = {}) {
 	const shimsDir = path.resolve(__dirname, "shims");
 	const nextImageAliasTarget = toSlash(path.join(shimsDir, "image"));
 	const nextImageAliasTargetRE = new RegExp(`^${nextImageAliasTarget.split("/").map(escapeRegExp).join("[\\\\/]")}$`);
+	let nextImageAliasedByUser = false;
 	const canonicalize = (p) => toSlash(tryRealpathSync(p) ?? p);
 	const pageTransformCanonicalPaths = /* @__PURE__ */ new Map();
 	const canonicalizePageTransformPath = (modulePath) => {
@@ -1041,11 +1081,6 @@ function vinext(options = {}) {
 		const relativePath = fileMatcher.stripExtension(canonicalId.slice(canonicalPagesDir.length));
 		return relativePath === "/api" || relativePath.startsWith("/api/");
 	};
-	const dynamicShimPaths = new Set([
-		resolveShimModulePath(shimsDir, "headers"),
-		resolveShimModulePath(shimsDir, "server"),
-		resolveShimModulePath(shimsDir, "cache")
-	].map(canonicalize));
 	let nextShimMap = {};
 	let shimOptimizeDepsExclude = VINEXT_OPTIMIZE_DEPS_EXCLUDE;
 	const createShimRequirePlugin = () => esmExternalRequirePlugin({ external: [...shimOptimizeDepsExclude] });
@@ -1115,14 +1150,14 @@ function vinext(options = {}) {
 		rscPluginPromise = rscImport.then(async (mod) => {
 			const rsc = mod.default;
 			const plugins = rsc(rscPluginOptions);
-			const useCachePlugin = await createUseCacheCallablePlugin({
+			const useCachePlugins = await createUseCacheCallablePlugin({
 				projectRoot: earlyBaseDir,
 				cacheRuntime: pathToFileURL(resolveShimModulePath(shimsDir, "cache-callable-runtime")).href,
 				getEncryptionKey: () => serverActionsEncryptionKey
 			});
 			const useServerIndex = plugins.findIndex((plugin) => plugin.name === "rsc:use-server");
 			if (useServerIndex === -1) throw new Error("vinext: Failed to locate @vitejs/plugin-rsc use-server plugin.");
-			plugins.splice(useServerIndex, 0, useCachePlugin);
+			plugins.splice(useServerIndex, 0, ...useCachePlugins);
 			return plugins.map(scopeRscPlugin);
 		}).catch((cause) => {
 			throw new Error("vinext: Failed to load @vitejs/plugin-rsc.", { cause });
@@ -1401,6 +1436,7 @@ function vinext(options = {}) {
 			getPagesDir: () => hasPagesDir ? pagesDir : null,
 			getAliases: () => nextConfig?.aliases ?? {},
 			getTsconfigAliases: () => pagesTsconfigAliases,
+			getTsconfigExactAliases: () => pagesTsconfigExactAliases,
 			getBundledPackages: () => pagesBundledPackages,
 			isEnabled: () => !hasCloudflarePlugin && !hasNitroPlugin
 		}),
@@ -1433,6 +1469,7 @@ function vinext(options = {}) {
 				buildLifecycleEnabled = env.command === "build" && !internalOptions.__skipBuildLifecycle && (buildLifecycleInvocation !== void 0 || claimViteCliBuildInvocation());
 				const userResolve = config.resolve;
 				let tsconfigPathAliases = {};
+				let tsconfigExactPathAliases = {};
 				let sassTsconfigPathAliases = [];
 				const swcHelpersAlias = resolveSwcHelpersAlias(root);
 				const mode = env?.mode ?? "development";
@@ -1504,10 +1541,12 @@ function vinext(options = {}) {
 				const configuredTsconfigPath = isUnknownRecord(nextConfig.typescript) ? typeof nextConfig.typescript.tsconfigPath === "string" ? nextConfig.typescript.tsconfigPath : void 0 : void 0;
 				const resolvedTsconfigAliases = resolveTsconfigAliases(root, configuredTsconfigPath);
 				tsconfigPathAliases = resolvedTsconfigAliases.vite;
+				tsconfigExactPathAliases = resolvedTsconfigAliases.viteExact;
 				pagesTsconfigAliases = tsconfigPathAliases;
+				pagesTsconfigExactAliases = tsconfigExactPathAliases;
 				sassTsconfigPathAliases = resolvedTsconfigAliases.sass;
 				const shouldAutoEnableNativeTsconfigPaths = userResolve?.tsconfigPaths === void 0 && configuredTsconfigPath === void 0;
-				if (Object.keys(tsconfigPathAliases).length > 0) config.customLogger = suppressAliasCustomResolverDeprecationWarning(config.customLogger ?? createLogger(config.logLevel, { allowClearScreen: config.clearScreen }));
+				if (Object.keys(tsconfigPathAliases).length > 0 || Object.keys(tsconfigExactPathAliases).length > 0) config.customLogger = suppressAliasCustomResolverDeprecationWarning(config.customLogger ?? createLogger(config.logLevel, { allowClearScreen: config.clearScreen }));
 				if (rscCompatibilityId === void 0) {
 					const sharedRscCompatibilityId = process.env.__VINEXT_SHARED_RSC_COMPATIBILITY_ID;
 					rscCompatibilityId = sharedRscCompatibilityId && sharedRscCompatibilityId.length > 0 ? sharedRscCompatibilityId : createRscCompatibilityId(nextConfig);
@@ -1586,6 +1625,7 @@ function vinext(options = {}) {
 				defines["process.env.__NEXT_VERSION"] = JSON.stringify(getVinextVersion());
 				defines["process.env.__NEXT_APP_SHELLS"] = JSON.stringify(nextConfig.appShells);
 				defines["process.env.__NEXT_CACHE_COMPONENTS"] = JSON.stringify(nextConfig.cacheComponents ?? false);
+				defines["process.env.__NEXT_EXPERIMENTAL_CACHED_NAVIGATIONS"] = JSON.stringify(nextConfig.cachedNavigations);
 				for (const [key, value] of Object.entries(nextConfig.compilerDefine)) {
 					if (key in defines || key === "process.browser") throw new Error(`The \`compiler.define\` option is configured to replace the \`${key}\` variable. This variable is either part of a built-in or is already configured.`);
 					defines[key] = value;
@@ -1680,6 +1720,11 @@ function vinext(options = {}) {
 					find,
 					replacement
 				}));
+				const tsconfigOverridingAliases = {
+					...nextConfig.aliases,
+					...nextShimMap,
+					"vinext/server/pages-client-assets": _pagesClientAssetsPath
+				};
 				if (config.resolve) {
 					config.resolve = { ...config.resolve };
 					delete config.resolve.alias;
@@ -1754,13 +1799,8 @@ function vinext(options = {}) {
 						alias: [...userAliasEntries, ...buildResolveAliasEntries({
 							...swcHelpersAlias ? { "@swc/helpers/_": swcHelpersAlias } : {},
 							...tsconfigPathAliases,
-							...nextConfig.aliases,
-							...nextShimMap,
-							"vinext/server/pages-client-assets": _pagesClientAssetsPath
-						}, tsconfigPathAliases, {
-							...nextConfig.aliases,
-							...nextShimMap
-						})],
+							...tsconfigOverridingAliases
+						}, tsconfigPathAliases, tsconfigExactPathAliases, tsconfigOverridingAliases)],
 						dedupe: [
 							"react",
 							"react-dom",
@@ -2120,6 +2160,8 @@ function vinext(options = {}) {
 					};
 				}
 				sassComposesLoader.setResolvedConfig(config);
+				const nextImageAlias = config.resolve?.alias?.find(({ find }) => aliasFindMatches(find, "next/image"));
+				nextImageAliasedByUser = nextImageAlias !== void 0 && (nextImageAlias.customResolver !== void 0 || toSlash(nextImageAlias.replacement) !== nextImageAliasTarget);
 				if (config.command === "build" && hasAppDir && hasPagesDir) {
 					const [appRoutes, pageRoutes, apiRoutes] = await Promise.all([
 						appRouter(appDir, nextConfig?.pageExtensions, fileMatcher),
@@ -2191,7 +2233,7 @@ function vinext(options = {}) {
 			},
 			resolveId: {
 				filter: { id: new RegExp(`${/(?:next\/|vinext\/(?:shims\/|server\/(?:app-rsc-(?:combined-)?handler|app-router-entry|pages-router-entry))|virtual:vinext-|@vercel\/og(?:\.js)?$)/.source}|${nextImageAliasTargetRE.source}`) },
-				handler(id, importer) {
+				handler(id, importer, options) {
 					if (nextImageAliasTargetRE.test(id)) return this.environment?.name === "rsc" ? RESOLVED_NEXT_IMAGE_RSC : void 0;
 					const cleanId = toSlash(id.startsWith("\0") ? id.slice(1) : id);
 					if (cleanId === "vinext/server/app-rsc-combined-handler") {
@@ -2209,8 +2251,14 @@ function vinext(options = {}) {
 						return _appRscHandlerPath;
 					}
 					if (isVercelOgImport(cleanId) && !isVinextOgShimImporter(importer)) return resolveShimModulePath(_shimsDir, "og");
-					if (cleanId === "vinext/shims/image" && this.environment?.name !== "rsc") return this.resolve("next/image", importer, { skipSelf: true });
-					if (cleanId.startsWith("vinext/shims/")) return resolveShimModulePath(_shimsDir, stripJsExtension(stripViteModuleQuery(cleanId.slice(13))));
+					if (cleanId === "vinext/shims/image" && this.environment?.name !== "rsc" && !nextImageAliasedByUser) return this.resolve("next/image", importer, { skipSelf: true });
+					if (cleanId.startsWith("vinext/shims/")) {
+						const shimPath = resolveShimModulePath(_shimsDir, stripJsExtension(stripViteModuleQuery(cleanId.slice(13))));
+						return this.resolve(shimPath, importer, {
+							...options,
+							skipSelf: true
+						});
+					}
 					if (cleanId === VIRTUAL_WORKER_ENTRY) return RESOLVED_WORKER_ENTRY;
 					if (selectedMultiStageOutput && (cleanId === "vinext/server/app-router-entry" || cleanId === "vinext/server/pages-router-entry")) return RESOLVED_WORKER_ENTRY;
 					if (cleanId.endsWith("/" + VIRTUAL_WORKER_ENTRY)) return RESOLVED_WORKER_ENTRY;
@@ -2271,7 +2319,10 @@ function vinext(options = {}) {
 					const reactServerShim = _reactServerShims.get(cleanId);
 					if (reactServerShim !== void 0) {
 						const shimName = this.environment?.name === "rsc" ? `${reactServerShim}.react-server` : reactServerShim;
-						return resolveShimModulePath(_shimsDir, shimName);
+						return this.resolve(resolveShimModulePath(_shimsDir, shimName), importer, {
+							...options,
+							skipSelf: true
+						});
 					}
 				}
 			},
@@ -2341,7 +2392,6 @@ function vinext(options = {}) {
 						const globalErrorPath = findFileWithExts(appDir, "global-error", fileMatcher);
 						const globalNotFoundPath = nextConfig?.globalNotFound ? findFileWithExts(appDir, "global-not-found", fileMatcher) : null;
 						if (id !== RESOLVED_APP_REQUEST_ENTRY) {
-							rscClassificationManifests.set(id, collectRouteClassificationManifest(routes));
 							rscActionOwnerRoutes = this.environment.config.command === "build" && hasServerActions ? routes : null;
 							rscActionOwnerSharedRoots = [globalErrorPath, globalNotFoundPath].filter((path) => path !== null);
 							clientReferenceRoutes = this.environment.config.command === "build" ? routes : null;
@@ -2431,45 +2481,6 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					}
 					if (id.startsWith("\0virtual:vinext-google-fonts?")) return generateGoogleFontsVirtualModule(id, _fontGoogleShimPath);
 				}
-			},
-			// @vitejs/plugin-rsc runs the RSC environment build in two phases:
-			renderChunk: {
-				order: "pre",
-				handler(code, chunk) {
-					if (this.environment?.name !== "rsc") return null;
-					const hasClassificationStub = code.includes("__VINEXT_CLASS");
-					if (!hasClassificationStub) return null;
-					const rscEntryId = [RESOLVED_RSC_ENTRY, RESOLVED_APP_RESPONSE_ENTRY].find((id) => chunk.moduleIds.includes(id));
-					if (!rscEntryId) return null;
-					const rscClassificationManifest = rscClassificationManifests.get(rscEntryId);
-					if (!rscClassificationManifest) return null;
-					const enableClassificationDebug = Boolean(process.env.VINEXT_DEBUG_CLASSIFICATION);
-					const patchPlan = hasClassificationStub && rscClassificationManifest ? planRouteClassificationInjection({
-						canonicalizeLayoutPath: canonicalize,
-						chunks: [{
-							code,
-							fileName: chunk.fileName
-						}],
-						dynamicShimPaths,
-						enableDebugReasons: enableClassificationDebug,
-						manifest: rscClassificationManifest,
-						moduleInfo: { getModuleInfo: (moduleId) => {
-							const info = this.getModuleInfo(moduleId);
-							if (!info) return null;
-							return {
-								importedIds: info.importedIds ?? [],
-								dynamicImportedIds: info.dynamicallyImportedIds ?? []
-							};
-						} }
-					}) : { kind: "skip" };
-					const nextCode = patchPlan.kind === "skip" ? code : patchPlan.code;
-					if (patchPlan.kind === "skip") return null;
-					rscClassificationManifests.delete(rscEntryId);
-					return {
-						code: nextCode,
-						map: null
-					};
-				}
 			}
 		},
 		{
@@ -2731,6 +2742,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 		asyncHooksStubPlugin,
 		createInstrumentationClientTransformPlugin(() => instrumentationClientPath, () => nextConfig.instrumentationClientRouteManifest),
 		createInstrumentationServerTransformPlugin(() => instrumentationPath, () => nextConfig.instrumentationServerValueInjections),
+		createNextIntlCatalogPlugin(() => root, () => nextConfig.nextIntlCatalogLoader),
 		{
 			name: "vinext:instrumentation-client-inject",
 			enforce: "pre",
@@ -3243,11 +3255,12 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 						const [pathname] = url.split("?");
 						if (url.startsWith("/@") || url.startsWith("/__vite") || url.startsWith("/node_modules") || url.includes(".") && !pathname.endsWith(".html") && !pathname.endsWith(".rsc")) return next();
 						const _reqStart = now();
+						const _reqWallStart = Date.now();
 						let _compileMs;
 						let _renderMs;
 						function _parseTiming(raw) {
 							const [handlerStart, inHandlerCompileMs, renderMs] = String(raw).split(",").map((v) => Number(v));
-							if (!Number.isNaN(handlerStart) && !Number.isNaN(inHandlerCompileMs) && inHandlerCompileMs !== -1) _compileMs = Math.max(0, Math.round(handlerStart - _reqStart)) + inHandlerCompileMs;
+							if (!Number.isNaN(handlerStart) && !Number.isNaN(inHandlerCompileMs) && inHandlerCompileMs !== -1) _compileMs = Math.max(0, Math.round(handlerStart - _reqWallStart)) + inHandlerCompileMs;
 							if (!Number.isNaN(renderMs) && renderMs !== -1) _renderMs = renderMs;
 						}
 						const _origSetHeader = res.setHeader.bind(res);

package/dist/init-cloudflare.d.ts

@@ -8,7 +8,6 @@ export type CloudflareProjectInfo = {
   hasMDX: boolean;
   /** The effective Next.js config sets `output: "export"`. */
   isStaticExport?: boolean;
-  nativeModulesToStub: string[];
 };
 export type CloudflarePlatformSetupContext = {
   root: string;
@@ -46,14 +45,13 @@ export declare function cssModulesConfigSource(indent?: string): string;
 /** Generate vite.config.ts for App Router */
 export declare function generateAppRouterViteConfig(info?: CloudflareProjectInfo, options?: CloudflareInitOptions, imagesBinding?: string, versionMetadataBinding?: string, serviceBinding?: boolean, assetsBinding?: string, assetsDirectory?: string, hasCssModules?: boolean): string;
 /** Generate vite.config.ts for Pages Router */
-export declare function generatePagesRouterViteConfig(info?: CloudflareProjectInfo, options?: CloudflareInitOptions, imagesBinding?: string, versionMetadataBinding?: string, serviceBinding?: boolean, hasCssModules?: boolean, assetsBinding?: string, assetsDirectory?: string): string;
+export declare function generatePagesRouterViteConfig(options?: CloudflareInitOptions, imagesBinding?: string, versionMetadataBinding?: string, serviceBinding?: boolean, hasCssModules?: boolean, assetsBinding?: string, assetsDirectory?: string): string;
 export declare function updateViteConfigForCssModules(filePath: string, code: string): {
   code: string;
   preservedExistingGenerateScopedName: boolean;
 };
 export declare function updateViteConfigForCloudflare(filePath: string, code: string, options: {
   isAppRouter: boolean;
-  nativeModulesToStub: string[];
   cache?: CloudflareInitOptions;
   assetsBinding?: string;
   assetsDirectory?: string;