rasengan 1.1.2 → 1.1.3

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## Unreleased
 
+## 1.1.5 (2025-08-30)
+
+## 1.1.4 (2025-08-30)
+
+## 1.1.4 (2025-08-30)
+
+## 1.1.3 (2025-08-30)
+
 ## 1.1.2 (2025-08-16)
 
 ## 1.1.1 (2025-08-16)

package/lib/esm/cli/index.js

@@ -8,9 +8,9 @@ program
 // Handle the dev command
 program
     .command('dev')
-    .option('-p <port>')
+    .option('-p, --port <port>', 'Port number')
     .description('Start development server')
-    .action(async ({ p: port }) => {
+    .action(async ({ port }) => {
     const convertedPort = Number(port);
     // Checking port
     if (port &&

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

@@ -1,12 +1,37 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { isRouteErrorResponse, Link, useParams, useRouteError, } from 'react-router';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { isRouteErrorResponse, Link, useLocation, useParams, useRouteError, } from 'react-router';
+import { useEffect, useRef } from 'react';
+// Extract the environment variables
+const extractEnv = () => {
+    try {
+        const env = import.meta.env;
+        if (!env)
+            return {
+                DEV: false,
+                PROD: true,
+                TEST: false,
+            };
+        return {
+            DEV: env.DEV,
+            PROD: env.PROD,
+            TEST: env.TEST,
+        };
+    }
+    catch (error) {
+        console.error(error);
+        return {
+            DEV: false,
+            PROD: true,
+            TEST: false,
+        };
+    }
+};
 /**
  * Error boundary component that will be displayed if an error occurs during a routing
  * @returns
  */
 export function ErrorBoundary() {
-    const { DEV } = import.meta.env;
-    console.log(import.meta.env);
+    const { DEV } = extractEnv();
     let error = useRouteError();
     if (!DEV)
         return (_jsx("section", { style: {
@@ -28,10 +53,31 @@ export function ErrorBoundary() {
                     fontSize: '18px',
                 }, children: "Application Error" }) }));
     if (isRouteErrorResponse(error)) {
-        return (_jsxs(_Fragment, { children: [_jsx("p", { children: "Application Error" }), _jsxs("h1", { children: [error.status, " ", error.statusText] }), _jsx("p", { children: error.data })] }));
+        return (_jsxs("section", { style: {
+                position: 'fixed',
+                top: 0,
+                left: 0,
+                right: 0,
+                bottom: 0,
+                zIndex: 100,
+                display: 'flex',
+                flexDirection: 'row',
+                justifyContent: 'center',
+                alignItems: 'center',
+                height: '100vh',
+                width: '100vw',
+                gap: 10,
+                backgroundColor: '#fff',
+            }, children: [_jsx("p", { style: {
+                        fontSize: '18px',
+                    }, children: "Application Error" }), _jsxs("h1", { style: {
+                        fontSize: '18px',
+                    }, children: [error.status, " ", error.statusText] }), _jsx("p", { style: {
+                        fontSize: '18px',
+                    }, children: error.data })] }));
     }
     else if (error instanceof Error) {
-        return (_jsxs("div", { style: {
+        return (_jsxs("section", { style: {
                 position: 'fixed',
                 top: 0,
                 left: 0,
@@ -129,3 +175,45 @@ export const CustomLink = (props) => {
     }
     return (_jsx(Link, { to: to, ...rest, children: children }));
 };
+// Store scroll positions globally (per location.key)
+const scrollPositions = {};
+/**
+ * Scroll restoration component
+ * @param {Props} props
+ * @returns
+ */
+export function ScrollRestoration({ alwaysToTop = false, target }) {
+    const location = useLocation();
+    const pathnameRef = useRef(location.pathname);
+    useEffect(() => {
+        if (typeof window === 'undefined')
+            return;
+        const prevPathname = pathnameRef.current;
+        const el = target?.current; // easier to reference
+        if (alwaysToTop) {
+            if (el) {
+                el.scrollTo(0, 0);
+            }
+            else {
+                window.scrollTo(0, 0);
+            }
+            pathnameRef.current = location.pathname;
+            return;
+        }
+        // Save scroll position of the previous page
+        if (prevPathname) {
+            scrollPositions[prevPathname] = el ? el.scrollTop : window.scrollY;
+        }
+        // Restore scroll position of the new page (default to 0 if not stored)
+        const storedY = scrollPositions[location.pathname] ?? 0;
+        if (el) {
+            el.scrollTo(0, storedY);
+        }
+        else {
+            window.scrollTo(0, storedY);
+        }
+        // Update ref
+        pathnameRef.current = location.pathname;
+    }, [location.pathname, target?.current]); // depend on target.current
+    return null;
+}

package/lib/esm/routing/index.js

@@ -1,5 +1,5 @@
-import { CustomLink } from './components/index.js';
+import { CustomLink, ScrollRestoration } from './components/index.js';
 export { defineRouter, defineRoutesGroup, flatRoutes } from './utils/index.js';
 export { RouterComponent } from './interfaces.js';
-export { Outlet, ScrollRestoration, useLocation, useNavigate, useNavigation, useParams, useSearchParams, useFetcher, useMatch, useRoutes, useResolvedPath, matchRoutes, generatePath, matchPath, createRoutesFromChildren, Navigate, NavLink, } from 'react-router';
-export { CustomLink as Link };
+export { Outlet, useLocation, useNavigate, useNavigation, useParams, useSearchParams, useFetcher, useMatch, useRoutes, useResolvedPath, matchRoutes, generatePath, matchPath, createRoutesFromChildren, Navigate, NavLink, } from 'react-router';
+export { CustomLink as Link, ScrollRestoration };

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

@@ -71,9 +71,9 @@ function generateSkeletonTree(tree, modules) {
                 fullPath += '/' + segment;
             }
             else {
-                // if (fullPath === '') {
-                //   fullPath = '/';
-                // }
+                if (fullPath === '') {
+                    fullPath = '/';
+                }
             }
             const existing = tmpLevel.find((n) => n.segment === segment);
             if (existing) {
@@ -343,6 +343,7 @@ export async function flatRoutes(fn) {
     }
     catch (error) {
         console.error(error);
+        throw error;
         // TODO: Handle error
     }
 }

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

@@ -58,6 +58,21 @@ export async function handleDocumentRequest(req, res, runner, options) {
             // Create static router
             let router = createStaticRouter(handler.dataRoutes, context);
             const headers = extractHeadersFromRRContext(context);
+            // const route = await handler.queryRoute(request, {
+            //   requestContext: context,
+            // });
+            // // TODO: Check this line again
+            // if (route['meta']?.title === 'Not Found') {
+            //   // Set headers
+            //   res.writeHead(404, {
+            //     ...Object.fromEntries(headers),
+            //   });
+            // } else {
+            //   // Set headers
+            //   res.writeHead(context.statusCode, {
+            //     ...Object.fromEntries(headers),
+            //   });
+            // }
             // Set headers
             res.writeHead(context.statusCode, {
                 ...Object.fromEntries(headers),

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

@@ -20,3 +20,14 @@ export declare const NotFoundPageComponent: () => import("react/jsx-runtime.js")
  * @returns React.ReactNode
  */
 export declare const CustomLink: (props: LinkProps) => import("react/jsx-runtime.js").JSX.Element;
+type Props = {
+    alwaysToTop?: boolean;
+    target?: React.RefObject<HTMLElement | null>;
+};
+/**
+ * Scroll restoration component
+ * @param {Props} props
+ * @returns
+ */
+export declare function ScrollRestoration({ alwaysToTop, target }: Props): any;
+export {};

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

@@ -1,6 +1,6 @@
-import { CustomLink } from './components/index.js';
+import { CustomLink, ScrollRestoration } from './components/index.js';
 export type { Metadata, MetadataWithoutTitleAndDescription, LayoutComponent, PageComponent, MDXPageComponent, LoaderOptions, LoaderResponse, ReactComponentProps, TemplateProps, } from './types.js';
 export { defineRouter, defineRoutesGroup, flatRoutes } from './utils/index.js';
 export { RouterComponent } from './interfaces.js';
-export { Outlet, ScrollRestoration, useLocation, useNavigate, useNavigation, useParams, useSearchParams, useFetcher, useMatch, useRoutes, useResolvedPath, matchRoutes, generatePath, matchPath, createRoutesFromChildren, Navigate, NavLink, } from 'react-router';
-export { CustomLink as Link };
+export { Outlet, useLocation, useNavigate, useNavigation, useParams, useSearchParams, useFetcher, useMatch, useRoutes, useResolvedPath, matchRoutes, generatePath, matchPath, createRoutesFromChildren, Navigate, NavLink, } from 'react-router';
+export { CustomLink as Link, ScrollRestoration };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rasengan",
   "private": false,
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "The modern React Framework",
   "type": "module",
   "main": "lib/esm/index.js",
@@ -78,7 +78,7 @@
     "less": "*",
     "sass": "*",
     "stylus": "*",
-    "vite": "^7.0.0",
+    "vite": "^6.3.0 || ^7.0.0",
     "@rasenganjs/mdx": "^1.1.7"
   },
   "peerDependenciesMeta": {