fix: fix custom components loading

Author: ije

framework/react/bootstrap.ts

@@ -20,17 +20,17 @@ export default async function bootstrap({ baseUrl, defaultLocale, locales, route
     const ssrDataEl = document.querySelector('#ssr-data')
     const routing = new Routing(routes, baseUrl, defaultLocale, locales)
     const [url, pageModuleTree] = routing.createRouter()
-    const sysComponents: Record<string, ComponentType> = {}
+    const customComponents: Record<string, ComponentType> = {}
     const pageComponentTree: { url: string, Component?: ComponentType }[] = pageModuleTree.map(({ url }) => ({ url }))
 
     await Promise.all([...preloadModules, ...pageModuleTree].map(async mod => {
         const { default: C } = await importModule(baseUrl, mod)
         switch (mod.url.replace(reModuleExt, '')) {
-            case '/404 ':
-                sysComponents['E404'] = C
+            case '/404':
+                customComponents['E404'] = C
                 break
-            case '/app ':
-                sysComponents['App'] = C
+            case '/app':
+                customComponents['App'] = C
                 break
             default:
                 const pc = pageComponentTree.find(pc => pc.url === mod.url)
@@ -53,7 +53,7 @@ export default async function bootstrap({ baseUrl, defaultLocale, locales, route
         {
             url,
             routing,
-            sysComponents,
+            customComponents,
             pageComponentTree
         }
     )

framework/react/root.ts

@@ -11,16 +11,16 @@ import { createPageProps, importModule, isLikelyReactComponent } from './util.ts
 export default function AlephAppRoot({
     url,
     routing,
-    sysComponents,
+    customComponents,
     pageComponentTree,
 }: {
     url: RouterURL
     routing: Routing
-    sysComponents: Record<string, ComponentType<any>>
+    customComponents: Record<'E404' | 'App', ComponentType<any>>
     pageComponentTree: { url: string, Component?: any }[]
 }) {
     const [e404, setE404] = useState<{ Component: ComponentType<any>, props?: Record<string, any> }>(() => {
-        const { E404 } = sysComponents
+        const { E404 } = customComponents
         if (E404) {
             if (isLikelyReactComponent(E404)) {
                 return { Component: E404 }
@@ -30,7 +30,7 @@ export default function AlephAppRoot({
         return { Component: E404Page }
     })
     const [app, setApp] = useState<{ Component: ComponentType<any> | null, props?: Record<string, any> }>(() => {
-        const { App } = sysComponents
+        const { App } = customComponents
         if (App) {
             if (isLikelyReactComponent(App)) {
                 return { Component: App }