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

package/lib/generate-routes.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import { matchPath, Route, Routes } from "react-router-dom";
 const generateRoutes = (options = {
     pathname: "/",
@@ -23,14 +23,12 @@ const generateRoutes = (options = {
     const renderElement = (path, bundle) => {
         if (!preloadedComp)
             return bundle;
-        const isSSR = (preload && preload.path === path) || (!preload && !path);
-        const Element = isSSR ? preloadedComp.default : bundle;
-        return _jsx(Element, {}, void 0);
-    };
-    return () => {
-        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));
+        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.1",
+	"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"
 	},
-	"peerDependencies": {
+	"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

@@ -8,7 +8,7 @@ export interface IJSXModule {
 export interface ISSRRoute {
 	caseSensitive?: boolean;
 	children?: React.ReactNode;
-	element?: () => React.FunctionComponentElement<{ mod: Promise<IJSXModule> }>;
+	element?: any; // () => React.FunctionComponentElement<{ mod: Promise<IJSXModule> }>;
 	index?: boolean;
 	path?: string;
 }
@@ -24,7 +24,7 @@ const generateRoutes = async (
 		pathname: "/",
 		routes: [],
 	}
-): Promise<React.FC> => {
+) => {
 	if (!Array.isArray(options.routes) || options.routes.length === 0) {
 		throw new Error("options.routes must be an non-empty array");
 	}
@@ -40,27 +40,24 @@ const generateRoutes = async (
 
 	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 />;
+		const isRouteMatched = (preload && preload.path === path) || (!preload && !path);
+		const Element = isRouteMatched ? preloadedComp.default : bundle;
+		return isRouteMatched ? <Element /> : Element
 	};
 
-	return () => {
-		return (
-			<Routes>
-				{options.routes.map((props, i) => {
-					return (
-						<Route
-							key={i}
-							path={props.path}
-							element={renderElement(props.path, props.element())}
-						/>
-					);
-				})}
-				<Route element={renderElement(null, options.notFoundComp())} />
-			</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;