rasengan 1.0.0-beta.55 → 1.0.0-beta.56

package/CHANGELOG.md

@@ -1,5 +1,7 @@
 ## Unreleased
 
+## 1.0.0-beta.56 (2025-03-03)
+
 ## 1.0.0-beta.55 (2025-02-28)
 
 ## 1.0.0-beta.54 (2025-02-28)

package/lib/esm/routing/utils/define-router.js

@@ -38,8 +38,9 @@ export const defineRouter = (option) => {
                 pageComponentList.push(p);
             }
         }
+        let routers = await Promise.all(imports ?? []);
         // Set properties
-        router.routers = imports || [];
+        router.routers = routers;
         router.layout = layout || DefaultLayout;
         router.pages = pageComponentList;
         router.loaderComponent = loaderComponent || (() => null);

package/lib/esm/routing/utils/generate-routes.js

@@ -150,7 +150,7 @@ export const generateRoutes = (router, isRoot = true, parentLayout = undefined)
     const route = {
         path: !isRoot
             ? router.useParentLayout
-                ? parentLayout.path + Layout.path
+                ? parentLayout.path + (Layout.path === '/' ? '' : Layout.path)
                 : Layout.path
             : Layout.path,
         errorElement: _jsx(ErrorBoundary, {}),
@@ -232,17 +232,17 @@ export const generateRoutes = (router, isRoot = true, parentLayout = undefined)
     pages.forEach((page) => {
         route.children.push(page);
     });
-    // Loop through imported routers in order to apply the same thing.
+    // Loop through imported routers in order to apply the same logic like above.
     for (const importedRouter of router.routers) {
         const importedRoutes = generateRoutes(importedRouter, false, Layout);
-        importedRoutes.forEach((route) => {
-            if (route.nested) {
-                route.children.push(route);
+        for (const importedRoute of importedRoutes) {
+            if (importedRoute.nested) {
+                route.children.push(importedRoute);
             }
             else {
-                routes.push(route);
+                routes.push(importedRoute);
             }
-        });
+        }
     }
     // Make sure to add the route at the beginning of the list
     routes.unshift(route);

package/lib/esm/server/dev/server.js

@@ -27,6 +27,7 @@ async function devRequestHandler(req, res, viteDevServer, options) {
         const AppRouter = await (await runner.import(join(`${options.rootPath}/src/app/app.router`))).default;
         // Get static routes
         const staticRoutes = generateRoutes(AppRouter);
+        console.log({ staticRoutes: JSON.stringify(staticRoutes) });
         // Create static handler
         let handler = createStaticHandler(staticRoutes);
         if (isDataRequest(req)) {

package/lib/types/routing/types.d.ts

@@ -62,7 +62,7 @@ export type RouterProps = {
     /**
      * Usefull to collect sub routers
      */
-    imports?: Array<RouterComponent>;
+    imports?: Array<Promise<RouterComponent>>;
     /**
      * Usefull to define a layout
      */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rasengan",
   "private": false,
-  "version": "1.0.0-beta.55",
+  "version": "1.0.0-beta.56",
   "description": "The modern React Framework",
   "type": "module",
   "main": "lib/esm/index.js",