vinext 1.3.0 → 1.3.1

package/dist/index.js

@@ -46,6 +46,7 @@ import { handleApiRoute } from "./server/api-handler.js";
 import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, isImageOptimizationPath, resolveDevImageRedirect } from "./server/image-optimization.js";
 import { CACHEABILITY_MANIFEST_MODULE, CACHEABILITY_REQUEST_PROJECTION_MODULE } from "./server/cacheability-manifest.js";
 import { PREGENERATED_CONCRETE_PATHS_MODULE } from "./server/pregenerated-concrete-paths.js";
+import { isAppInterceptRenderedDynamically, isAppPageRouteRenderedDynamically } from "./build/app-page-static-eligibility.js";
 import { rewriteOutputRootExternals } from "./build/output-root-externals.js";
 import { installSocketErrorBackstop } from "./server/socket-error-backstop.js";
 import { invalidateMetadataFileCache, scanMetadataFiles } from "./server/metadata-routes.js";
@@ -66,7 +67,7 @@ import { loadOrGenerateServerActionsEncryptionKey } from "./build/server-actions
 import { findOpenTelemetryPackages, mergeServerExternalPackages } from "./config/server-external-packages.js";
 import { precompressAssets } from "./build/precompress.js";
 import { VINEXT_PRERENDER_CONFIG_PLUGIN_PROPERTY, VINEXT_ROUTE_ROOT_CONFIG_PLUGIN_PROPERTY, normalizeVinextPrerenderConfig } from "./config/prerender.js";
-import { VINEXT_CLIENT_ENTRY_MANIFEST } from "./utils/client-entry-manifest.js";
+import { VINEXT_CLIENT_ENTRY_MANIFEST, VINEXT_CLIENT_REFERENCE_SOURCES } from "./utils/client-entry-manifest.js";
 import { PAGES_CLIENT_ASSETS_MODULE, buildPagesClientAssetsModule, collectClientBuildFiles, writePagesClientAssetsModuleIfMissing } from "./build/pages-client-assets-module.js";
 import { createPreviewBuildCredentials, getPreviewBuildCredentials } from "./build/preview-credentials.js";
 import { VINEXT_BUILD_LIFECYCLE_CONFIG, createBuildLifecyclePlugins } from "./build/lifecycle.js";
@@ -85,6 +86,7 @@ import { VIRTUAL_MODULE_ID_RE } from "./utils/virtual-module.js";
 import { assertNoPublicDirAssetConflict, assertNoPublicNextRequestConflict } from "./build/public-dir-conflict.js";
 import { renderVinextBuiltUrl } from "./utils/built-asset-url.js";
 import { asyncHooksStubPlugin } from "./plugins/async-hooks-stub.js";
+import { createClientCompileHintsPlugin } from "./plugins/client-compile-hints.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";
@@ -117,6 +119,7 @@ import { readPrerenderSecret, readServerRuntimeOutputDirs } from "./build/server
 import { ModuleDependencyStore, createModuleDependencyCache } from "./build/module-dependency-cache.js";
 import { markCssUrlAssetReferences, restoreDedupedCssAssetReferences } from "./build/css-url-assets.js";
 import { buildSassPreprocessorOptions, createSassAwareFileSystemLoader, createSassCssUrlAssetImporter, createSassTildeImporter, createSassTsconfigPathImporters } from "./plugins/sass.js";
+import { collectClientReferenceChunks, collectClientReferenceSources } from "./build/client-reference-chunks.js";
 import { EXPORT_ALL_CANDIDATE_FILTER, hasExportAllCandidate, stripServerExports, validatePageExports } from "./plugins/strip-server-exports.js";
 import { removeConsoleCalls } from "./plugins/remove-console.js";
 import { createImportMetaUrlPlugin } from "./plugins/import-meta-url.js";
@@ -139,7 +142,7 @@ import { staticExportApp, staticExportPages } from "./build/static-export.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
 import { pathToFileURL } from "node:url";
-import { createIdResolver, createLogger, isRunnableDevEnvironment, transformWithOxc } from "vite";
+import { createIdResolver, createLogger, esmExternalRequirePlugin, isRunnableDevEnvironment, transformWithOxc } from "vite";
 import { createHash, randomBytes } from "node:crypto";
 import MagicString from "magic-string";
 import commonjs from "vite-plugin-commonjs";
@@ -161,6 +164,11 @@ const APP_CLIENT_OPTIONAL_OPTIMIZE_DEPS_INCLUDE = Object.freeze([
 	"use-sync-external-store/with-selector",
 	"use-sync-external-store/with-selector.js"
 ]);
+const CLIENT_OPTIONAL_OPTIMIZE_DEPS_INCLUDE = Object.freeze([
+	"vinext > @unpic/react",
+	"vinext > ipaddr.js",
+	"vinext > web-vitals"
+]);
 const ANSI_ESCAPE_RE = new RegExp(`${String.fromCharCode(27)}\\[[0-9;]*m`, "g");
 const RSC_ENVIRONMENTS = /* @__PURE__ */ new Set([
 	"rsc",
@@ -1002,6 +1010,7 @@ function vinext(options = {}) {
 	let rscActionOwnerRoutes = null;
 	let rscActionOwnerSharedRoots = [];
 	let clientReferenceRoutes = null;
+	let clientReferenceModules = null;
 	let clientReferenceAlwaysRenderedFiles = [];
 	let clientReferenceRoutelessFiles = [];
 	const serverEntryKindsByEnvironment = /* @__PURE__ */ new Map();
@@ -1038,6 +1047,8 @@ function vinext(options = {}) {
 		resolveShimModulePath(shimsDir, "cache")
 	].map(canonicalize));
 	let nextShimMap = {};
+	let shimOptimizeDepsExclude = VINEXT_OPTIMIZE_DEPS_EXCLUDE;
+	const createShimRequirePlugin = () => esmExternalRequirePlugin({ external: [...shimOptimizeDepsExclude] });
 	/**
 	* Generate the virtual SSR server entry module.
 	* This is the entry point for `vite build --ssr`.
@@ -1618,6 +1629,7 @@ function vinext(options = {}) {
 					"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]]));
+				shimOptimizeDepsExclude = mergeOptimizeDepsExclude(VINEXT_OPTIMIZE_DEPS_EXCLUDE, Object.keys(nextShimMap), [..._reactServerShims.keys()]);
 				const pluginsFlat = [];
 				function flattenPlugins(arr) {
 					for (const p of arr) if (Array.isArray(p)) flattenPlugins(p);
@@ -1815,12 +1827,12 @@ function vinext(options = {}) {
 				};
 				const depOptimizeNodeEnvOptions = getDepOptimizeNodeEnvOptions(nodeEnvDefine);
 				viteConfig.optimizeDeps = {
-					exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE, ["@tailwindcss/oxide"]),
+					exclude: mergeOptimizeDepsExclude(incomingExclude, hasAppDir ? shimOptimizeDepsExclude : VINEXT_OPTIMIZE_DEPS_EXCLUDE, ["@tailwindcss/oxide"]),
 					...incomingInclude.length > 0 ? { include: incomingInclude } : {},
 					...depOptimizeNodeEnvOptions,
 					rolldownOptions: {
 						...depOptimizeNodeEnvOptions.rolldownOptions,
-						plugins: [depOptimizeAliasPlugin, commonJsEsmFacadeOptimizeDepsPlugin]
+						plugins: hasAppDir ? [commonJsEsmFacadeOptimizeDepsPlugin] : [depOptimizeAliasPlugin, commonJsEsmFacadeOptimizeDepsPlugin]
 					}
 				};
 				pagesOptimizeEntries = !hasAppDir ? [...hasPagesDir ? [toRelativeFileEntry(root, pagesDir) + "/**/*.{tsx,ts,jsx,js}"] : [], ...[instrumentationPath, instrumentationClientPath].flatMap((entry) => entry ? [toRelativeFileEntry(root, entry)] : [])] : [];
@@ -1875,7 +1887,6 @@ function vinext(options = {}) {
 									additionalClientOptimizeIncludes.push(include);
 								} catch {}
 							}
-							if (!excluded.includes("next") && !excluded.includes("next/link")) additionalClientOptimizeIncludes.push("next/link");
 						} catch {}
 					}
 					const appClientInput = { index: VIRTUAL_APP_BROWSER_ENTRY };
@@ -1895,13 +1906,9 @@ function vinext(options = {}) {
 								noExternal: userSsrExternal === true ? [...PATCHED_SERVER_PACKAGES] : true
 							} },
 							optimizeDeps: {
-								exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE),
+								exclude: mergeOptimizeDepsExclude(incomingExclude, shimOptimizeDepsExclude),
 								entries: optimizeEntries,
-								include: [.../* @__PURE__ */ new Set([
-									...incomingInclude,
-									...additionalRscOptimizeIncludes,
-									"react-server-dom-webpack/static.edge"
-								])],
+								include: [.../* @__PURE__ */ new Set([...incomingInclude, ...additionalRscOptimizeIncludes])],
 								...depOptimizeNodeEnvOptions
 							},
 							build: {
@@ -1923,7 +1930,8 @@ function vinext(options = {}) {
 								noExternal: userSsrExternal === true ? [...PATCHED_SERVER_PACKAGES] : true
 							} },
 							optimizeDeps: {
-								exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE, ["ipaddr.js"], userSsrExternal === true || externalizeSsrReactInDev ? SSR_EXTERNAL_REACT_ENTRIES : []),
+								exclude: mergeOptimizeDepsExclude(incomingExclude, shimOptimizeDepsExclude, ["ipaddr.js"], userSsrExternal === true || externalizeSsrReactInDev ? SSR_EXTERNAL_REACT_ENTRIES : []),
+								...userSsrExternal === true || externalizeSsrReactInDev || hasCloudflarePlugin ? {} : { include: ["react-dom/server", "react-dom/static"] },
 								entries: optimizeEntries,
 								...depOptimizeNodeEnvOptions
 							},
@@ -1935,7 +1943,7 @@ function vinext(options = {}) {
 						client: {
 							consumer: "client",
 							optimizeDeps: {
-								exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE, nextServerExternal),
+								exclude: mergeOptimizeDepsExclude(incomingExclude, shimOptimizeDepsExclude, nextServerExternal),
 								entries: optimizeEntries,
 								include: [.../* @__PURE__ */ new Set([
 									...incomingInclude,
@@ -2013,7 +2021,7 @@ function vinext(options = {}) {
 								noExternal: true
 							},
 							optimizeDeps: {
-								exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE, ["ipaddr.js"], Object.keys(nextShimMap)),
+								exclude: mergeOptimizeDepsExclude(incomingExclude, shimOptimizeDepsExclude, ["ipaddr.js"]),
 								...depOptimizeNodeEnvOptions
 							},
 							build: {
@@ -2041,17 +2049,27 @@ function vinext(options = {}) {
 					copyPublicDirIntoStaticExportBasePath = config.build.copyPublicDir !== false;
 					config.build.copyPublicDir = false;
 				}
-				if (name !== "client" && config.consumer !== "client") {
+				const isClientConsumer = name === "client" || config.consumer === "client";
+				if (isClientConsumer && hasAppDir) {
+					config.optimizeDeps ??= {};
+					config.optimizeDeps.exclude = mergeOptimizeDepsExclude(config.optimizeDeps.exclude ?? [], shimOptimizeDepsExclude);
+				}
+				if (!isClientConsumer) {
 					config.optimizeDeps ??= {};
 					config.optimizeDeps.rolldownOptions ??= {};
 					const configuredPlugins = config.optimizeDeps.rolldownOptions.plugins;
-					config.optimizeDeps.rolldownOptions.plugins = [...Array.isArray(configuredPlugins) ? configuredPlugins : configuredPlugins ? [configuredPlugins] : [], importMetaUrlCapability.optimizeDepsPlugin];
+					config.optimizeDeps.rolldownOptions.plugins = [
+						...Array.isArray(configuredPlugins) ? configuredPlugins : configuredPlugins ? [configuredPlugins] : [],
+						importMetaUrlCapability.optimizeDepsPlugin,
+						createShimRequirePlugin()
+					];
+					config.optimizeDeps.exclude = mergeOptimizeDepsExclude(config.optimizeDeps.exclude ?? [], shimOptimizeDepsExclude);
 				}
 				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);
+					config.optimizeDeps.exclude = mergeOptimizeDepsExclude(config.optimizeDeps.exclude ?? [], PAGES_CLOUDFLARE_WORKER_OPTIMIZE_DEPS_EXCLUDE);
 				}
 				const configuredExtensions = name === "client" ? nextConfig.resolveExtensions : nextConfig.serverResolveExtensions;
 				const extensions = configuredExtensions === null ? buildViteResolveExtensions(config.resolve?.extensions) : normalizeViteResolveExtensions(configuredExtensions);
@@ -2066,11 +2084,21 @@ function vinext(options = {}) {
 						if (!config.server.middlewareMode) applyDevServerDefaults(config.server, {});
 					}
 				}
-				if (isServeCommand && (hasAppDir || hasCloudflarePlugin && hasPagesDir)) {
+				if (isServeCommand) {
 					const optionalWarnings = /* @__PURE__ */ new Set();
+					const isExcludedShim = (depId) => shimOptimizeDepsExclude.some((excluded) => {
+						if (depId === excluded || depId.startsWith(`${excluded}/`)) return true;
+						if (!/[*?[\]{}()!]/.test(depId)) return false;
+						const pkgName = depId.split("/").slice(0, depId.startsWith("@") ? 2 : 1).join("/");
+						if (excluded !== pkgName && !excluded.startsWith(`${pkgName}/`)) return false;
+						return typeof path.matchesGlob !== "function" || path.matchesGlob(excluded, depId);
+					});
 					for (const [name, environment] of Object.entries(config.environments)) {
 						const optimizer = environment.optimizeDeps;
-						const optionalIncludes = hasAppDir ? name === "client" && !optimizer.noDiscovery ? APP_CLIENT_OPTIONAL_OPTIMIZE_DEPS_INCLUDE : [] : name !== "client" ? PAGES_CLOUDFLARE_WORKER_OPTIONAL_OPTIMIZE_DEPS_INCLUDE : [];
+						const isClient = (environment.consumer ?? name) === "client";
+						const optimizerActive = !optimizer.noDiscovery || !!optimizer.include?.length;
+						if (optimizer.include && (!isClient || hasAppDir)) optimizer.include = optimizer.include.filter((id) => !isExcludedShim(id.slice(id.lastIndexOf(">") + 1).trim()));
+						const optionalIncludes = isClient ? hasAppDir && optimizerActive ? [...optimizer.noDiscovery ? [] : APP_CLIENT_OPTIONAL_OPTIMIZE_DEPS_INCLUDE, ...CLIENT_OPTIONAL_OPTIMIZE_DEPS_INCLUDE] : [] : !hasAppDir && hasCloudflarePlugin && hasPagesDir ? PAGES_CLOUDFLARE_WORKER_OPTIONAL_OPTIMIZE_DEPS_INCLUDE : [];
 						for (const id of optionalIncludes) {
 							const depId = id.slice(id.lastIndexOf(">") + 1).trim();
 							if (optimizer.include?.includes(id) || optimizer.include?.includes(depId) || optimizer.exclude?.some((excluded) => depId === excluded || depId.startsWith(`${excluded}/`))) continue;
@@ -2383,7 +2411,12 @@ function vinext(options = {}) {
 							isDynamic: route.isDynamic,
 							patternParts: [...route.patternParts]
 						})) : [];
-						return generateBrowserEntry(graph.routes, pagesPrefetchRoutes, nextConfig.rewrites, nextConfig.i18n?.locales);
+						const classifyDynamicRoutes = this.environment.config.command === "build" && !nextConfig?.cacheComponents;
+						const readMdxEsm = classifyDynamicRoutes && pageExtensionsIncludeMdx(nextConfig?.pageExtensions ?? []) ? await loadMdxEsmReader(root) : null;
+						return generateBrowserEntry(graph.routes, pagesPrefetchRoutes, nextConfig.rewrites, nextConfig.i18n?.locales, classifyDynamicRoutes ? {
+							route: (route) => isAppPageRouteRenderedDynamically(route, readMdxEsm),
+							intercept: (intercept, layoutPaths) => isAppInterceptRenderedDynamically(intercept, layoutPaths, readMdxEsm)
+						} : void 0);
 					}
 					if (id === RESOLVED_APP_ROUTE_MANIFEST && hasAppDir) {
 						const graph = await appRouteGraph(appDir, nextConfig?.pageExtensions, fileMatcher);
@@ -2439,6 +2472,20 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				}
 			}
 		},
+		{
+			name: "vinext:cloudflare-react-dom-edge",
+			enforce: "pre",
+			resolveId: {
+				filter: { id: /^react-dom\/(?:server|static)$/ },
+				handler(id, importer, options) {
+					if (!hasCloudflarePlugin || this.environment?.config.consumer !== "server" || this.environment.name === "rsc") return;
+					return this.resolve(`${id}.edge`, importer, {
+						...options,
+						skipSelf: true
+					});
+				}
+			}
+		},
 		{
 			name: "vinext:cloudflare-framework-tracing",
 			transform: {
@@ -2649,22 +2696,38 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 		{
 			name: "vinext:client-entry-manifest",
 			apply: "build",
-			generateBundle(_options, bundle) {
-				if (this.environment?.name !== "client") return;
-				const manifest = {};
-				for (const chunk of Object.values(bundle)) {
-					if (chunk.type !== "chunk" || !chunk.isEntry) continue;
-					if (isVirtualEntryFacade(chunk.facadeModuleId, VIRTUAL_CLIENT_ENTRY)) manifest.pagesClientEntry = chunk.fileName;
-					else if (isVirtualEntryFacade(chunk.facadeModuleId, VIRTUAL_APP_BROWSER_ENTRY)) manifest.appBrowserEntry = chunk.fileName;
+			generateBundle: {
+				order: "post",
+				handler(_options, bundle) {
+					if (this.environment?.name !== "client") return;
+					const manifest = {};
+					for (const chunk of Object.values(bundle)) {
+						if (chunk.type !== "chunk") continue;
+						if (chunk.isDynamicEntry && isVirtualEntryFacade(chunk.facadeModuleId, VIRTUAL_APP_ROUTE_MANIFEST)) manifest.appRouteManifest = chunk.fileName;
+						if (!chunk.isEntry) continue;
+						if (isVirtualEntryFacade(chunk.facadeModuleId, VIRTUAL_CLIENT_ENTRY)) manifest.pagesClientEntry = chunk.fileName;
+						else if (isVirtualEntryFacade(chunk.facadeModuleId, VIRTUAL_APP_BROWSER_ENTRY)) manifest.appBrowserEntry = chunk.fileName;
+					}
+					if (clientReferenceModules) {
+						const appBrowserEntry = manifest.appBrowserEntry ? bundle[manifest.appBrowserEntry] : void 0;
+						manifest.appClientReferenceChunks = collectClientReferenceChunks(bundle, clientReferenceModules, appBrowserEntry?.type === "chunk" ? appBrowserEntry : void 0, this.environment.config.build.modulePreload);
+						const sources = collectClientReferenceSources(bundle, (moduleId) => this.getModuleInfo(moduleId)?.importedIds, this.environment.config.root);
+						if (sources) this.emitFile({
+							type: "asset",
+							fileName: VINEXT_CLIENT_REFERENCE_SOURCES,
+							source: JSON.stringify(sources, null, 2) + "\n"
+						});
+					}
+					if (!manifest.pagesClientEntry && !manifest.appBrowserEntry) return;
+					this.emitFile({
+						type: "asset",
+						fileName: VINEXT_CLIENT_ENTRY_MANIFEST,
+						source: JSON.stringify(manifest, null, 2) + "\n"
+					});
 				}
-				if (!manifest.pagesClientEntry && !manifest.appBrowserEntry) return;
-				this.emitFile({
-					type: "asset",
-					fileName: VINEXT_CLIENT_ENTRY_MANIFEST,
-					source: JSON.stringify(manifest, null, 2) + "\n"
-				});
 			}
 		},
+		createClientCompileHintsPlugin((id) => isVirtualEntryFacade(id, VIRTUAL_APP_BROWSER_ENTRY) || isVirtualEntryFacade(id, VIRTUAL_CLIENT_ENTRY)),
 		asyncHooksStubPlugin,
 		createInstrumentationClientTransformPlugin(() => instrumentationClientPath, () => nextConfig.instrumentationClientRouteManifest),
 		createInstrumentationServerTransformPlugin(() => instrumentationPath, () => nextConfig.instrumentationServerValueInjections),
@@ -3855,7 +3918,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				const cache = imageImportDimCache;
 				let dims = cache.get(imagePath);
 				if (!dims) try {
-					const { imageSize } = await import("./deps/.pnpm/image-size@2.0.2/deps/image-size/dist/index.js");
+					const { imageSize } = await import("./deps/.pnpm/image-size@2.0.4/deps/image-size/dist/esm/index.js");
 					const result = imageSize(fs.readFileSync(imagePath));
 					dims = {
 						width: result.width ?? 0,
@@ -4178,6 +4241,8 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 						pagesClientAssetsModule = buildPagesClientAssetsModule({
 							clientEntry: runtimeMetadata.clientEntryFile ?? void 0,
 							appBootstrapPreinitModules: runtimeMetadata.appBootstrapPreinitModules,
+							appRouteManifestModule: runtimeMetadata.appRouteManifestModule,
+							appClientReferenceChunks: runtimeMetadata.appClientReferenceChunks,
 							ssrManifest,
 							cssGraph: runtimeMetadata.cssGraph,
 							sharedChunks: runtimeMetadata.sharedChunks,
@@ -4392,6 +4457,9 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 	if (rscPluginPromise) {
 		plugins.push(createRscReferenceValidationNormalizerPlugin());
 		plugins.push(createRscClientReferenceLoadersPlugin({
+			onClientReferenceModules(modules) {
+				clientReferenceModules = modules;
+			},
 			routes: {
 				canonicalizeModuleId: canonicalize,
 				getAlwaysRenderedFiles: () => clientReferenceAlwaysRenderedFiles,

package/dist/plugins/client-compile-hints.d.ts

@@ -0,0 +1,30 @@
+import { Plugin } from "vite";
+//#region src/plugins/client-compile-hints.d.ts
+/**
+ * V8's file-level explicit compile hint (Chrome 136+). V8 compiles every
+ * function in a file that starts with this comment eagerly, on the background
+ * thread that streams the script, instead of lazily on the main thread the
+ * first time each function runs. Other engines ignore it.
+ * https://v8.dev/blog/explicit-compile-hints
+ */
+export declare const CLIENT_COMPILE_HINT = "//# allFunctionsCalledOnLoad";
+/**
+ * Marks the client chunks every page load runs with V8's compile hint.
+ *
+ * Those are the browser entry chunks and the chunks they import statically:
+ * React, React DOM, the Flight client and the vinext runtime. Hydration calls
+ * most of their functions on load, so lazy compilation only moves that work
+ * onto the main thread. Chunks reached through dynamic imports (route code,
+ * lazy client references, navigation-only modules) keep lazy compilation,
+ * since eagerly compiling code a page may never call costs time and memory.
+ *
+ * The hint has to be the first line of the file, so it is added in the last
+ * generateBundle pass, after minification and after Vite's import analysis
+ * prepends its `__vite__mapDeps` preload helper. That pass runs after Rolldown
+ * hashes file names, so `augmentChunkHash` salts the hash of every chunk that
+ * gets the hint: a hinted file never reuses the URL of an unhinted one, which
+ * browsers may hold as immutable. Its sourcemap keeps following the chunk's
+ * name, so builds that name sourcemaps themselves are left alone.
+ */
+export declare function createClientCompileHintsPlugin(isBrowserEntry: (id: string) => boolean): Plugin;
+//#endregion

package/dist/plugins/client-compile-hints.js

@@ -0,0 +1,88 @@
+//#region src/plugins/client-compile-hints.ts
+/**
+* V8's file-level explicit compile hint (Chrome 136+). V8 compiles every
+* function in a file that starts with this comment eagerly, on the background
+* thread that streams the script, instead of lazily on the main thread the
+* first time each function runs. Other engines ignore it.
+* https://v8.dev/blog/explicit-compile-hints
+*/
+const CLIENT_COMPILE_HINT = "//# allFunctionsCalledOnLoad";
+/** Shifts a sourcemap down one generated line, for a line added at the top. */
+function shiftSourceMapSource(source) {
+	const text = typeof source === "string" ? source : new TextDecoder().decode(source);
+	const map = JSON.parse(text);
+	map.mappings = ";" + map.mappings;
+	return JSON.stringify(map);
+}
+/**
+* Marks the client chunks every page load runs with V8's compile hint.
+*
+* Those are the browser entry chunks and the chunks they import statically:
+* React, React DOM, the Flight client and the vinext runtime. Hydration calls
+* most of their functions on load, so lazy compilation only moves that work
+* onto the main thread. Chunks reached through dynamic imports (route code,
+* lazy client references, navigation-only modules) keep lazy compilation,
+* since eagerly compiling code a page may never call costs time and memory.
+*
+* The hint has to be the first line of the file, so it is added in the last
+* generateBundle pass, after minification and after Vite's import analysis
+* prepends its `__vite__mapDeps` preload helper. That pass runs after Rolldown
+* hashes file names, so `augmentChunkHash` salts the hash of every chunk that
+* gets the hint: a hinted file never reuses the URL of an unhinted one, which
+* browsers may hold as immutable. Its sourcemap keeps following the chunk's
+* name, so builds that name sourcemaps themselves are left alone.
+*/
+function createClientCompileHintsPlugin(isBrowserEntry) {
+	const startupByEnvironment = /* @__PURE__ */ new WeakMap();
+	const startupChunks = (environment) => (environment && startupByEnvironment.get(environment)?.chunks) ?? void 0;
+	return {
+		name: "vinext:client-compile-hints",
+		apply: "build",
+		enforce: "post",
+		renderStart(outputOptions) {
+			const environment = this.environment;
+			if (environment?.name !== "client") return;
+			const { codeSplitting, sourcemap, sourcemapFileNames } = outputOptions;
+			if (!codeSplitting || sourcemap === "inline" || sourcemap && sourcemapFileNames !== void 0) {
+				startupByEnvironment.delete(environment);
+				return;
+			}
+			startupByEnvironment.set(environment, { chunks: null });
+		},
+		renderChunk(_code, _chunk, _options, meta) {
+			const state = this.environment && startupByEnvironment.get(this.environment);
+			if (!state || state.chunks) return null;
+			const startup = /* @__PURE__ */ new Set();
+			const pending = [];
+			for (const chunk of Object.values(meta.chunks)) if (chunk.isEntry && chunk.facadeModuleId !== null && isBrowserEntry(chunk.facadeModuleId)) pending.push(chunk.fileName);
+			for (let fileName = pending.pop(); fileName !== void 0; fileName = pending.pop()) {
+				const chunk = meta.chunks[fileName];
+				if (startup.has(fileName) || !chunk) continue;
+				startup.add(fileName);
+				pending.push(...chunk.imports);
+			}
+			state.chunks = startup;
+			return null;
+		},
+		augmentChunkHash(chunk) {
+			if (startupChunks(this.environment)?.has(chunk.fileName)) return CLIENT_COMPILE_HINT;
+		},
+		generateBundle: {
+			order: "post",
+			handler(options, bundle) {
+				const startup = startupChunks(this.environment);
+				if (!startup) return;
+				for (const chunk of Object.values(bundle)) {
+					if (chunk.type !== "chunk" || !startup.has(chunk.preliminaryFileName)) continue;
+					chunk.code = `${CLIENT_COMPILE_HINT}\n${chunk.code}`;
+					if (!options.sourcemap) continue;
+					if (chunk.map) chunk.map.mappings = ";" + chunk.map.mappings;
+					const mapAsset = chunk.sourcemapFileName ? bundle[chunk.sourcemapFileName] : void 0;
+					if (mapAsset?.type === "asset") mapAsset.source = shiftSourceMapSource(mapAsset.source);
+				}
+			}
+		}
+	};
+}
+//#endregion
+export { CLIENT_COMPILE_HINT, createClientCompileHintsPlugin };

package/dist/plugins/client-reference-dedup.d.ts

@@ -30,4 +30,5 @@ export declare function extractPackageImportSpecifier(absolutePath: string, read
  * Dev-only — production builds use the SSR manifest which handles this correctly.
  */
 export declare function clientReferenceDedupPlugin(options?: ClientReferenceDedupOptions): Plugin;
-//#endregion
+//#endregion
+export {};

package/dist/plugins/cloudflare-dev-module-urls.d.ts

@@ -38,4 +38,5 @@ type CloudflareDevModuleUrlsOptions = {
  * @returns The Vite plugin
  */
 export declare function createCloudflareDevModuleUrlsPlugin(options: CloudflareDevModuleUrlsOptions): Plugin;
-//#endregion
+//#endregion
+export {};

package/dist/plugins/dynamic-preload-metadata.d.ts

@@ -6,6 +6,8 @@ type TransformResult = {
   map: ReturnType<MagicString["generateMap"]>;
 };
 type ResolveDynamicImport = (specifier: string, importer: string) => Promise<string | null>;
+export declare function toManifestModuleId(root: string, resolvedId: string): string | null;
 export declare function transformNextDynamicPreloadMetadata(code: string, id: string, root: string, resolveDynamicImport: ResolveDynamicImport): Promise<TransformResult | null>;
 export declare function createDynamicPreloadMetadataPlugin(getTranspiledPackages: () => readonly string[]): Plugin;
-//#endregion
+//#endregion
+export {};

package/dist/plugins/dynamic-preload-metadata.js

@@ -290,4 +290,4 @@ function createDynamicPreloadMetadataPlugin(getTranspiledPackages) {
 	};
 }
 //#endregion
-export { createDynamicPreloadMetadataPlugin, transformNextDynamicPreloadMetadata };
+export { createDynamicPreloadMetadataPlugin, toManifestModuleId, transformNextDynamicPreloadMetadata };

package/dist/plugins/environment.d.ts

@@ -7,4 +7,5 @@ type PluginEnvironment = {
 };
 /** Whether a Vite environment produces server-consumed output. */
 export declare function isServerEnvironment(environment: PluginEnvironment): boolean;
-//#endregion
+//#endregion
+export {};

package/dist/plugins/fonts.js

@@ -74,10 +74,12 @@ const CACHED_FONT_DIR_TOKEN = "__VINEXT_FONT_CACHE_DIR__";
 * Cached stylesheet whose `url()` references use `CACHED_FONT_DIR_TOKEN`.
 * The suffix ties the cache to that format: a `style.css` written by an
 * earlier vinext holds the writing checkout's absolute paths, which would
-* 404 once embedded, so it is never read and the font is fetched again.
-* Change the suffix whenever the cached CSS format changes.
+* 404 once embedded, and a `style-q7f3kd.css` names extensionless Google
+* font URLs `.ttf` whatever their format, so neither is read and the font
+* is fetched again. Change the suffix whenever the cached CSS format
+* changes.
 */
-const CACHED_FONT_CSS_FILE = "style-q7f3kd.css";
+const CACHED_FONT_CSS_FILE = "style-h8r2vn.css";
 function formatGoogleFontsErrorBody(body) {
 	const trimmed = body.trim();
 	if (!trimmed) return "(empty response body)";
@@ -330,16 +332,11 @@ async function downloadGoogleFont(cssUrl, family, fontDir, fontDirName) {
 	}
 	let css = await cssResponse.text();
 	if (!css.trim()) throw new Error(`Google Fonts returned an empty stylesheet: ${cssUrl}`);
-	const urlRe = /url\((https:\/\/fonts\.gstatic\.com\/[^)]+)\)/g;
 	const urls = /* @__PURE__ */ new Map();
-	let urlMatch;
-	while ((urlMatch = urlRe.exec(css)) !== null) {
-		const fontUrl = urlMatch[1];
-		if (!urls.has(fontUrl)) {
-			const ext = fontUrl.includes(".woff2") ? ".woff2" : fontUrl.includes(".woff") ? ".woff" : ".ttf";
-			const fileHash = createHash("md5").update(fontUrl).digest("hex").slice(0, 8);
-			urls.set(fontUrl, `${family.toLowerCase().replace(/\s+/g, "-")}-${fileHash}${ext}`);
-		}
+	for (const { googleFontFileUrl: fontUrl, ext } of findFontFilesInCss(css)) {
+		if (!fontUrl.startsWith("https://fonts.gstatic.com/")) continue;
+		const fileHash = createHash("md5").update(fontUrl).digest("hex").slice(0, 8);
+		urls.set(fontUrl, `${family.toLowerCase().replace(/\s+/g, "-")}-${fileHash}.${ext}`);
 	}
 	fs.mkdirSync(fontDir, { recursive: true });
 	for (const [fontUrl, filename] of urls) {

package/dist/plugins/ignore-dynamic-requests.d.ts

@@ -15,4 +15,5 @@ declare function transformVeryDynamicRequests(code: string, id: string): MagicSt
 export declare function createIgnoreDynamicRequestsPlugin(getTranspiledPackages?: () => readonly string[]): Plugin;
 export declare const _transformVeryDynamicRequests: typeof transformVeryDynamicRequests;
 export declare const _mayContainVeryDynamicRequest: typeof mayContainVeryDynamicRequest;
-//#endregion
+//#endregion
+export {};

package/dist/plugins/import-meta-url.d.ts

@@ -17,4 +17,5 @@ export declare function createImportMetaUrlPlugin(options: {
 }): ImportMetaUrlCapability;
 export declare function rewriteImportMetaUrl(code: string, id: string, root: string, environment: ImportMetaUrlEnvironment): MagicStringTransformResult | null;
 export declare function rewriteServerCjsGlobals(code: string, id: string, root: string): MagicStringTransformResult | null;
-//#endregion
+//#endregion
+export {};

package/dist/plugins/og-assets.d.ts

@@ -63,4 +63,5 @@ export declare function copyMissingOgWasm(opts: {
  * target — so it helps Node/self-hosted builds as well as Cloudflare Workers.
  */
 export declare function createOgAssetsPlugin(): Plugin;
-//#endregion
+//#endregion
+export {};

package/dist/plugins/og-assets.js

@@ -37,9 +37,8 @@ function createOgInlineFetchAssetsPlugin() {
 				...options,
 				skipSelf: true
 			});
-			if (resolved === null || resolved.external) return null;
-			await ownership.recordResolvedImport(source, resolved.id);
-			return null;
+			if (resolved !== null && !resolved.external) await ownership.recordResolvedImport(source, resolved.id);
+			return options.kind === "require-call" ? null : resolved;
 		},
 		transform: {
 			filter: { code: "import.meta.url" },

package/dist/plugins/optimize-imports.d.ts

@@ -61,4 +61,5 @@ export declare function buildBarrelExportMap(entryPath: string | null, readFile:
  * @param getRoot - Returns the current project root (set by the vinext:config hook).
  */
 export declare function createOptimizeImportsPlugin(getNextConfig: () => ResolvedNextConfig | undefined, getRoot: () => string): Plugin;
-//#endregion
+//#endregion
+export {};

package/dist/plugins/pages-node-externals.d.ts

@@ -19,4 +19,5 @@ type PagesNodeExternalsOptions = {
  * selected `import` export just like Turbopack.
  */
 export declare function createPagesNodeExternalsPlugin(options: PagesNodeExternalsOptions): Plugin;
-//#endregion
+//#endregion
+export {};

package/dist/plugins/remove-console.d.ts

@@ -16,4 +16,5 @@ type RemoveConsoleResult = {
  * Returns `null` if no console calls are removed.
  */
 export declare function removeConsoleCalls(code: string, config: RemoveConsoleConfig): RemoveConsoleResult | null;
-//#endregion
+//#endregion
+export {};

package/dist/plugins/require-condition-resolution.d.ts

@@ -12,4 +12,5 @@ export declare function isConditionalRequireScriptModuleId(id: string): boolean;
 type IdResolverFactory = typeof createIdResolver;
 type CommonJsTransformFilter = (id: string) => boolean | undefined;
 export declare function createRequireConditionResolutionPlugin(createResolver?: IdResolverFactory, commonjsTransformFilter?: CommonJsTransformFilter): Plugin;
-//#endregion
+//#endregion
+export {};

package/dist/plugins/rsc-client-reference-loaders.d.ts

@@ -1,6 +1,9 @@
 import { AppRoute } from "../routing/app-route-graph.js";
 import { Plugin } from "vite";
 //#region src/plugins/rsc-client-reference-loaders.d.ts
+/** Prefixes the module that registers one client reference outside every group. */
+export declare const RESOLVED_CLIENT_REFERENCE_MODULE_PREFIX = "\0virtual:vinext-client-reference-module/";
+export declare const RESOLVED_CLIENT_REFERENCE_CHUNKS_ID = "\0virtual:vinext-client-reference-chunks";
 export type RscClientReferenceRouteOptions = {
   /** Maps route file paths to the module ids used by the RSC module graph. */
   canonicalizeModuleId: (id: string) => string;
@@ -37,6 +40,11 @@ export type RscClientReferenceGroupingOptions = {
 export declare function createRscClientReferenceLoadersPlugin(options?: {
   routes?: RscClientReferenceRouteOptions;
   grouping?: RscClientReferenceGroupingOptions;
+  /**
+   * Receives the client build's client reference modules: each resolved
+   * module id with the keys of the references it registers.
+   */
+  onClientReferenceModules?: (modules: ReadonlyMap<string, readonly string[]>) => void;
 }): Plugin;
 /**
  * Exports a null preload plan from the client-references virtual module when