minor refactor

vikejs · Jan 23, 2025 · 4cc172d · 4cc172d
1 parent 3299211
commit 4cc172d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/vike/__internal/index.ts b/vike/__internal/index.ts
@@ -20,14 +20,14 @@ import { PageConfigRuntime } from '../shared/page-configs/PageConfig.js'
  */
 async function getPagesAndRoutes() {
   setNodeEnvProduction()
-  const renderContext = getGlobalContext()
+  const globalContext = getGlobalContext()
   const {
     //
     pageRoutes,
     pageFilesAll,
     pageConfigs,
     allPageIds
-  } = renderContext
+  } = globalContext
   return {
     pageRoutes,
     pageFilesAll,

diff --git a/vike/node/prerender/runPrerender.ts b/vike/node/prerender/runPrerender.ts
@@ -871,9 +871,8 @@ async function prerender404(
 ) {
   if (!Object.values(prerenderedPageContexts).find(({ urlOriginal }) => urlOriginal === '/404')) {
     let result: Awaited<ReturnType<typeof prerender404Page>>
-    const globalContext = getGlobalContext()
     try {
-      result = await prerender404Page(globalContext, prerenderContext.pageContextInit)
+      result = await prerender404Page(prerenderContext.pageContextInit)
     } catch (err) {
       assertIsNotAbort(err, 'the 404 page')
       throw err

diff --git a/vike/node/runtime/renderPage/renderPageAlreadyRouted.ts b/vike/node/runtime/renderPage/renderPageAlreadyRouted.ts
@@ -2,7 +2,6 @@ export { renderPageAlreadyRouted }
 export { prerenderPage }
 export { prerender404Page }
 export { getPageContextInitEnhanced }
-export type { RenderContext }
 export type { PageContextAfterRender }
 export type { PageContextInitEnhanced }
 
@@ -131,8 +130,9 @@ async function prerenderPage(
   }
 }
 
-async function prerender404Page(renderContext: RenderContext, pageContextInit_: Record<string, unknown> | null) {
-  const errorPageId = getErrorPageId(renderContext.pageFilesAll, renderContext.pageConfigs)
+async function prerender404Page(pageContextInit_: Record<string, unknown> | null) {
+  const globalContext = getGlobalContext()
+  const errorPageId = getErrorPageId(globalContext.pageFilesAll, globalContext.pageConfigs)
   if (!errorPageId) {
     return null
   }
@@ -232,12 +232,3 @@ function getPageContextInitEnhanced(
 
   return pageContextInitEnhanced
 }
-
-type RenderContext = {
-  pageFilesAll: PageFile[]
-  pageConfigs: PageConfigRuntime[]
-  pageConfigGlobal: PageConfigGlobalRuntime
-  allPageIds: string[]
-  pageRoutes: PageRoutes
-  onBeforeRouteHook: Hook | null
-}