rasengan 1.0.0-beta.51 → 1.0.0-beta.55

package/CHANGELOG.md

@@ -0,0 +1,9 @@
+## Unreleased
+
+## 1.0.0-beta.55 (2025-02-28)
+
+## 1.0.0-beta.54 (2025-02-28)
+
+## 1.0.0-beta.53 (2025-02-28)
+
+## 1.0.0-beta.53 (2025-02-28)

package/lib/esm/core/plugins/index.js

@@ -96,7 +96,7 @@ export function rasengan({ adapter = { name: Adapters.DEFAULT, prepare: async ()
             config = resolvedConfig;
         },
         async closeBundle() {
-            // We check here if the environment is client has been built because it's the 
+            // We check here if the environment is client has been built because it's the
             // last environment to be built in the Vite build process
             if (this.environment.name === 'client') {
                 // Preparing app for deployment

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

@@ -17,6 +17,86 @@ export const getRouter = (routerInstance) => {
     });
     return () => _jsx(RouterProvider, { router: router });
 };
+/**
+ * This function merge the metadata, giving priority to the ones comming from loader
+ */
+const mergeMetaData = (responseMeta, meta) => {
+    let mergedMetaData = {
+        metaTags: [],
+        links: [],
+    };
+    // merge title and description
+    mergedMetaData['title'] =
+        responseMeta.title ?? meta.title;
+    mergedMetaData['description'] =
+        responseMeta.description ?? meta.description;
+    // merge openGraph datas
+    mergedMetaData['openGraph'] = {
+        ...meta.openGraph,
+        ...responseMeta.openGraph,
+    };
+    // merge twitter data
+    mergedMetaData['twitter'] = {
+        ...meta.twitter,
+        ...responseMeta.twitter,
+    };
+    // merge elements of type <array> eg. metaTags and links
+    const metaSet = new Set();
+    const linkSet = new Set();
+    if (meta['metaTags'] && Array.isArray(meta.metaTags)) {
+        // Loop through the metaTags and add every key to the set
+        for (const element of meta.metaTags) {
+            metaSet.add(element.name ?? element.property);
+        }
+        if (responseMeta['metaTags'] && Array.isArray(responseMeta.metaTags)) {
+            // Loop through the responseMeta and check if the key is already in the set
+            for (const element of responseMeta.metaTags) {
+                if (metaSet.has(element.name ?? element.property)) {
+                    // remove the element from the set
+                    metaSet.delete(element.name ?? element.property);
+                }
+                mergedMetaData.metaTags.push(element);
+            }
+        }
+        // Loop through the remaining elements in the set
+        for (const element of metaSet) {
+            const metaElement = meta.metaTags.find((el) => el.name === element);
+            if (metaElement) {
+                mergedMetaData.metaTags.push(metaElement);
+            }
+        }
+    }
+    else {
+        mergedMetaData.metaTags = responseMeta.metaTags ?? [];
+    }
+    if (meta['links'] && Array.isArray(meta.links)) {
+        // Loop through the links and add every key to the set
+        for (const element of meta.links) {
+            linkSet.add(element.rel);
+        }
+        if (responseMeta['links'] && Array.isArray(responseMeta.links)) {
+            // Loop through the responseMeta and check if the key is already in the set
+            for (const element of responseMeta.links) {
+                if (linkSet.has(element.rel)) {
+                    // remove the element from the set
+                    linkSet.delete(element.rel);
+                }
+                mergedMetaData.links.push(element);
+            }
+        }
+        // Loop through the remaining elements in the set
+        for (const element of linkSet) {
+            const linkElement = meta.links.find((el) => el.rel === element);
+            if (linkElement) {
+                mergedMetaData.links.push(linkElement);
+            }
+        }
+    }
+    else {
+        mergedMetaData.links = responseMeta.links ?? [];
+    }
+    return mergedMetaData;
+};
 /**
  * This function create a loader function
  */
@@ -44,11 +124,12 @@ const createLoaderFunction = ({ loader, metadata, }) => {
                 });
             }
             return {
-                ...response,
-                meta: metadata,
+                props: response.props,
+                meta: mergeMetaData(response.meta, metadata),
             };
         }
         catch (error) {
+            console.error(error);
             return {
                 props: {},
                 meta: {},

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

@@ -3,6 +3,7 @@ import ora from 'ora';
 import fs from 'fs/promises';
 import openBrowser from 'open';
 import os from 'node:os';
+import readline from 'node:readline';
 // Get local IP
 export default function getIPAddress() {
     // Get network interfaces
@@ -69,6 +70,7 @@ export async function logServerInfo(port, mode, open = false) {
     if (open) {
         openBrowser(`http://localhost:${port}`);
     }
+    readline.emitKeypressEvents(process.stdin);
     // Listen on user keyboard input on the terminal
     process.stdin.on('keypress', (_, key) => {
         // Check if the key pressed is 'c'

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/utils/handleerror.ts","../src/server/utils/handlerequest.ts","../src/server/utils/index.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/virtual/index.ts","../types/client.d.ts"],"version":"5.7.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/utils/handleerror.ts","../src/server/utils/handlerequest.ts","../src/server/utils/index.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/virtual/index.ts","../types/client.d.ts"],"version":"5.7.2"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rasengan",
   "private": false,
-  "version": "1.0.0-beta.51",
+  "version": "1.0.0-beta.55",
   "description": "The modern React Framework",
   "type": "module",
   "main": "lib/esm/index.js",
@@ -79,7 +79,7 @@
     "sass": "*",
     "stylus": "*",
     "vite": "^6.0.0",
-    "@rasenganjs/mdx": "1.0.5"
+    "@rasenganjs/mdx": "^1.0.6"
   },
   "peerDependenciesMeta": {
     "@types/node": {

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

@@ -1,23 +0,0 @@
-import path, { join } from 'node:path';
-export function fix404(url, res, appPath) {
-    // ! Robots Fix
-    if (url === '/robots.txt') {
-        return res.send(`
-      user-agent: *
-      disallow: /downloads/
-      disallow: /private/
-      allow: /
-      
-      user-agent: magicsearchbot
-      disallow: /uploads/
-    `);
-    }
-    // ! Sitemap Fix
-    if (url === '/sitemap.xml') {
-        return res.sendFile(path.resolve(join(appPath, 'dist/client/sitemap.xml')));
-    }
-    // ! Manifest Fix
-    if (url === '/manifest.json') {
-        return res.sendFile(path.resolve(join(appPath, 'dist/client/manifest.json')));
-    }
-}

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

@@ -1,185 +0,0 @@
-import fs from 'node:fs/promises';
-import fsSync from 'node:fs';
-import path, { join } from 'node:path';
-import { createStaticHandler, createStaticRouter, } from 'react-router';
-// @ts-ignore
-import { createFetchRequest } from 'rasengan';
-// Create server for production only
-export async function handleRequest(req, res) {
-    try {
-        // Get URL
-        const url = req.url;
-        const host = req.headers.host
-            ? req.headers.host
-            : req.headers.get('host') || '';
-        // Get app path
-        const appPath = process.cwd();
-        // ! Robots Fix
-        if (url === '/robots.txt') {
-            // Check if robots.txt exists using fs
-            // If it does, return it
-            try {
-                await fs.access(path.resolve(join(appPath, 'dist/client/robots.txt')));
-                if (res)
-                    return res.send(path.resolve(join(appPath, 'dist/client/robots.txt')));
-                return new Response(path.resolve(join(appPath, 'dist/client/robots.txt')), {
-                    status: 200,
-                });
-            }
-            catch (err) {
-                if (res)
-                    return res.send(`
-            user-agent: *
-            disallow: /downloads/
-            disallow: /private/
-            allow: /
-            
-            user-agent: magicsearchbot
-            disallow: /uploads/
-          `);
-                return new Response(`
-            user-agent: *
-            disallow: /downloads/
-            disallow: /private/
-            allow: /
-            
-            user-agent: magicsearchbot
-            disallow: /uploads/
-          `, {
-                    status: 200,
-                });
-            }
-        }
-        // ! Sitemap Fix
-        if (url === '/sitemap.xml') {
-            if (res)
-                return res.send(path.resolve(join(appPath, 'dist/client/sitemap.xml')));
-            return new Response(path.resolve(join(appPath, 'dist/client/sitemap.xml')), {
-                status: 200,
-            });
-        }
-        // ! Manifest Fix
-        if (url === '/manifest.json') {
-            if (res)
-                return res.send(path.resolve(join(appPath, 'dist/client/manifest.json')));
-            return new Response(path.resolve(join(appPath, 'dist/client/manifest.json')), {
-                status: 200,
-            });
-        }
-        // ! Handle assets
-        if (url.includes('/assets')) {
-            // get segments from /assets to the end
-            const segments = url.split('/');
-            const segmentsWithoutOrigin = [...segments];
-            for (let segment of segments) {
-                if (segment === 'assets') {
-                    break;
-                }
-                segmentsWithoutOrigin.shift();
-            }
-            // replace assets by client/assets
-            const filePath = join(appPath, 'dist/client', segmentsWithoutOrigin.join('/'));
-            const file = await fs.readFile(filePath, 'utf-8');
-            if (res) {
-                return res
-                    .status(200)
-                    .setHeader('Content-Type', url.endsWith('.js') ? 'text/javascript' : 'text/css')
-                    .setHeader('Cache-Control', 'max-age=31536000')
-                    .end(file);
-            }
-            return new Response(file, {
-                headers: {
-                    'Content-Type': url.endsWith('.js') ? 'text/javascript' : 'text/css',
-                    'Cache-Control': 'max-age=31536000',
-                },
-            });
-        }
-        // Handle js and css files
-        if (url.endsWith('.js') || url.endsWith('.css')) {
-            const file = await fs.readFile(url, 'utf-8');
-            if (res) {
-                return res
-                    .status(200)
-                    .setHeader('Content-Type', url.endsWith('.js') ? 'text/javascript' : 'text/css')
-                    .setHeader('Cache-Control', 'max-age=31536000')
-                    .end(file);
-            }
-            return new Response(file, {
-                headers: {
-                    'Content-Type': url.endsWith('.js') ? 'text/javascript' : 'text/css',
-                    'Cache-Control': 'max-age=31536000',
-                },
-            });
-        }
-        // Template html
-        let templateHtml = '';
-        // Always read fresh template in development
-        const serverFilePath = join(appPath, 'dist/server/entry-server.js');
-        const bootstrapDirPath = join(appPath, 'dist/client/assets');
-        // Read the entry sever file
-        let entry = await import(serverFilePath);
-        // replace bootstrap script with compiled scripts
-        let bootstrap = '/assets/' +
-            fsSync
-                .readdirSync(bootstrapDirPath)
-                .filter((fn) => fn.includes('entry-client') && fn.endsWith('.js'))[0];
-        // replace styles with compiled styles
-        let styles = '/assets/' +
-            fsSync
-                .readdirSync(join(appPath, 'dist/client/assets'))
-                .filter((fn) => fn.includes('entry-client') && fn.endsWith('.css'))[0];
-        // Extract render and staticRoutes from entry
-        const { render, staticRoutes, loadTemplateHtml } = entry;
-        // Create static handler
-        let handler = createStaticHandler(staticRoutes);
-        // Create fetch request for static routing
-        // @ts-ignore
-        let fetchRequest = createFetchRequest(req, host);
-        let context = await handler.query(fetchRequest);
-        // Handle redirects
-        const status = context.status;
-        if (status === 302) {
-            const redirect = context.headers.get('Location');
-            if (redirect) {
-                if (res)
-                    return res.redirect(redirect);
-                return Response.redirect(redirect);
-            }
-        }
-        // Helmet context
-        const helmetContext = {};
-        // Create static router
-        let router = createStaticRouter(handler.dataRoutes, context);
-        const rendered = await render(router, context, helmetContext);
-        // Load template html
-        if (!templateHtml) {
-            templateHtml = loadTemplateHtml(helmetContext, bootstrap, styles);
-        }
-        // Replacing the app-html placeholder with the rendered html
-        let html = templateHtml.replace(`rasengan-body-app`, rendered.html ?? '');
-        // Send the rendered html page
-        if (res) {
-            return res
-                .status(200)
-                .setHeader('Content-Type', 'text/html')
-                .setHeader('Cache-Control', 'max-age=31536000')
-                .end(html);
-        }
-        return new Response(html, {
-            status: 200,
-            headers: {
-                'Content-Type': 'text/html',
-                'Cache-Control': 'max-age=31536000',
-            },
-        });
-    }
-    catch (e) {
-        console.log(e.stack);
-        if (res) {
-            return res.status(500).end(e.stack);
-        }
-        return new Response(e.stack, {
-            status: 500,
-        });
-    }
-}

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

@@ -1,4 +0,0 @@
-// Import section
-import { fix404 } from './handleError.js';
-// Export section
-export { fix404 };

package/lib/types/server/utils/handleError.d.ts

@@ -1,2 +0,0 @@
-import { Response } from 'express';
-export declare function fix404(url: string, res: Response, appPath: string): void | Response<any, Record<string, any>>;

package/lib/types/server/utils/handleRequest.d.ts

@@ -1 +0,0 @@
-export declare function handleRequest(req: any, res?: any): Promise<any>;

package/lib/types/server/utils/index.d.ts

@@ -1,2 +0,0 @@
-import { fix404 } from './handleError.js';
-export { fix404 };