@appigram/react-code-split-ssr 1.2.11 → 1.2.13

package/lib/generate-routes.js

@@ -17,9 +17,12 @@ const generateRoutes = (options = {
         throw new Error("options.routes must be an non-empty array");
     }
     const preload = options.routes.find((route) => !!matchPath(route.path, options.pathname));
-    const preloadedComp = preload === undefined
-        ? yield options.notFoundComp().props.mod
-        : yield preload.element().props.mod;
+    const preloadedElement = preload === undefined ? options.notFoundComp : preload.element;
+    // fallback to previous version
+    const preloadedComp = typeof preloadedElement === 'function' ?
+        yield preloadedElement().props.mod
+        :
+            yield preloadedElement.props.mod;
     const renderElement = (path, bundle) => {
         if (!preloadedComp)
             return bundle;
@@ -27,7 +30,7 @@ const generateRoutes = (options = {
         const Element = isRouteMatched ? preloadedComp.default : bundle;
         return isRouteMatched ? _jsx(Element, {}) : Element;
     };
-    return (_jsxs(Routes, { children: [...options.routes.map((props, i) => {
+    return (_jsxs(Routes, { children: [options.routes.map((props, i) => {
                 return (_jsx(Route, { path: props.path, element: renderElement(props.path, props.element) }, i));
             }), _jsx(Route, { path: '*', element: renderElement(null, options.notFoundComp) }, 'nf')] }));
 });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@appigram/react-code-split-ssr",
-	"version": "1.2.11",
+	"version": "1.2.13",
 	"description": "React code splitting with SSR",
 	"main": "./lib/index.js",
 	"scripts": {
@@ -22,7 +22,7 @@
 	"author": "Eugene Sysmanov",
 	"license": "MIT",
 	"devDependencies": {
-		"@types/react": "^18.2.21",
+		"@types/react": "^18.2.33",
 		"@types/react-router-dom": "^5.3.3",
 		"tslint": "^6.1.3",
 		"tslint-react": "^5.0.0",
@@ -31,6 +31,6 @@
 	"dependencies": {
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
-		"react-router-dom": "^6.15.0"
+		"react-router-dom": "^6.17.0"
 	}
 }

package/src/generate-routes.tsx

@@ -33,10 +33,13 @@ const generateRoutes = async (
 		(route) => !!matchPath(route.path, options.pathname)
 	);
 
-	const preloadedComp: any =
-		preload === undefined
-			? await options.notFoundComp().props.mod
-			: await preload.element().props.mod;
+	const preloadedElement = preload === undefined ? options.notFoundComp : preload.element
+
+	// fallback to previous version
+	const preloadedComp: any = typeof preloadedElement === 'function' ?
+		await preloadedElement().props.mod
+		:
+		await preloadedElement.props.mod
 
 	const renderElement = (path: string, bundle: ReactElement) => {
 		if (!preloadedComp) return bundle;
@@ -47,7 +50,7 @@ const generateRoutes = async (
 
 	return (
 		<Routes>
-			{...options.routes.map((props, i) => {
+			{options.routes.map((props, i) => {
 				return (
 					<Route
 						key={i}