one 2.9.0 → 2.9.2

package/dist/cjs/cli/build.cjs

@@ -464,25 +464,23 @@ async function build(args) {
 		const layoutImports = layoutEntries.flatMap((entry) => {
 			return [entry.file, ...collectImports(entry)];
 		});
-		const routePreloads = {};
+		const routePreloadKeys = /* @__PURE__ */ new Set();
 		const rootLayoutKey = `${routerRoot}/_layout.tsx`;
-		const rootLayoutEntry = vxrnOutput.clientManifest[rootLayoutKey];
-		if (rootLayoutEntry) {
-			routePreloads[`/${rootLayoutKey}`] = `/${rootLayoutEntry.file}`;
+		if (vxrnOutput.clientManifest[rootLayoutKey]) {
+			routePreloadKeys.add(`/${rootLayoutKey}`);
 		}
 		if (foundRoute.layouts) {
 			for (const layout of foundRoute.layouts) {
 				const clientKey = `${routerRoot}${layout.contextKey.slice(1)}`;
-				const entry = vxrnOutput.clientManifest[clientKey];
-				if (entry) {
-					routePreloads[`/${clientKey}`] = `/${entry.file}`;
+				if (vxrnOutput.clientManifest[clientKey]) {
+					routePreloadKeys.add(`/${clientKey}`);
 				}
 			}
 		}
-		const routeChunkFile = clientChunk?.fileName ?? clientManifestEntry?.file;
-		if (routeChunkFile) {
-			routePreloads[`/${routerRoot}${foundRoute.file.slice(1)}`] = `/${routeChunkFile}`;
+		if (clientChunk || clientManifestEntry) {
+			routePreloadKeys.add(`/${routerRoot}${foundRoute.file.slice(1)}`);
 		}
+		const routePreloads = [...routePreloadKeys];
 		const preloadSetupFilePreloads = (() => {
 			if (!oneOptions.setupFile) return [];
 			const clientSetupFile = typeof oneOptions.setupFile === "string" ? oneOptions.setupFile : oneOptions.setupFile.client;

package/dist/cjs/cli/build.native.cjs

@@ -620,7 +620,7 @@ async function build(args) {
 	try {
 		var _loop1 = async function() {
 			var foundRoute = _step10.value;
-			var _vxrnOutput_clientManifest_manifestKey, _ref2, _ref12, _ref22;
+			var _vxrnOutput_clientManifest_manifestKey, _ref2, _ref12;
 			var _vxrnOutput_buildArgs, _foundRoute_layouts, _oneOptions_web3, _oneOptions_web12, _exported_generateStaticParams;
 			if (!foundRoute.file) {
 				return "continue";
@@ -675,10 +675,10 @@ async function build(args) {
 					}
 				}
 			}
-			function collectImports(entry3) {
+			function collectImports(entry2) {
 				var { type = "js" } = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
-				var { imports = [], css } = entry3;
-				var cacheKey = `${entry3.file || imports.join(",")}:${type}`;
+				var { imports = [], css } = entry2;
+				var cacheKey = `${entry2.file || imports.join(",")}:${type}`;
 				var cached = collectImportsCache.get(cacheKey);
 				if (cached) return cached;
 				if (collectImportsInFlight.has(cacheKey)) return [];
@@ -704,14 +704,13 @@ async function build(args) {
 				var found = vxrnOutput.clientManifest[clientKey2];
 				return found ? found : [];
 			})) !== null && _ref2 !== void 0 ? _ref2 : [];
-			var layoutImports = layoutEntries.flatMap(function(entry3) {
-				return [entry3.file, ...collectImports(entry3)];
+			var layoutImports = layoutEntries.flatMap(function(entry2) {
+				return [entry2.file, ...collectImports(entry2)];
 			});
-			var routePreloads = {};
+			var routePreloadKeys = /* @__PURE__ */ new Set();
 			var rootLayoutKey = `${routerRoot}/_layout.tsx`;
-			var rootLayoutEntry = vxrnOutput.clientManifest[rootLayoutKey];
-			if (rootLayoutEntry) {
-				routePreloads[`/${rootLayoutKey}`] = `/${rootLayoutEntry.file}`;
+			if (vxrnOutput.clientManifest[rootLayoutKey]) {
+				routePreloadKeys.add(`/${rootLayoutKey}`);
 			}
 			if (foundRoute.layouts) {
 				var _iteratorNormalCompletion15 = true, _didIteratorError15 = false, _iteratorError15 = void 0;
@@ -719,9 +718,8 @@ async function build(args) {
 					for (var _iterator15 = foundRoute.layouts[Symbol.iterator](), _step15; !(_iteratorNormalCompletion15 = (_step15 = _iterator15.next()).done); _iteratorNormalCompletion15 = true) {
 						var layout1 = _step15.value;
 						var clientKey = `${routerRoot}${layout1.contextKey.slice(1)}`;
-						var entry2 = vxrnOutput.clientManifest[clientKey];
-						if (entry2) {
-							routePreloads[`/${clientKey}`] = `/${entry2.file}`;
+						if (vxrnOutput.clientManifest[clientKey]) {
+							routePreloadKeys.add(`/${clientKey}`);
 						}
 					}
 				} catch (err) {
@@ -739,10 +737,10 @@ async function build(args) {
 					}
 				}
 			}
-			var routeChunkFile = (_ref12 = clientChunk === null || clientChunk === void 0 ? void 0 : clientChunk.fileName) !== null && _ref12 !== void 0 ? _ref12 : clientManifestEntry === null || clientManifestEntry === void 0 ? void 0 : clientManifestEntry.file;
-			if (routeChunkFile) {
-				routePreloads[`/${routerRoot}${foundRoute.file.slice(1)}`] = `/${routeChunkFile}`;
+			if (clientChunk || clientManifestEntry) {
+				routePreloadKeys.add(`/${routerRoot}${foundRoute.file.slice(1)}`);
 			}
+			var routePreloads = [...routePreloadKeys];
 			var preloadSetupFilePreloads = (function() {
 				if (!oneOptions.setupFile) return [];
 				var clientSetupFile = typeof oneOptions.setupFile === "string" ? oneOptions.setupFile : oneOptions.setupFile.client;
@@ -750,8 +748,8 @@ async function build(args) {
 				var needle = clientSetupFile.replace(/^\.\//, "");
 				for (var file2 in vxrnOutput.clientManifest) {
 					if (file2 === needle) {
-						var entry3 = vxrnOutput.clientManifest[file2];
-						return [entry3.file];
+						var entry2 = vxrnOutput.clientManifest[file2];
+						return [entry2.file];
 					}
 				}
 				return [];
@@ -773,14 +771,14 @@ async function build(args) {
 				...preloadSetupFilePreloads,
 				vxrnOutput.clientManifest["virtual:one-entry"].file,
 				...clientChunk ? [clientChunk.fileName] : clientManifestEntry ? [clientManifestEntry.file] : [],
-				...layoutEntries.map(function(entry3) {
-					return entry3.file;
+				...layoutEntries.map(function(entry2) {
+					return entry2.file;
 				})
 			])].map(function(path2) {
 				return `/${path2}`;
 			}) : void 0;
-			var deferredPreloads = needsSeparatedPreloads ? [.../* @__PURE__ */ new Set([...entryImports, ...layoutEntries.flatMap(function(entry3) {
-				return collectImports(entry3);
+			var deferredPreloads = needsSeparatedPreloads ? [.../* @__PURE__ */ new Set([...entryImports, ...layoutEntries.flatMap(function(entry2) {
+				return collectImports(entry2);
 			})])].filter(function(path2) {
 				return !criticalPreloads.includes(`/${path2}`);
 			}).map(function(path2) {
@@ -788,8 +786,8 @@ async function build(args) {
 			}) : void 0;
 			var preloads2 = needsSeparatedPreloads ? [...criticalPreloads, ...deferredPreloads] : allPreloads;
 			var allEntries = [clientManifestEntry, ...layoutEntries].filter(Boolean);
-			var layoutCSS = [...new Set(layoutEntries.flatMap(function(entry3) {
-				return collectImports(entry3, { type: "css" });
+			var layoutCSS = [...new Set(layoutEntries.flatMap(function(entry2) {
+				return collectImports(entry2, { type: "css" });
 			}).map(function(path2) {
 				return `/${path2}`;
 			}))];
@@ -799,13 +797,13 @@ async function build(args) {
 					return `/${path2}`;
 				}) : [],
 				...Object.entries(vxrnOutput.clientManifest).filter(function(param) {
-					var [key, entry3] = param;
+					var [key, entry2] = param;
 					if (!key.endsWith(".css")) return false;
-					var src = entry3.src;
+					var src = entry2.src;
 					return src === "style.css";
 				}).map(function(param) {
-					var [, entry3] = param;
-					return `/${entry3.file}`;
+					var [, entry2] = param;
+					return `/${entry2.file}`;
 				})
 			])];
 			var hasCriticalCSS = allCSS.some(function(p) {
@@ -861,7 +859,7 @@ async function build(args) {
 
 `);
 			}
-			var paramsList = (_ref22 = await ((_exported_generateStaticParams = exported.generateStaticParams) === null || _exported_generateStaticParams === void 0 ? void 0 : _exported_generateStaticParams.call(exported))) !== null && _ref22 !== void 0 ? _ref22 : [{}];
+			var paramsList = (_ref12 = await ((_exported_generateStaticParams = exported.generateStaticParams) === null || _exported_generateStaticParams === void 0 ? void 0 : _exported_generateStaticParams.call(exported))) !== null && _ref12 !== void 0 ? _ref12 : [{}];
 			console.info(`
  [build] page ${relativeId1} (with ${paramsList.length} routes)
 `);

package/dist/cjs/cli/build.native.js

@@ -620,7 +620,7 @@ async function build(args) {
 	try {
 		var _loop1 = async function() {
 			var foundRoute = _step10.value;
-			var _vxrnOutput_clientManifest_manifestKey, _ref2, _ref12, _ref22;
+			var _vxrnOutput_clientManifest_manifestKey, _ref2, _ref12;
 			var _vxrnOutput_buildArgs, _foundRoute_layouts, _oneOptions_web3, _oneOptions_web12, _exported_generateStaticParams;
 			if (!foundRoute.file) {
 				return "continue";
@@ -675,10 +675,10 @@ async function build(args) {
 					}
 				}
 			}
-			function collectImports(entry3) {
+			function collectImports(entry2) {
 				var { type = "js" } = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
-				var { imports = [], css } = entry3;
-				var cacheKey = `${entry3.file || imports.join(",")}:${type}`;
+				var { imports = [], css } = entry2;
+				var cacheKey = `${entry2.file || imports.join(",")}:${type}`;
 				var cached = collectImportsCache.get(cacheKey);
 				if (cached) return cached;
 				if (collectImportsInFlight.has(cacheKey)) return [];
@@ -704,14 +704,13 @@ async function build(args) {
 				var found = vxrnOutput.clientManifest[clientKey2];
 				return found ? found : [];
 			})) !== null && _ref2 !== void 0 ? _ref2 : [];
-			var layoutImports = layoutEntries.flatMap(function(entry3) {
-				return [entry3.file, ...collectImports(entry3)];
+			var layoutImports = layoutEntries.flatMap(function(entry2) {
+				return [entry2.file, ...collectImports(entry2)];
 			});
-			var routePreloads = {};
+			var routePreloadKeys = /* @__PURE__ */ new Set();
 			var rootLayoutKey = `${routerRoot}/_layout.tsx`;
-			var rootLayoutEntry = vxrnOutput.clientManifest[rootLayoutKey];
-			if (rootLayoutEntry) {
-				routePreloads[`/${rootLayoutKey}`] = `/${rootLayoutEntry.file}`;
+			if (vxrnOutput.clientManifest[rootLayoutKey]) {
+				routePreloadKeys.add(`/${rootLayoutKey}`);
 			}
 			if (foundRoute.layouts) {
 				var _iteratorNormalCompletion15 = true, _didIteratorError15 = false, _iteratorError15 = void 0;
@@ -719,9 +718,8 @@ async function build(args) {
 					for (var _iterator15 = foundRoute.layouts[Symbol.iterator](), _step15; !(_iteratorNormalCompletion15 = (_step15 = _iterator15.next()).done); _iteratorNormalCompletion15 = true) {
 						var layout1 = _step15.value;
 						var clientKey = `${routerRoot}${layout1.contextKey.slice(1)}`;
-						var entry2 = vxrnOutput.clientManifest[clientKey];
-						if (entry2) {
-							routePreloads[`/${clientKey}`] = `/${entry2.file}`;
+						if (vxrnOutput.clientManifest[clientKey]) {
+							routePreloadKeys.add(`/${clientKey}`);
 						}
 					}
 				} catch (err) {
@@ -739,10 +737,10 @@ async function build(args) {
 					}
 				}
 			}
-			var routeChunkFile = (_ref12 = clientChunk === null || clientChunk === void 0 ? void 0 : clientChunk.fileName) !== null && _ref12 !== void 0 ? _ref12 : clientManifestEntry === null || clientManifestEntry === void 0 ? void 0 : clientManifestEntry.file;
-			if (routeChunkFile) {
-				routePreloads[`/${routerRoot}${foundRoute.file.slice(1)}`] = `/${routeChunkFile}`;
+			if (clientChunk || clientManifestEntry) {
+				routePreloadKeys.add(`/${routerRoot}${foundRoute.file.slice(1)}`);
 			}
+			var routePreloads = [...routePreloadKeys];
 			var preloadSetupFilePreloads = (function() {
 				if (!oneOptions.setupFile) return [];
 				var clientSetupFile = typeof oneOptions.setupFile === "string" ? oneOptions.setupFile : oneOptions.setupFile.client;
@@ -750,8 +748,8 @@ async function build(args) {
 				var needle = clientSetupFile.replace(/^\.\//, "");
 				for (var file2 in vxrnOutput.clientManifest) {
 					if (file2 === needle) {
-						var entry3 = vxrnOutput.clientManifest[file2];
-						return [entry3.file];
+						var entry2 = vxrnOutput.clientManifest[file2];
+						return [entry2.file];
 					}
 				}
 				return [];
@@ -773,14 +771,14 @@ async function build(args) {
 				...preloadSetupFilePreloads,
 				vxrnOutput.clientManifest["virtual:one-entry"].file,
 				...clientChunk ? [clientChunk.fileName] : clientManifestEntry ? [clientManifestEntry.file] : [],
-				...layoutEntries.map(function(entry3) {
-					return entry3.file;
+				...layoutEntries.map(function(entry2) {
+					return entry2.file;
 				})
 			])].map(function(path2) {
 				return `/${path2}`;
 			}) : void 0;
-			var deferredPreloads = needsSeparatedPreloads ? [.../* @__PURE__ */ new Set([...entryImports, ...layoutEntries.flatMap(function(entry3) {
-				return collectImports(entry3);
+			var deferredPreloads = needsSeparatedPreloads ? [.../* @__PURE__ */ new Set([...entryImports, ...layoutEntries.flatMap(function(entry2) {
+				return collectImports(entry2);
 			})])].filter(function(path2) {
 				return !criticalPreloads.includes(`/${path2}`);
 			}).map(function(path2) {
@@ -788,8 +786,8 @@ async function build(args) {
 			}) : void 0;
 			var preloads2 = needsSeparatedPreloads ? [...criticalPreloads, ...deferredPreloads] : allPreloads;
 			var allEntries = [clientManifestEntry, ...layoutEntries].filter(Boolean);
-			var layoutCSS = [...new Set(layoutEntries.flatMap(function(entry3) {
-				return collectImports(entry3, { type: "css" });
+			var layoutCSS = [...new Set(layoutEntries.flatMap(function(entry2) {
+				return collectImports(entry2, { type: "css" });
 			}).map(function(path2) {
 				return `/${path2}`;
 			}))];
@@ -799,13 +797,13 @@ async function build(args) {
 					return `/${path2}`;
 				}) : [],
 				...Object.entries(vxrnOutput.clientManifest).filter(function(param) {
-					var [key, entry3] = param;
+					var [key, entry2] = param;
 					if (!key.endsWith(".css")) return false;
-					var src = entry3.src;
+					var src = entry2.src;
 					return src === "style.css";
 				}).map(function(param) {
-					var [, entry3] = param;
-					return `/${entry3.file}`;
+					var [, entry2] = param;
+					return `/${entry2.file}`;
 				})
 			])];
 			var hasCriticalCSS = allCSS.some(function(p) {
@@ -861,7 +859,7 @@ async function build(args) {
 
 `);
 			}
-			var paramsList = (_ref22 = await ((_exported_generateStaticParams = exported.generateStaticParams) === null || _exported_generateStaticParams === void 0 ? void 0 : _exported_generateStaticParams.call(exported))) !== null && _ref22 !== void 0 ? _ref22 : [{}];
+			var paramsList = (_ref12 = await ((_exported_generateStaticParams = exported.generateStaticParams) === null || _exported_generateStaticParams === void 0 ? void 0 : _exported_generateStaticParams.call(exported))) !== null && _ref12 !== void 0 ? _ref12 : [{}];
 			console.info(`
  [build] page ${relativeId1} (with ${paramsList.length} routes)
 `);