move the new code outside of the try-catch

vikejs · May 20, 2024 · e0a6165 · e0a6165
1 parent 74d05b1
commit e0a6165
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/vike/client/client-routing-runtime/renderPageClientSide.ts b/vike/client/client-routing-runtime/renderPageClientSide.ts
@@ -208,20 +208,20 @@ async function renderPageClientSide(renderArgs: RenderArgs): Promise<void> {
       await renderPageView(pageContext)
     } else {
       let res: Awaited<ReturnType<typeof getPageContextFromHooks_isNotHydration>> | PrefetchedPageContext
-      try {
-        const prefetchedPageContext = globalObjectForPrefetchedPageContext?.prefetchedPageContext
-        if (
-          prefetchedPageContext?.pageContextFromHooks &&
-          '_pageId' in prefetchedPageContext.pageContextFromHooks &&
-          prefetchedPageContext.pageContextFromHooks._pageId === pageContext._pageId
-        ) {
-          res = prefetchedPageContext
-        } else {
+      const prefetchedPageContext = globalObjectForPrefetchedPageContext?.prefetchedPageContext
+      if (
+        prefetchedPageContext?.pageContextFromHooks &&
+        '_pageId' in prefetchedPageContext.pageContextFromHooks &&
+        prefetchedPageContext.pageContextFromHooks._pageId === pageContext._pageId
+      ) {
+        res = prefetchedPageContext
+      } else {
+        try {
           res = await getPageContextFromHooks_isNotHydration(pageContext, false)
+        } catch (err) {
+          await onError(err)
+          return
         }
-      } catch (err) {
-        await onError(err)
-        return
       }
       if (isRenderOutdated()) return
       if ('is404ServerSideRouted' in res) return