clean up small bit

Author: isTravis

src/entry-server.tsx

@@ -8,15 +8,15 @@ import { SSRDataProvider } from '~/lib/ssr-data'
 import { runLoaders } from '~/loaders.server'
 import { matchRoutes } from '~/route-gen'
 
-export async function loadData(
-  request: Request,
-): Promise<{
+type LoaderResult = {
   data: Record<string, unknown>
   redirect?: string
   statusCode?: number
   title?: string
   description?: string
-}> {
+}
+
+export async function loadData(request: Request): Promise<LoaderResult> {
   return runLoaders(matchRoutes(routes, request.url), request)
 }
 
@@ -30,27 +30,18 @@ export async function render(request: Request): Promise<{
 }> {
   const pathname = new URL(request.url, 'http://localhost').pathname
 
-  let ssrData: Record<string, unknown>
-  let redirect: string | undefined
-  let statusCode: number | undefined
-  let title: string | undefined
-  let description: string | undefined
-
-  try {
-    const result = await loadData(request)
-    ssrData = result.data
-    redirect = result.redirect
-    statusCode = result.statusCode
-    title = result.title
-    description = result.description
-  } catch (err) {
+  const result = await loadData(request).catch((err: unknown) => {
     console.error('Loader error:', err)
-    ssrData = {}
-    statusCode = 500
-  }
+    return { data: {}, statusCode: 500 } as LoaderResult
+  })
 
-  if (redirect) {
-    return { html: '', ssrData: {}, redirect, statusCode: statusCode ?? 302 }
+  if (result.redirect) {
+    return {
+      html: '',
+      ssrData: {},
+      redirect: result.redirect,
+      statusCode: result.statusCode ?? 302,
+    }
   }
 
   return new Promise((resolve, reject) => {
@@ -62,7 +53,7 @@ export async function render(request: Request): Promise<{
 
     const { pipe } = renderToPipeableStream(
       <StaticRouter location={pathname}>
-        <SSRDataProvider data={ssrData}>
+        <SSRDataProvider data={result.data}>
           <App />
         </SSRDataProvider>
       </StaticRouter>,
@@ -72,10 +63,10 @@ export async function render(request: Request): Promise<{
           passthrough.on('end', () =>
             resolve({
               html,
-              ssrData,
-              ...(statusCode !== undefined && { statusCode }),
-              ...(title !== undefined && { title }),
-              ...(description !== undefined && { description }),
+              ssrData: result.data,
+              ...(result.statusCode !== undefined && { statusCode: result.statusCode }),
+              ...(result.title !== undefined && { title: result.title }),
+              ...(result.description !== undefined && { description: result.description }),
             }),
           )
         },