feat: Reworks RSC server entries and route manifest building to derive from routes and include if route info related to authentication

packages/internal/src/routes.ts

@@ -73,13 +73,15 @@ export interface RWRouteManifestItem {
   hasParams: boolean
   relativeFilePath: string
   redirect: { to: string; permanent: boolean } | null
+  isPrivate: boolean
   // Probably want isNotFound here, so we can attach a separate 404 handler
 }
 
 export interface RouteSpec extends RWRouteManifestItem {
   id: string
   isNotFound: boolean
   filePath: string | undefined
+  isPrivate: boolean
   relativeFilePath: string
 }
 
@@ -111,6 +113,7 @@ export const getProjectRoutes = (): RouteSpec[] => {
       redirect: route.redirect
         ? { to: route.redirect, permanent: false }
         : null,
+      isPrivate: route.isPrivate,
     }
   })
 }

packages/structure/src/model/RWRoute.ts

@@ -49,7 +49,7 @@ export class RWRoute extends BaseNode {
       ?.getOpeningElement()
       ?.getTagNameNode()
       ?.getText()
-    return tagText === 'Private'
+    return tagText === 'Private' || tagText === 'PrivateSet'
   }
 
   @lazy() get hasParameters(): boolean {

packages/vite/src/buildRouteManifest.ts

@@ -47,6 +47,7 @@ export async function buildRouteManifest() {
           }
         : null,
       relativeFilePath: route.relativeFilePath,
+      isPrivate: route.isPrivate,
     }
 
     return acc

packages/vite/src/lib/entries.ts

@@ -1,37 +1,24 @@
-import path from 'node:path'
-
-import type { PagesDependency } from '@redwoodjs/project-config'
-import {
-  ensurePosixPath,
-  getPaths,
-  processPagesDir,
-} from '@redwoodjs/project-config'
+import { ensurePosixPath, getPaths } from '@redwoodjs/project-config'
+import { getProject } from '@redwoodjs/structure/dist/index'
+import type { RWPage } from '@redwoodjs/structure/dist/model/RWPage'
+import type { RWRoute } from '@redwoodjs/structure/dist/model/RWRoute'
 
 import { makeFilePath } from '../utils'
 
-const getPathRelativeToSrc = (maybeAbsolutePath: string) => {
-  // If the path is already relative
-  if (!path.isAbsolute(maybeAbsolutePath)) {
-    return maybeAbsolutePath
-  }
-
-  return `./${path.relative(getPaths().web.src, maybeAbsolutePath)}`
-}
-
-const withRelativeImports = (page: PagesDependency) => {
-  return {
-    ...page,
-    relativeImport: ensurePosixPath(getPathRelativeToSrc(page.importPath)),
-  }
-}
-
 export function getEntries() {
   const entries: Record<string, string> = {}
 
+  // Build the entries object based on routes and pages
+  // Given the page's route, we can determine whether or not
+  // the entry requires authentication checks
+  const rwProject = getProject(getPaths().base)
+  const routes = rwProject.getRouter().routes
+
   // Add the various pages
-  const pages = processPagesDir().map(withRelativeImports)
+  const pages = routes.map((route: RWRoute) => route.page) as RWPage[]
+
   for (const page of pages) {
-    entries[page.importName] = page.path
+    entries[page.const_] = ensurePosixPath(page.path)
   }
 
   // Add the ServerEntry entry, noting we use the "__rwjs__" prefix to avoid