@umijs/renderer-react 4.0.0-beta.11 → 4.0.0-beta.12

package/dist/app.js

@@ -1,3 +1,5 @@
+// @ts-ignore
+import loadable from '@loadable/component';
 import React from 'react';
 import { Router, useRoutes } from 'react-router-dom';
 import { AppContext, useAppContext } from './appContext';
@@ -9,14 +11,8 @@ export function App(props) {
             Component: RouteComponent,
         });
     }, [props.routes]);
-    let ret = (React.createElement(AppContext.Provider, { value: {
-            routes: props.routes,
-            routeComponents: props.routeComponents,
-            pluginManager: props.pluginManager,
-            clientRoutes,
-        } },
-        React.createElement(Router, { navigator: props.navigator, location: props.location },
-            React.createElement(Routes, null))));
+    let ret = (React.createElement(Router, { navigator: props.navigator, location: props.location },
+        React.createElement(Routes, null)));
     for (const key of [
         'innerProvider',
         'i18nProvider',
@@ -29,7 +25,13 @@ export function App(props) {
             initialValue: ret,
         });
     }
-    return ret;
+    return (React.createElement(AppContext.Provider, { value: {
+            routes: props.routes,
+            routeComponents: props.routeComponents,
+            pluginManager: props.pluginManager,
+            navigator: props.navigator,
+            clientRoutes,
+        } }, ret));
 }
 function Routes() {
     const { clientRoutes } = useAppContext();
@@ -40,9 +42,9 @@ function Loading() {
 }
 export function RouteComponent(props) {
     const loader = useAppContext().routeComponents[props.id];
-    const RouteComponent = React.lazy(loader);
+    const RouteComponent = loadable(loader, {
+        fallback: React.createElement(Loading, null),
+    });
     // ref: https://reactjs.org/docs/code-splitting.html
-    // TODO: replace with https://github.com/gregberge/loadable-components when we support ssr
-    return (React.createElement(React.Suspense, { fallback: React.createElement(Loading, null) },
-        React.createElement(RouteComponent, null)));
+    return React.createElement(RouteComponent, null);
 }

package/dist/appContext.d.ts

@@ -4,6 +4,7 @@ export interface IAppContextType {
     routeComponents: any;
     clientRoutes: any;
     pluginManager: any;
+    navigator: any;
 }
 export declare const AppContext: React.Context<IAppContextType | undefined>;
 export declare function useAppContext(): IAppContextType;

package/dist/index.d.ts

@@ -1,2 +1,3 @@
-export { Link, Outlet } from 'react-router-dom';
-export * from './browser';
+export { Link, Outlet, useNavigate } from 'react-router-dom';
+export { useAppContext } from './appContext';
+export { renderClient } from './browser';

package/dist/index.js

@@ -1,2 +1,3 @@
-export { Link, Outlet } from 'react-router-dom';
-export * from './browser';
+export { Link, Outlet, useNavigate } from 'react-router-dom';
+export { useAppContext } from './appContext';
+export { renderClient } from './browser';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/renderer-react",
-  "version": "4.0.0-beta.11",
+  "version": "4.0.0-beta.12",
   "description": "@umijs/renderer-react",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/renderer-react#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -21,8 +21,9 @@
     "dev": "pnpm build -- --watch"
   },
   "dependencies": {
-    "history": "5.0.1",
-    "react-router-dom": "6.0.0-beta.8"
+    "@loadable/component": "5.15.0",
+    "history": "5.1.0",
+    "react-router-dom": "6.0.2"
   },
   "devDependencies": {
     "react": "18.0.0-alpha-f2c381131-20211004",