refactor: consistant types + more generic failed routes

unjs · Aug 6, 2023 · 1e638bc · 1e638bc
1 parent 3d43e50
commit 1e638bc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/prerender.ts b/src/prerender.ts
@@ -86,7 +86,7 @@ export async function prerender(nitro: Nitro) {
 
   // Start prerendering
   const generatedRoutes = new Set();
-  const erroredRoutes = new Set<PrerenderRoute>();
+  const failedRoutes = new Set<PrerenderRoute>();
   const skippedRoutes = new Set();
   const displayedLengthWarns = new Set();
   const canPrerender = (route = "/") => {
@@ -191,7 +191,7 @@ export async function prerender(nitro: Nitro) {
       _route.error = new Error(`[${res.status}] ${res.statusText}`) as any;
       _route.error.statusCode = res.status;
       _route.error.statusMessage = res.statusText;
-      erroredRoutes.add(_route);
+      failedRoutes.add(_route);
     }
 
     // Write to the file
@@ -258,13 +258,13 @@ export async function prerender(nitro: Nitro) {
   });
 
   await nitro.hooks.callHook("prerender:done", {
-    erroredRoutes,
     prerenderedRoutes: nitro._prerenderedRoutes,
+    failedRoutes: [...failedRoutes],
   });
 
-  if (nitro.options.prerender.failOnError && erroredRoutes.size > 0) {
+  if (nitro.options.prerender.failOnError && failedRoutes.size > 0) {
     nitro.logger.log("\nErrors prerendering:");
-    for (const route of erroredRoutes) {
+    for (const route of failedRoutes) {
       const parents = linkParents.get(route.route);
       const parentsText = parents?.size
         ? `\n${[...parents.values()]

diff --git a/src/types/nitro.ts b/src/types/nitro.ts
@@ -95,7 +95,7 @@ export interface NitroHooks {
   "prerender:route": (route: PrerenderRoute) => HookResult;
   "prerender:done": (result: {
     prerenderedRoutes: PrerenderRoute[];
-    erroredRoutes: Set<PrerenderRoute>;
+    failedRoutes: PrerenderRoute[];
   }) => HookResult;
 }