vinext 1.4.2 → 1.4.3

package/dist/utils/client-runtime-metadata.js

@@ -41,11 +41,28 @@ function collectCssGraph(buildManifest, applyBase) {
 	}
 	return Object.keys(cssGraph).length > 0 ? cssGraph : void 0;
 }
-function collectAppBootstrapPreinitModules(buildManifest, appBrowserEntry, applyBase) {
-	if (!appBrowserEntry) return void 0;
+/**
+* The chunks the App Router browser entry statically imports, split by whether
+* they can run ahead of the shell. A preinitialized module evaluates as soon as
+* it loads, which on a reload can be before `<body>` has streamed. Evaluating
+* the browser runtime starts hydration, so a chunk that holds or imports it is
+* only preloaded, and runs when React's bootstrap script does. A user chunk
+* group can put the runtime in one of these chunks.
+*/
+function collectAppBootstrapModules(buildManifest, appBrowserEntry, appBrowserRuntime, applyBase) {
+	if (!appBrowserEntry) return {};
 	const entryKey = Object.keys(buildManifest).find((key) => buildManifest[key].file === appBrowserEntry);
-	if (!entryKey) return void 0;
-	const modules = [];
+	if (!entryKey) return {};
+	function evaluatesRuntime(key, seen = /* @__PURE__ */ new Set()) {
+		if (seen.has(key)) return false;
+		seen.add(key);
+		const chunk = buildManifest[key];
+		if (!chunk) return false;
+		if (chunk.file === appBrowserRuntime) return true;
+		return (chunk.imports ?? []).some((importedKey) => evaluatesRuntime(importedKey, seen));
+	}
+	const preinit = [];
+	const preload = [];
 	const seenFiles = /* @__PURE__ */ new Set();
 	const visitedChunks = /* @__PURE__ */ new Set();
 	function visit(key) {
@@ -57,18 +74,25 @@ function collectAppBootstrapPreinitModules(buildManifest, appBrowserEntry, apply
 			const importedChunk = buildManifest[importedKey];
 			if (importedChunk?.file.endsWith(".js") && !seenFiles.has(importedChunk.file)) {
 				seenFiles.add(importedChunk.file);
-				modules.push(applyBase(importedChunk.file));
+				(evaluatesRuntime(importedKey) ? preload : preinit).push(applyBase(importedChunk.file));
 			}
 			visit(importedKey);
 		}
 	}
 	visit(entryKey);
-	return modules.length > 0 ? modules : void 0;
+	return {
+		...preinit.length > 0 ? { preinit } : {},
+		...preload.length > 0 ? { preload } : {}
+	};
 }
 /**
 * Read the client build manifest and compute runtime metadata used by
 * Cloudflare worker entry injection and Node production server startup.
 *
+* - `appBootstrapPreinitModules` — chunks the App Router browser entry imports,
+*   preinitialized during SSR.
+* - `appBootstrapPreloadModules` — those of them that would start hydration if
+*   evaluated ahead of the shell, preloaded during SSR instead.
 * - `appRouteManifestModule` — the App Router RouteManifest chunk, which the
 *   browser entry imports as it boots, preloaded during SSR.
 * - `appClientReferenceChunks` — what each App Router client reference loads
@@ -118,7 +142,9 @@ function computeClientRuntimeMetadata(opts) {
 		metadata.cssGraph = collectCssGraph(buildManifest, (file) => manifestFileWithBase(file, opts.assetBase));
 		metadata.sharedChunks = collectSharedChunkFiles(buildManifest, (file) => manifestFileWithBase(file, opts.assetBase));
 	}
-	metadata.appBootstrapPreinitModules = collectAppBootstrapPreinitModules(buildManifest, clientEntryManifest?.appBrowserEntry, appAssetUrl);
+	const appBootstrapModules = collectAppBootstrapModules(buildManifest, clientEntryManifest?.appBrowserEntry, clientEntryManifest?.appBrowserRuntime, appAssetUrl);
+	metadata.appBootstrapPreinitModules = appBootstrapModules.preinit;
+	metadata.appBootstrapPreloadModules = appBootstrapModules.preload;
 	if (clientEntryManifest?.appRouteManifest) metadata.appRouteManifestModule = appAssetUrl(clientEntryManifest.appRouteManifest);
 	const lazyChunks = computeLazyChunks(buildManifest).map((file) => manifestFileWithBase(file, opts.assetBase));
 	if (lazyChunks.length > 0) metadata.lazyChunks = lazyChunks;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vinext",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "Run Next.js apps on Vite. Drop-in replacement for the next CLI.",
   "homepage": "https://vinext.dev/",
   "license": "MIT",