rasengan 1.0.0-beta.42 → 1.0.0-beta.44

package/lib/esm/config/index.js

@@ -7,6 +7,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
+// import { fileURLToPath } from "node:url";
 /**
  * Function to define the config for the app
  * It will be used by vite.config.ts and other files in other to configure the app
@@ -44,9 +45,9 @@ export var defineConfig = function (loadedConfig) {
         },
     };
     // Define default values for experimentals features coming from loadedConfig.experimentals
-    var defaultExperimentalFeaturesConfig = {
-        stream: (experimental === null || experimental === void 0 ? void 0 : experimental.stream) || false
-    };
+    // const defaultExperimentalFeaturesConfig = {
+    //   stream: experimental?.stream || true
+    // }
     try {
         var config = {
             reactStrictMode: reactStrictMode === undefined ? true : reactStrictMode,
@@ -90,13 +91,12 @@ export var defineConfig = function (loadedConfig) {
                 },
                 appType: "custom",
             },
-            experimental: defaultExperimentalFeaturesConfig,
+            // experimental: defaultExperimentalFeaturesConfig,
             // More config options...
         };
         return config;
     }
     catch (error) {
-        console.error(error);
         return {
             reactStrictMode: true,
             vite: {
@@ -127,9 +127,9 @@ export var defineConfig = function (loadedConfig) {
                     ],
                 },
             },
-            experimental: {
-                stream: false
-            },
+            // experimental: {
+            //   stream: true
+            // },
         };
     }
 };
@@ -165,3 +165,33 @@ export var resolvePath = function (path) {
     }
     return path;
 };
+/**
+ * Asynchronously loads a module from a file path relative to the project root directory.
+ *
+ * This function checks the current environment (production or development) and adjusts the file path accordingly. It then resolves the file path to a valid URL format based on the operating system.
+ *
+ * @param filename - The name of the file to be loaded.
+ * @returns The loaded module.
+ */
+// export const loadAsyncFromRoot = async (filename: string) => {
+//   try {
+//     const isProduction = process.env.NODE_ENV === "production";
+//     let __pathToRoot = "";
+//     if (!isProduction) {
+//       __pathToRoot = process.cwd();
+// 		} else {
+//       __pathToRoot = path.join(process.cwd(), "./../../");
+// 		}
+//     const filePath = resolvePath(path.join(__pathToRoot, filename));
+//     const file = await import(`./${filePath}`);
+//     return file;
+//   } catch (error) {
+//     console.error(error);
+//     return {};
+//   }
+// }
+// export const getDirname = (url: string) => {
+// 	// Get directory name
+// 	const __dirname = dirname(fileURLToPath(url));
+//   return __dirname;
+// }

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

@@ -24,7 +24,7 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from "react";
 import { generateMetadata, getRouter } from "../../routing/utils/index.js";
 import { Outlet, useParams } from "react-router-dom";
@@ -124,10 +124,10 @@ export var Heads = function (_a) {
  * Body component
  */
 export var Body = function (_a) {
-    var _b = _a.children, children = _b === void 0 ? undefined : _b, _c = _a.asChild, asChild = _c === void 0 ? false : _c;
+    var _b = _a.children, children = _b === void 0 ? undefined : _b, _c = _a.asChild, asChild = _c === void 0 ? false : _c, _d = _a.AppContent, AppContent = _d === void 0 ? undefined : _d;
     return (_jsxs("body", { children: [_jsx("noscript", { dangerouslySetInnerHTML: {
                     __html: "<b>Enable JavaScript to run this app.</b>",
-                } }), asChild ? (_jsx("div", { id: 'root', children: children })) : (_jsxs(_Fragment, { children: [_jsx("div", { id: "root", children: "rasengan-body-app" }), children] }))] }));
+                } }), asChild ? (_jsx("div", { id: 'root', children: AppContent })) : (_jsx("div", { id: "root", children: "rasengan-body-app" })), children] }));
 };
 /**
  * Scripts component

package/lib/esm/entries/entry-server-stream.js

@@ -60,11 +60,11 @@ var RenderApp = function (_a) {
                     return (_jsxs(Heads, { data: helmetContext, styles: styles, bootstrap: bootstrap, children: [viteScripts, children] }));
                 }, Body: function (_a) {
                     var children = _a.children;
-                    return _jsx(Body, { asChild: true, children: children });
+                    return (_jsx(Body, { asChild: true, AppContent: _jsx(App, { Component: Component, children: _jsx(StaticRouterProvider, { router: router, context: context }) }), children: children }));
                 }, Script: function (_a) {
                     var children = _a.children;
-                    return _jsx(Scripts, { bootstrap: bootstrap, children: children });
-                }, children: _jsx(App, { Component: Component, children: _jsx(StaticRouterProvider, { router: router, context: context }) }) }) }) }));
+                    return (_jsx(Scripts, { bootstrap: bootstrap, children: children }));
+                } }) }) }));
 };
 export default function renderStream(router_1, context_1) {
     return __awaiter(this, arguments, void 0, function (router, context, helmetContext, bootstrap, styles, res) {
@@ -74,17 +74,9 @@ export default function renderStream(router_1, context_1) {
                     var shellRendered = false;
                     var responseStatusCode = 200;
                     var _a = renderToPipeableStream(_jsx(RenderApp, { router: router, context: context, helmetContext: helmetContext, bootstrap: bootstrap, styles: styles }), {
-                        // bootstrapModules: [bootstrap],
                         onShellReady: function () {
-                            // console.log("hummm")
                             shellRendered = true;
-                            // const body = new PassThrough();
-                            // const stream = createReadableStreamFromReadable(body);
-                            // console.log({
-                            //   body,
-                            //   stream
-                            // })
-                            res.status(200).set({
+                            res.status(responseStatusCode).set({
                                 "Content-Type": "text/html",
                                 "Cache-Control": "max-age=31536000",
                             });

package/lib/esm/entries/entry-server.js

@@ -35,20 +35,22 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 import { jsx as _jsx } from "react/jsx-runtime";
-import React from "react";
+// import React from "react";
 import ReactDOMServer from "react-dom/server";
 // @ts-ignore
 import AppRouter from "./../../../../../src/app/app.router";
 // @ts-ignore
-import App from "./../../../../../src/main";
+// import App from "./../../../../../src/main";
 // @ts-ignore
 import Template from "./../../../../../src/template";
 // @ts-ignore
 import { generateStaticRoutes } from "../routing/utils/index.js";
-import { StaticRouterProvider, } from "react-router-dom/server.js";
 // @ts-ignore
-import config from "./../../../../../rasengan.config.js";
-import { Component, ErrorBoundary, Heads, Body, Scripts, } from "../core/components/index.js";
+// import config from "./../../../../../rasengan.config.js";
+import { 
+// Component,
+// ErrorBoundary,
+Heads, Body, Scripts, } from "../core/components/index.js";
 import * as HelmetAsync from "react-helmet-async";
 import renderStream from "./entry-server-stream.js";
 // @ts-ignore
@@ -76,21 +78,16 @@ var TemplateHtml = function (_a) {
  */
 export function render(router_1, context_1) {
     return __awaiter(this, arguments, void 0, function (router, context, helmetContext, bootstrap, styles, res) {
-        var html;
         if (helmetContext === void 0) { helmetContext = {}; }
         if (bootstrap === void 0) { bootstrap = ""; }
         if (styles === void 0) { styles = ""; }
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    if (!config.experimental.stream) return [3 /*break*/, 2];
                     if (!res)
                         return [2 /*return*/];
                     return [4 /*yield*/, renderStream(router, context, helmetContext, bootstrap, styles, res)];
                 case 1: return [2 /*return*/, _a.sent()];
-                case 2:
-                    html = ReactDOMServer.renderToString(config.reactStrictMode ? (_jsx(React.StrictMode, { children: _jsx(H.HelmetProvider, { context: helmetContext, children: _jsx(ErrorBoundary, { children: _jsx(App, { Component: Component, children: _jsx(StaticRouterProvider, { router: router, context: context }) }) }) }) })) : (_jsx(H.HelmetProvider, { context: helmetContext, children: _jsx(ErrorBoundary, { children: _jsx(App, { Component: Component, children: _jsx(StaticRouterProvider, { router: router, context: context }) }) }) })));
-                    return [2 /*return*/, { html: html }];
             }
         });
     });

package/lib/esm/scripts/prepare-prod.js

@@ -1,37 +1,26 @@
 import { execa } from "execa";
 import chalk from "chalk";
+import { checkOsPlateform } from "./utils/check-os.js";
+import { generateCopyExecaArray } from "./utils/copy.js";
 var hostingStrategy = process.env.HOSTING_STRATEGY || "custom";
 (function () {
+    var copyCommand = checkOsPlateform("win32") ? "xcopy" : "cp";
     if (hostingStrategy === "vercel") {
         // Displaying the message
         console.log("Your project is configured to be hosted on ".concat(chalk.bold.blue(hostingStrategy), "\n"));
-        // Copying the api folder to the root directory
-        execa("cp", ["-r", "node_modules/rasengan/lib/esm/server/functions/vercel/api", "."], {
-            stdio: "inherit",
-        });
-        // Copying the vercel.json file to the root directory
-        execa("cp", ["node_modules/rasengan/lib/esm/server/functions/vercel/vercel.json", "."], {
+        // Copying the vercel folder content to the root directory
+        execa(copyCommand, generateCopyExecaArray("node_modules/rasengan/lib/esm/server/functions/vercel", "."), {
             stdio: "inherit",
+            shell: true,
         });
     }
     else if (hostingStrategy === "netlify") {
         // Displaying the message
         console.log("Your project is configured to be hosted on ".concat(chalk.bold.blue(hostingStrategy), "\n"));
-        // create a netlify folder at the root
-        execa("mkdir", ["-p", "netlify"], {
-            stdio: "inherit",
-        });
-        // Copying the netlify folder to the root directory
-        execa("cp", [
-            "-r",
-            "node_modules/rasengan/lib/esm/server/functions/netlify/functions",
-            "./netlify",
-        ], {
-            stdio: "inherit",
-        });
-        // Copying the netlify.toml file to the root directory
-        execa("cp", ["node_modules/rasengan/lib/esm/server/functions/netlify/netlify.toml", "."], {
+        // Copying the netlify folder content to the root directory
+        execa(copyCommand, generateCopyExecaArray("node_modules/rasengan/lib/esm/server/functions/netlify", "."), {
             stdio: "inherit",
+            shell: true,
         });
     }
 })();

package/lib/esm/scripts/utils/check-os.js

@@ -0,0 +1,7 @@
+import os from "node:os";
+/**
+ * Check if the current OS is the provided one
+ * @param {"aix"| "darwin"| "freebsd"| "linux"| "openbsd"| "sunos"|  "win32"} osname
+ * @returns {boolean}
+ */
+export var checkOsPlateform = function (osname) { return osname === os.platform(); };

package/lib/esm/scripts/utils/copy.js

@@ -0,0 +1,16 @@
+import { checkOsPlateform } from "./check-os.js";
+import path from "node:path";
+/**
+ * Generates an array of command-line arguments for the `execa` function to copy files from one location to another.
+ *
+ * @param {string} from - The source directory or file path.
+ * @param {string} to - The destination directory or file path.
+ * @return {Array<string>} - An array of command-line arguments for the `execa` function.
+ */
+export var generateCopyExecaArray = function (from, to) {
+    var fromPath = path.normalize(from);
+    var toPath = path.normalize(to);
+    var copyCommand = ["-r", path.join(fromPath, "/*"), toPath];
+    var copyCommandWindows = ["\"".concat(fromPath, "\""), "\"".concat(toPath, "\""), "/s /e /i"];
+    return checkOsPlateform("win32") ? copyCommandWindows : copyCommand;
+};

package/lib/esm/server/functions/vercel/api/index.js

@@ -54,12 +54,11 @@ var RASENGAN_VERCEL_CONFIG = process.env.RASENGAN_VERCEL_CONFIG;
 // Create server for production only
 export default function handler(req, res) {
     return __awaiter(this, void 0, void 0, function () {
-        var url, host, appPath, config_1, configPath, config, filePath, file, err_1, segments, segmentsWithoutOrigin, _i, segments_1, segment, filePath, file, otherFile, result, mimeType, file, templateHtml, serverFilePath, bootstrapDirPath, entry, bootstrap, styles, render, staticRoutes, loadTemplateHtml, handler_1, fetchRequest, context, status_1, redirect, helmetContext, router, rendered, html, e_1;
-        var _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var url, host, appPath, config_1, configPath, config, filePath, file, err_1, segments, segmentsWithoutOrigin, _i, segments_1, segment, filePath, file, otherFile, result, mimeType, file, templateHtml, serverFilePath, bootstrapDirPath, entry, bootstrap, styles, render, staticRoutes, loadTemplateHtml, handler_1, fetchRequest, context, status_1, redirect, helmetContext, router, e_1;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
                 case 0:
-                    _b.trys.push([0, 18, , 19]);
+                    _a.trys.push([0, 16, , 17]);
                     url = req.url;
                     host = req.headers.host;
                     appPath = process.cwd();
@@ -69,25 +68,24 @@ export default function handler(req, res) {
                         // Get the app path
                         appPath = join(appPath, config_1.rootDirectory);
                     }
-                    console.log({ env: appPath });
-                    configPath = path.resolve(join(process.cwd() + "./../../", "rasengan.config.js"));
+                    configPath = path.resolve(join(appPath, "rasengan.config.js"));
                     return [4 /*yield*/, import(configPath)];
                 case 1:
-                    config = (_b.sent()).default;
+                    config = (_a.sent()).default;
                     if (!(url === "/robots.txt")) return [3 /*break*/, 6];
-                    _b.label = 2;
+                    _a.label = 2;
                 case 2:
-                    _b.trys.push([2, 5, , 6]);
+                    _a.trys.push([2, 5, , 6]);
                     filePath = join(appPath, "dist/client/robots.txt");
                     return [4 /*yield*/, fs.access(path.resolve(filePath))];
                 case 3:
-                    _b.sent();
+                    _a.sent();
                     return [4 /*yield*/, fs.readFile(filePath, "utf-8")];
                 case 4:
-                    file = _b.sent();
+                    file = _a.sent();
                     return [2 /*return*/, res.send(file)];
                 case 5:
-                    err_1 = _b.sent();
+                    err_1 = _a.sent();
                     return [2 /*return*/, res.send("\n          user-agent: *\n          disallow: /downloads/\n          disallow: /private/\n          allow: /\n          \n          user-agent: magicsearchbot\n          disallow: /uploads/\n        ")];
                 case 6:
                     // ! Sitemap Fix
@@ -111,7 +109,7 @@ export default function handler(req, res) {
                     filePath = join(appPath, "dist/client", segmentsWithoutOrigin.join("/"));
                     return [4 /*yield*/, fs.readFile(filePath, "utf-8")];
                 case 7:
-                    file = _b.sent();
+                    file = _a.sent();
                     if (url.endsWith(".js") || url.endsWith(".css")) {
                         return [2 /*return*/, new Response(file, {
                                 headers: {
@@ -124,10 +122,10 @@ export default function handler(req, res) {
                     }
                     return [4 /*yield*/, fs.readFile(filePath)];
                 case 8:
-                    otherFile = _b.sent();
+                    otherFile = _a.sent();
                     return [4 /*yield*/, fileTypeFromBuffer(otherFile)];
                 case 9:
-                    result = _b.sent();
+                    result = _a.sent();
                     mimeType = result
                         ? result.mime
                         : url.endsWith(".svg")
@@ -143,7 +141,7 @@ export default function handler(req, res) {
                     if (!(url.endsWith(".js") || url.endsWith(".css"))) return [3 /*break*/, 12];
                     return [4 /*yield*/, fs.readFile(url, "utf-8")];
                 case 11:
-                    file = _b.sent();
+                    file = _a.sent();
                     return [2 /*return*/, res
                             .status(200)
                             .setHeader("Content-Type", url.endsWith(".js") ? "text/javascript" : "text/css")
@@ -155,7 +153,7 @@ export default function handler(req, res) {
                     bootstrapDirPath = join(appPath, "dist/client/assets");
                     return [4 /*yield*/, import(serverFilePath)];
                 case 13:
-                    entry = _b.sent();
+                    entry = _a.sent();
                     bootstrap = "/assets/" +
                         fsSync
                             .readdirSync(bootstrapDirPath)
@@ -169,7 +167,7 @@ export default function handler(req, res) {
                     fetchRequest = createFetchRequest(req, host);
                     return [4 /*yield*/, handler_1.query(fetchRequest)];
                 case 14:
-                    context = _b.sent();
+                    context = _a.sent();
                     status_1 = context.status;
                     if (status_1 === 302) {
                         redirect = context.headers.get("Location");
@@ -178,29 +176,16 @@ export default function handler(req, res) {
                     }
                     helmetContext = {};
                     router = createStaticRouter(handler_1.dataRoutes, context);
-                    if (!config.experimental.stream) return [3 /*break*/, 16];
                     return [4 /*yield*/, render(router, context, helmetContext, bootstrap, styles, res)];
-                case 15: return [2 /*return*/, _b.sent()];
-                case 16: return [4 /*yield*/, render(router, context, helmetContext)];
-                case 17:
-                    rendered = _b.sent();
-                    // Load template html
-                    if (!templateHtml) {
-                        templateHtml = loadTemplateHtml(helmetContext, bootstrap, styles);
-                    }
-                    html = templateHtml.replace("rasengan-body-app", (_a = rendered.html) !== null && _a !== void 0 ? _a : "");
-                    // Send the rendered html page
-                    return [2 /*return*/, res
-                            .status(200)
-                            .setHeader("Content-Type", "text/html")
-                            .setHeader("Cache-Control", "max-age=31536000")
-                            .end(html)];
-                case 18:
-                    e_1 = _b.sent();
+                case 15: 
+                // If stream mode enabled, render the page as a plain text
+                return [2 /*return*/, _a.sent()];
+                case 16:
+                    e_1 = _a.sent();
                     console.log(e_1.stack);
                     res.status(500).end(e_1.stack);
-                    return [3 /*break*/, 19];
-                case 19: return [2 /*return*/];
+                    return [3 /*break*/, 17];
+                case 17: return [2 /*return*/];
             }
         });
     });

package/lib/types/config/index.d.ts

@@ -37,9 +37,6 @@ export declare const defineConfig: (loadedConfig: AppConfig) => {
         };
         appType: string;
     };
-    experimental: {
-        stream: boolean;
-    };
 } | {
     reactStrictMode: boolean;
     vite: {
@@ -55,9 +52,6 @@ export declare const defineConfig: (loadedConfig: AppConfig) => {
             }[];
         };
     };
-    experimental: {
-        stream: boolean;
-    };
 };
 /**
  * Function to adapt the path for dev and prod
@@ -71,3 +65,11 @@ export declare const adaptPath: (paths: string | Array<string>) => string | stri
  * @returns The adapted file path in a valid URL format.
  */
 export declare const resolvePath: (path: string) => string;
+/**
+ * Asynchronously loads a module from a file path relative to the project root directory.
+ *
+ * This function checks the current environment (production or development) and adjusts the file path accordingly. It then resolves the file path to a valid URL format based on the operating system.
+ *
+ * @param filename - The name of the file to be loaded.
+ * @returns The loaded module.
+ */

package/lib/types/core/components/index.d.ts

@@ -34,9 +34,10 @@ export declare const Heads: ({ data, children, bootstrap, styles, }: {
 /**
  * Body component
  */
-export declare const Body: ({ children, asChild, }: {
+export declare const Body: ({ children, asChild, AppContent, }: {
     children?: React.ReactNode;
     asChild?: boolean;
+    AppContent?: React.ReactNode;
 }) => import("react/jsx-runtime").JSX.Element;
 /**
  * Scripts component

package/lib/types/core/types.d.ts

@@ -125,7 +125,6 @@ export type HelmetContext = {
  * Template props
  */
 export type TemplateProps = {
-    children: React.ReactNode;
     Head: React.FC<{
         children: React.ReactNode;
     }>;

package/lib/types/scripts/utils/check-os.d.ts

@@ -0,0 +1 @@
+export function checkOsPlateform(osname: "aix" | "darwin" | "freebsd" | "linux" | "openbsd" | "sunos" | "win32"): boolean;

package/lib/types/scripts/utils/copy.d.ts

@@ -0,0 +1 @@
+export function generateCopyExecaArray(from: string, to: string): Array<string>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rasengan",
   "private": false,
-  "version": "1.0.0-beta.42",
+  "version": "1.0.0-beta.44",
   "description": "The modern frontend framework for React",
   "type": "module",
   "main": "lib/esm/index.js",

package/server.js

@@ -133,46 +133,44 @@ async function createServer({
 			let router = createStaticRouter(handler.dataRoutes, context);
 
 			// If stream mode enabled, render the page as a plain text
-			if (config.experimental.stream) {
-				return await render(
-					router,
-					context,
-					helmetContext,
-					bootstrap,
-					styles,
-					res
-				);
-			}
-
-			// Render the html page on the server
-			const rendered = await render(
+			return await render(
 				router,
 				context,
 				helmetContext,
 				bootstrap,
-				styles
+				styles,
+				res
 			);
 
-			// Load template html
-			if (!templateHtml) {
-				templateHtml = loadTemplateHtml(helmetContext, bootstrap, styles);
-
-				if (!isProduction) {
-					templateHtml = await vite.transformIndexHtml(url, templateHtml);
-				}
-			}
-
-			// Replacing the app-html placeholder with the rendered html
-			let html = templateHtml.replace(`rasengan-body-app`, rendered.html ?? "");
-
-			// Send the rendered html page
-			return res
-				.status(200)
-				.set({
-					"Content-Type": "text/html",
-					"Cache-Control": "max-age=31536000",
-				})
-				.end(html);
+			// Render the html page on the server
+			// const rendered = await render(
+			// 	router,
+			// 	context,
+			// 	helmetContext,
+			// 	bootstrap,
+			// 	styles
+			// );
+
+			// // Load template html
+			// if (!templateHtml) {
+			// 	templateHtml = loadTemplateHtml(helmetContext, bootstrap, styles);
+
+			// 	if (!isProduction) {
+			// 		templateHtml = await vite.transformIndexHtml(url, templateHtml);
+			// 	}
+			// }
+
+			// // Replacing the app-html placeholder with the rendered html
+			// let html = templateHtml.replace(`rasengan-body-app`, rendered.html ?? "");
+
+			// // Send the rendered html page
+			// return res
+			// 	.status(200)
+			// 	.set({
+			// 		"Content-Type": "text/html",
+			// 		"Cache-Control": "max-age=31536000",
+			// 	})
+			// 	.end(html);
 		} catch (e) {
 			vite?.ssrFixStacktrace(e);
 

package/vite.config.ts

@@ -1,14 +1,12 @@
 import { defineConfig } from "vite";
 import react from "@vitejs/plugin-react";
 
-// Load rasengan config file
-// @ts-ignore
-import config from "./../../rasengan.config.js";
-
 import path from "node:path";
 
-// Extract vite config
-const { vite } = config;
+// Load config
+// @ts-ignore
+import config from "./../../rasengan.config.js";
+// import { config } from "./AppEntry";
 
 // Getting root path
 let __pathToRoot = "";
@@ -41,6 +39,9 @@ export default defineConfig(async ({ command, mode }: any) => {
 		__pathToRoot = path.join(process.cwd(), "./../../");
 	}
 
+	// Extract vite config
+	const { vite } = config;
+
 	return {
 		// Define env
 		define: {
@@ -59,7 +60,8 @@ export default defineConfig(async ({ command, mode }: any) => {
 
 		// Build options
 		build: {
-			sourcemap: true,
+			sourcemap: mode === "development" ? true : false,
+			minify: "esbuild",
 			rollupOptions: {
 				input: "./lib/esm/entries/entry-client.js",
 				output: {