Fix prerendering

redwoodjs · May 24, 2023 · 545f3b0 · 545f3b0
1 parent d44c017
commit 545f3b0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/packages/router/src/active-route-loader.tsx b/packages/router/src/active-route-loader.tsx
@@ -12,13 +12,31 @@ interface Props {
   children?: React.ReactNode
 }
 
+let isPrerendered = false
+
+if (typeof window !== 'undefined') {
+  const redwoodAppElement = document.getElementById('redwood-app')
+
+  if (redwoodAppElement && redwoodAppElement.children.length > 0) {
+    isPrerendered = true
+  }
+}
+
+const firstLoad = true
+
 export const ActiveRouteLoader = ({
   spec,
   params,
   whileLoadingPage,
 }: Props) => {
   const announcementRef = useRef<HTMLDivElement>(null)
-  const LazyRouteComponent = spec.LazyComponent
+
+  const usePrerenderLoader =
+    globalThis.__REDWOOD__PRERENDERING || (isPrerendered && firstLoad)
+
+  const LazyRouteComponent = usePrerenderLoader
+    ? spec.prerenderLoader(spec.name).default
+    : spec.LazyComponent
 
   useEffect(() => {
     // Make this hook a no-op if we're rendering in an iframe.

diff --git a/packages/router/src/util.ts b/packages/router/src/util.ts
@@ -377,6 +377,7 @@ export function flattenSearchParams(
 export interface Spec {
   name: string
   loader: () => Promise<{ default: React.ComponentType<unknown> }>
+  prerenderLoader: (name?: string) => { default: React.ComponentType<unknown> }
   LazyComponent:
     | React.LazyExoticComponent<React.ComponentType<unknown>>
     | React.ComponentType<unknown>
@@ -417,6 +418,7 @@ export function normalizePage(
   return {
     name: specOrPage.name,
     loader: async () => ({ default: specOrPage }),
+    prerenderLoader: () => ({ default: specOrPage }),
     LazyComponent: specOrPage,
   }
 }
@@ -560,11 +562,6 @@ export function analyzeRoutes(
 
       // @NOTE: A <Private> is also a Set
       if (isSetNode(node)) {
-        console.log(`👉 \n ~ file: util.ts:563 ~ node:`, node)
-        console.log(
-          `👉 \n ~ file: util.ts:563 ~ isPrivateNode:`,
-          isPrivateNode(node)
-        )
         const {
           children,
           whileLoadingPage: whileLoadingPageFromCurrentSet,