@appigram/react-code-split-ssr 1.2.0 → 1.2.1

package/lib/generate-routes.js

@@ -7,18 +7,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { matchPath, Route, Routes } from "react-router-dom";
 const generateRoutes = (options = {
     pathname: "/",
-    routes: []
+    routes: [],
 }) => __awaiter(void 0, void 0, void 0, function* () {
     if (!Array.isArray(options.routes) || options.routes.length === 0) {
         throw new Error("options.routes must be an non-empty array");
     }
     const preload = options.routes.find((route) => !!matchPath(route.path, options.pathname));
-    const preloadedComp = yield preload.element.props.mod;
-    const renderElement = ({ path, bundle }) => {
+    const preloadedComp = preload === undefined
+        ? yield options.notFoundComp().props.mod
+        : yield preload.element().props.mod;
+    const renderElement = (path, bundle) => {
         if (!preloadedComp)
             return bundle;
         const isSSR = (preload && preload.path === path) || (!preload && !path);
@@ -26,9 +28,9 @@ const generateRoutes = (options = {
         return _jsx(Element, {}, void 0);
     };
     return () => {
-        return (_jsx(Routes, { children: options.routes.map((props, i) => {
-                return (_jsx(Route, { path: props.path, element: renderElement({ path: props.path, bundle: props.element }) }, i));
-            }) }, void 0));
+        return (_jsxs(Routes, { children: [options.routes.map((props, i) => {
+                    return (_jsx(Route, { path: props.path, element: renderElement(props.path, props.element()) }, i));
+                }), _jsx(Route, { element: renderElement(null, options.notFoundComp()) }, void 0)] }, void 0));
     };
 });
 export default generateRoutes;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@appigram/react-code-split-ssr",
-	"version": "1.2.0",
+	"version": "1.2.1",
 	"description": "React code splitting with SSR",
 	"main": "./lib/index.js",
 	"scripts": {

package/src/generate-routes.tsx

@@ -1,4 +1,4 @@
-import { ReactElement } from 'react'
+import { ReactElement } from "react";
 import { matchPath, Route, Routes } from "react-router-dom";
 
 export interface IJSXModule {
@@ -7,26 +7,22 @@ export interface IJSXModule {
 
 export interface ISSRRoute {
 	caseSensitive?: boolean;
-  children?: React.ReactNode;
-  element?: ReactElement;
-  index?: boolean;
-  path?: string;
+	children?: React.ReactNode;
+	element?: () => React.FunctionComponentElement<{ mod: Promise<IJSXModule> }>;
+	index?: boolean;
+	path?: string;
 }
 
 export interface IOptions {
 	pathname: string;
 	routes: ISSRRoute[];
-}
-
-export interface IRenderElement {
-	path: string;
-	bundle: ReactElement;
+	notFoundComp?: () => React.FunctionComponentElement<{ mod: Promise<IJSXModule> }>;
 }
 
 const generateRoutes = async (
 	options: IOptions = {
 		pathname: "/",
-		routes: []
+		routes: [],
 	}
 ): Promise<React.FC> => {
 	if (!Array.isArray(options.routes) || options.routes.length === 0) {
@@ -34,17 +30,19 @@ const generateRoutes = async (
 	}
 
 	const preload = options.routes.find(
-		(route) =>
-			!!matchPath(route.path, options.pathname)
+		(route) => !!matchPath(route.path, options.pathname)
 	);
 
-	const preloadedComp: any = await preload.element.props.mod;
+	const preloadedComp: any =
+		preload === undefined
+			? await options.notFoundComp().props.mod
+			: await preload.element().props.mod;
 
-	const renderElement = ({path , bundle }: IRenderElement) => {
+	const renderElement = (path: string, bundle: ReactElement) => {
 		if (!preloadedComp) return bundle;
 		const isSSR = (preload && preload.path === path) || (!preload && !path);
 		const Element = isSSR ? preloadedComp.default : bundle;
-		return <Element />
+		return <Element />;
 	};
 
 	return () => {
@@ -55,12 +53,14 @@ const generateRoutes = async (
 						<Route
 							key={i}
 							path={props.path}
-							element={renderElement({ path: props.path, bundle: props.element})}
+							element={renderElement(props.path, props.element())}
 						/>
-				)})}
+					);
+				})}
+				<Route element={renderElement(null, options.notFoundComp())} />
 			</Routes>
 		);
-	}
+	};
 };
 
 export default generateRoutes;