@appigram/react-code-split-ssr 1.2.0-beta.6 → 1.2.2

package/lib/generate-routes.js

@@ -11,7 +11,7 @@ import { jsx as _jsx } 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");
@@ -20,19 +20,15 @@ const generateRoutes = (options = {
     const preloadedComp = preload === undefined
         ? yield options.notFoundComp().props.mod
         : yield preload.element().props.mod;
-    const renderComp = (path, bundle) => {
+    const renderElement = (path, bundle) => {
         if (!preloadedComp)
             return bundle;
-        const isSSR = (preload && preload.path === path) || (!preload && !path);
-        return isSSR ? preloadedComp.default : bundle;
-    };
-    return () => {
-        const routes = options.routes.map((props, i) => {
-            const element = renderComp(props.path, props.element);
-            return (_jsx(Route, Object.assign({}, props, { element: element }), i));
-        });
-        routes.push(_jsx(Route, { element: renderComp(null, options.notFoundComp) }, void 0));
-        return (_jsx(Routes, { children: routes }, void 0));
+        const isRouteMatched = (preload && preload.path === path) || (!preload && !path);
+        const Element = isRouteMatched ? preloadedComp.default : bundle;
+        return isRouteMatched ? _jsx(Element, {}, void 0) : Element;
     };
+    return (_jsx(Routes, { children: options.routes.map((props, i) => {
+            return (_jsx(Route, { path: props.path, element: renderElement(props.path, props.element) }, i));
+        }) }, void 0));
 });
 export default generateRoutes;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@appigram/react-code-split-ssr",
-	"version": "1.2.0-beta.6",
+	"version": "1.2.2",
 	"description": "React code splitting with SSR",
 	"main": "./lib/index.js",
 	"scripts": {
@@ -22,15 +22,15 @@
 	"author": "Eugene Sysmanov",
 	"license": "MIT",
 	"devDependencies": {
-		"@types/react": "^17.0.34",
+		"@types/react": "^17.0.37",
 		"@types/react-router-dom": "^5.3.2",
 		"tslint": "^6.1.3",
 		"tslint-react": "^5.0.0",
-		"typescript": "^4.4.4"
+		"typescript": "^4.5.4"
 	},
 	"dependencies": {
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2",
-		"react-router-dom": "^6.0.2"
+		"react-router-dom": "^6.1.1"
 	}
 }

package/src/generate-routes.tsx

@@ -1,17 +1,16 @@
-import { ReactElement, JSXElementConstructor } from 'react'
+import { ReactElement } from "react";
 import { matchPath, Route, Routes } from "react-router-dom";
-// import Bundle from './bundle'
 
 export interface IJSXModule {
-	default: ReactElement<any, string | JSXElementConstructor<any>>;
+	default: React.FC | React.ComponentClass;
 }
 
 export interface ISSRRoute {
 	caseSensitive?: boolean;
-  children?: React.ReactNode;
-  element?: () => React.FunctionComponentElement<{ mod: Promise<IJSXModule> }>;
-  index?: boolean;
-  path?: string;
+	children?: React.ReactNode;
+	element?: any; // () => React.FunctionComponentElement<{ mod: Promise<IJSXModule> }>;
+	index?: boolean;
+	path?: string;
 }
 
 export interface IOptions {
@@ -23,16 +22,15 @@ export interface IOptions {
 const generateRoutes = async (
 	options: IOptions = {
 		pathname: "/",
-		routes: []
+		routes: [],
 	}
-): Promise<React.FC> => {
+) => {
 	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)
+		(route) => !!matchPath(route.path, options.pathname)
 	);
 
 	const preloadedComp: any =
@@ -40,29 +38,26 @@ const generateRoutes = async (
 			? await options.notFoundComp().props.mod
 			: await preload.element().props.mod;
 
-	const renderComp = (path: string, bundle: React.FC) => {
+	const renderElement = (path: string, bundle: ReactElement) => {
 		if (!preloadedComp) return bundle;
-		const isSSR = (preload && preload.path === path) || (!preload && !path);
-		return isSSR ? preloadedComp.default : bundle;
+		const isRouteMatched = (preload && preload.path === path) || (!preload && !path);
+		const Element = isRouteMatched ? preloadedComp.default : bundle;
+		return isRouteMatched ? <Element /> : Element
 	};
 
-	return () => {
-		const routes = options.routes.map((props, i) => {
-			const element = renderComp(props.path, props.element)
-			return (
-				<Route
-					key={i}
-					{...props}
-					element={element}
-				/>
-		)})
-		routes.push(<Route element={renderComp(null, options.notFoundComp)} />)
-		return (
-			<Routes>
-				{routes}
-			</Routes>
-		);
-	};
+	return (
+		<Routes>
+			{options.routes.map((props, i) => {
+				return (
+					<Route
+						key={i}
+						path={props.path}
+						element={renderElement(props.path, props.element)}
+					/>
+				);
+			})}
+		</Routes>
+	);
 };
 
 export default generateRoutes;