@umijs/renderer-react 4.0.0-beta.13 → 4.0.0-beta.17

package/dist/browser.d.ts

@@ -1,7 +1,10 @@
+import { History } from 'history';
 import { IRouteComponents, IRoutesById } from './types';
 export declare function renderClient(opts: {
     rootElement?: HTMLElement;
     routes: IRoutesById;
     routeComponents: IRouteComponents;
     pluginManager: any;
+    basename?: string;
+    history: History;
 }): void;

package/dist/browser.js

@@ -1,42 +1,49 @@
-// @ts-ignore
-import { createBrowserHistory } from 'history';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Router, useRoutes } from 'react-router-dom';
 import { AppContext, useAppData } from './appContext';
 import { createClientRoutes } from './routes';
 function BrowserRoutes(props) {
-    const historyRef = React.useRef();
-    if (historyRef.current == null) {
-        historyRef.current = createBrowserHistory({ window });
-    }
-    const history = historyRef.current;
+    const { history } = props;
     const [state, setState] = React.useState({
         action: history.action,
         location: history.location,
     });
     React.useLayoutEffect(() => history.listen(setState), [history]);
-    return (React.createElement(Router, { navigator: history, location: state.location }, props.children));
+    React.useLayoutEffect(() => history.listen((location, action) => {
+        props.pluginManager.applyPlugins({
+            key: 'onRouteChange',
+            type: 'event',
+            args: {
+                routes: props.routes,
+                clientRoutes: props.clientRoutes,
+                location,
+                action,
+            },
+        });
+    }), [history, props.routes, props.clientRoutes]);
+    return (React.createElement(Router, { navigator: history, location: state.location, basename: props.basename }, props.children));
 }
 function Routes() {
     const { clientRoutes } = useAppData();
     return useRoutes(clientRoutes);
 }
 export function renderClient(opts) {
+    const basename = opts.basename || '/';
     const rootElement = opts.rootElement || document.getElementById('root');
     const clientRoutes = createClientRoutes({
         routesById: opts.routes,
         routeComponents: opts.routeComponents,
     });
-    let rootContainer = (React.createElement(BrowserRoutes, null,
+    let rootContainer = (React.createElement(BrowserRoutes, { basename: basename, pluginManager: opts.pluginManager, routes: opts.routes, clientRoutes: clientRoutes, history: opts.history },
         React.createElement(Routes, null)));
     for (const key of [
+        // Lowest to the highest priority
         'innerProvider',
         'i18nProvider',
         'accessProvider',
         'dataflowProvider',
         'outerProvider',
-        // Highest priority
         'rootContainer',
     ]) {
         rootContainer = opts.pluginManager.applyPlugins({
@@ -52,6 +59,7 @@ export function renderClient(opts) {
             clientRoutes,
             pluginManager: opts.pluginManager,
             rootElement: opts.rootElement,
+            basename,
         } }, rootContainer));
     // @ts-ignore
     if (ReactDOM.createRoot) {

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+export { createBrowserHistory, createHashHistory, createMemoryHistory, History, } from 'history';
 export { createSearchParams, Link, matchPath, matchRoutes, NavLink, Outlet, useLocation, useMatch, useNavigate, useOutlet, useParams, useResolvedPath, useRoutes, useSearchParams, } from 'react-router-dom';
 export { useAppData } from './appContext';
 export { renderClient } from './browser';

package/dist/index.js

@@ -1,3 +1,4 @@
+export { createBrowserHistory, createHashHistory, createMemoryHistory, } from 'history';
 export { createSearchParams, Link, matchPath, matchRoutes, NavLink, Outlet, useLocation, useMatch, useNavigate, useOutlet, useParams, useResolvedPath, useRoutes, useSearchParams, } from 'react-router-dom';
 export { useAppData } from './appContext';
 export { renderClient } from './browser';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/renderer-react",
-  "version": "4.0.0-beta.13",
+  "version": "4.0.0-beta.17",
   "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",
@@ -26,8 +26,8 @@
     "react-router-dom": "6.1.1"
   },
   "devDependencies": {
-    "react": "18.0.0-rc.0",
-    "react-dom": "18.0.0-rc.0"
+    "react": "17.0.2",
+    "react-dom": "17.0.2"
   },
   "peerDependencies": {
     "react": ">=16.8",