rasengan 1.0.0-beta.55 → 1.0.0-beta.57

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Unreleased
 
+## 1.0.0-beta.57 (2025-03-04)
+
+## 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/core/config/utils/path.js

@@ -1,15 +1,16 @@
+import path from 'node:path';
 /**
  * Adapts the provided file path to a valid URL format based on the operating system.
  *
  * @param path - The file path to be adapted.
  * @returns The adapted file path in a valid URL format.
  */
-export const resolvePath = (path) => {
+export const resolvePath = (pathValue) => {
     // Check the OS
     const isWindows = process.platform === 'win32';
     // Adapt the path
     if (isWindows) {
-        return `file:///${path}`;
+        return `file:///${path.normalize(pathValue)}`;
     }
-    return path;
+    return path.normalize(pathValue);
 };

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/node/index.js

@@ -7,15 +7,16 @@ import createRasenganRequest from './utils.js';
 import { extractHeadersFromRRContext, extractMetaFromRRContext, isRedirectResponse, isStaticRedirectFromConfig, } from '../dev/utils.js';
 import { handleRedirectRequest } from '../dev/handlers.js';
 import { loadModuleSSR } from '../../core/config/utils/load-modules.js';
+import { resolvePath } from '../../core/config/utils/path.js';
 export function createRequestHandler(options) {
     const { build: buildOptions } = options;
     const manifest = new ManifestManager(path.posix.join(buildOptions.buildDirectory, buildOptions.clientPathDirectory, buildOptions.manifestPathDirectory, 'manifest.json'));
     return async function requestHandler(req, res) {
         try {
             // Get server entry
-            const entry = await import(path.posix.join(buildOptions.buildDirectory, buildOptions.serverPathDirectory, buildOptions.entryServerPath));
+            const entry = await import(resolvePath(path.posix.join(buildOptions.buildDirectory, buildOptions.serverPathDirectory, buildOptions.entryServerPath)));
             // Get AppRouter
-            const AppRouter = await (await import(path.posix.join(buildOptions.buildDirectory, buildOptions.serverPathDirectory, 'app.router.js'))).default;
+            const AppRouter = await (await import(resolvePath(path.posix.join(buildOptions.buildDirectory, buildOptions.serverPathDirectory, 'app.router.js')))).default;
             // Get Config
             const configHandler = await (await loadModuleSSR(path.posix.join(buildOptions.buildDirectory, buildOptions.serverPathDirectory, 'config.js'))).default;
             const config = await configHandler();

package/lib/esm/server/runtime/utils.js

@@ -0,0 +1,5 @@
+import os from 'node:os';
+/**
+ * Check if the current OS is the provided one
+ */
+export const checkOsPlateform = (osname) => osname === os.platform();

package/lib/tsconfig.esm.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/client.ts","../src/index.ts","../src/plugin.ts","../src/server.ts","../src/cli/index.ts","../src/core/index.ts","../src/core/types.ts","../src/core/config/index.ts","../src/core/config/type.ts","../src/core/config/utils/define-config.ts","../src/core/config/utils/load-modules.ts","../src/core/config/utils/path.ts","../src/core/config/vite/defaults.ts","../src/core/dynamic/index.tsx","../src/core/middlewares/index.ts","../src/core/middlewares/logger.ts","../src/core/plugins/index.ts","../src/core/utils/log.ts","../src/entries/client/render.tsx","../src/entries/server/entry.server.tsx","../src/entries/server/index.tsx","../src/routing/index.ts","../src/routing/interfaces.tsx","../src/routing/types.ts","../src/routing/components/index.tsx","../src/routing/components/template.tsx","../src/routing/utils/define-router.tsx","../src/routing/utils/define-routes-group.tsx","../src/routing/utils/generate-metadata.tsx","../src/routing/utils/generate-routes.tsx","../src/routing/utils/index.tsx","../src/scripts/build-command.js","../src/scripts/generate-package-json.js","../src/scripts/utils/check-os.js","../src/scripts/utils/copy.js","../src/server/build/index.ts","../src/server/build/manifest.tsx","../src/server/dev/handlers.tsx","../src/server/dev/server.ts","../src/server/dev/utils.ts","../src/server/node/index.tsx","../src/server/node/rendering.ts","../src/server/node/stream.ts","../src/server/node/utils.ts","../src/server/runtime/mode.ts","../src/server/virtual/index.ts","../types/client.d.ts"],"version":"5.7.2"}
+{"root":["../src/client.ts","../src/index.ts","../src/plugin.ts","../src/server.ts","../src/cli/index.ts","../src/core/index.ts","../src/core/types.ts","../src/core/config/index.ts","../src/core/config/type.ts","../src/core/config/utils/define-config.ts","../src/core/config/utils/load-modules.ts","../src/core/config/utils/path.ts","../src/core/config/vite/defaults.ts","../src/core/dynamic/index.tsx","../src/core/middlewares/index.ts","../src/core/middlewares/logger.ts","../src/core/plugins/index.ts","../src/core/utils/log.ts","../src/entries/client/render.tsx","../src/entries/server/entry.server.tsx","../src/entries/server/index.tsx","../src/routing/index.ts","../src/routing/interfaces.tsx","../src/routing/types.ts","../src/routing/components/index.tsx","../src/routing/components/template.tsx","../src/routing/utils/define-router.tsx","../src/routing/utils/define-routes-group.tsx","../src/routing/utils/generate-metadata.tsx","../src/routing/utils/generate-routes.tsx","../src/routing/utils/index.tsx","../src/scripts/build-command.js","../src/scripts/generate-package-json.js","../src/scripts/utils/check-os.js","../src/scripts/utils/copy.js","../src/server/build/index.ts","../src/server/build/manifest.tsx","../src/server/dev/handlers.tsx","../src/server/dev/server.ts","../src/server/dev/utils.ts","../src/server/node/index.tsx","../src/server/node/rendering.ts","../src/server/node/stream.ts","../src/server/node/utils.ts","../src/server/runtime/mode.ts","../src/server/runtime/utils.ts","../src/server/virtual/index.ts","../types/client.d.ts"],"version":"5.8.2"}

package/lib/tsconfig.types.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/client.ts","../src/index.ts","../src/plugin.ts","../src/server.ts","../src/cli/index.ts","../src/core/index.ts","../src/core/types.ts","../src/core/config/index.ts","../src/core/config/type.ts","../src/core/config/utils/define-config.ts","../src/core/config/utils/load-modules.ts","../src/core/config/utils/path.ts","../src/core/config/vite/defaults.ts","../src/core/dynamic/index.tsx","../src/core/middlewares/index.ts","../src/core/middlewares/logger.ts","../src/core/plugins/index.ts","../src/core/utils/log.ts","../src/entries/client/render.tsx","../src/entries/server/entry.server.tsx","../src/entries/server/index.tsx","../src/routing/index.ts","../src/routing/interfaces.tsx","../src/routing/types.ts","../src/routing/components/index.tsx","../src/routing/components/template.tsx","../src/routing/utils/define-router.tsx","../src/routing/utils/define-routes-group.tsx","../src/routing/utils/generate-metadata.tsx","../src/routing/utils/generate-routes.tsx","../src/routing/utils/index.tsx","../src/scripts/build-command.js","../src/scripts/generate-package-json.js","../src/scripts/utils/check-os.js","../src/scripts/utils/copy.js","../src/server/build/index.ts","../src/server/build/manifest.tsx","../src/server/dev/handlers.tsx","../src/server/dev/server.ts","../src/server/dev/utils.ts","../src/server/node/index.tsx","../src/server/node/rendering.ts","../src/server/node/stream.ts","../src/server/node/utils.ts","../src/server/runtime/mode.ts","../src/server/virtual/index.ts","../types/client.d.ts"],"version":"5.7.2"}
+{"root":["../src/client.ts","../src/index.ts","../src/plugin.ts","../src/server.ts","../src/cli/index.ts","../src/core/index.ts","../src/core/types.ts","../src/core/config/index.ts","../src/core/config/type.ts","../src/core/config/utils/define-config.ts","../src/core/config/utils/load-modules.ts","../src/core/config/utils/path.ts","../src/core/config/vite/defaults.ts","../src/core/dynamic/index.tsx","../src/core/middlewares/index.ts","../src/core/middlewares/logger.ts","../src/core/plugins/index.ts","../src/core/utils/log.ts","../src/entries/client/render.tsx","../src/entries/server/entry.server.tsx","../src/entries/server/index.tsx","../src/routing/index.ts","../src/routing/interfaces.tsx","../src/routing/types.ts","../src/routing/components/index.tsx","../src/routing/components/template.tsx","../src/routing/utils/define-router.tsx","../src/routing/utils/define-routes-group.tsx","../src/routing/utils/generate-metadata.tsx","../src/routing/utils/generate-routes.tsx","../src/routing/utils/index.tsx","../src/scripts/build-command.js","../src/scripts/generate-package-json.js","../src/scripts/utils/check-os.js","../src/scripts/utils/copy.js","../src/server/build/index.ts","../src/server/build/manifest.tsx","../src/server/dev/handlers.tsx","../src/server/dev/server.ts","../src/server/dev/utils.ts","../src/server/node/index.tsx","../src/server/node/rendering.ts","../src/server/node/stream.ts","../src/server/node/utils.ts","../src/server/runtime/mode.ts","../src/server/runtime/utils.ts","../src/server/virtual/index.ts","../types/client.d.ts"],"version":"5.8.2"}

package/lib/types/core/config/utils/path.d.ts

@@ -4,4 +4,4 @@
  * @param path - The file path to be adapted.
  * @returns The adapted file path in a valid URL format.
  */
-export declare const resolvePath: (path: string) => string;
+export declare const resolvePath: (pathValue: string) => string;

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/lib/types/server/runtime/utils.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Check if the current OS is the provided one
+ */
+export declare const checkOsPlateform: (osname: "aix" | "darwin" | "freebsd" | "linux" | "openbsd" | "sunos" | "win32") => boolean;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rasengan",
   "private": false,
-  "version": "1.0.0-beta.55",
+  "version": "1.0.0-beta.57",
   "description": "The modern React Framework",
   "type": "module",
   "main": "lib/esm/index.js",
@@ -135,7 +135,7 @@
   ],
   "scripts": {
     "build:compile": "tsc -b ./tsconfig.esm.json ./tsconfig.types.json",
-    "build:clean": "rm -rf ./lib",
+    "build:clean": "rimraf ./lib",
     "build": "pnpm run build:clean & pnpm run build:compile",
     "deploy": "pnpm publish --access public",
     "deploy:beta": "pnpm run deploy --tag beta",