@umijs/renderer-react 4.0.0-canary.20220720.1 → 4.0.0-canary.20220727.1

package/dist/browser.d.ts

@@ -1,6 +1,8 @@
 import { History } from 'history';
 import React from 'react';
+import ReactDOM from 'react-dom/client';
 import { IRouteComponents, IRoutesById } from './types';
+export declare function __getRoot(): ReactDOM.Root | null;
 export declare function Routes(): React.ReactElement<any, string | React.JSXElementConstructor<any>> | null;
 export declare function renderClient(opts: {
     publicPath?: string;

package/dist/browser.js

@@ -8,6 +8,11 @@ import { matchRoutes, Router, useRoutes } from 'react-router-dom';
 import { AppContext, useAppData } from "./appContext";
 import { createClientRoutes } from "./routes";
 import { jsx as _jsx } from "react/jsx-runtime";
+var root = null; // react 18 some scenarios need unmount such as micro app
+
+export function __getRoot() {
+  return root;
+}
 
 function BrowserRoutes(props) {
   var history = props.history;
@@ -114,7 +119,7 @@ export function renderClient(opts) {
         return route.route.id;
       })) || []).filter(Boolean);
       matchedRouteIds.forEach(function (id) {
-        var _opts$routes$id;
+        var _opts$routes$id, _opts$routes$id2;
 
         // preload
         // @ts-ignore
@@ -155,9 +160,10 @@ export function renderClient(opts) {
             });
           }
         } // server loader
+        // use ?. since routes patched with patchClientRoutes is not exists in opts.routes
 
 
-        if (!isFirst && opts.routes[id].hasServerLoader) {
+        if (!isFirst && (_opts$routes$id = opts.routes[id]) !== null && _opts$routes$id !== void 0 && _opts$routes$id.hasServerLoader) {
           fetch('/__serverLoader?route=' + id).then(function (d) {
             return d.json();
           }).then(function (data) {
@@ -173,7 +179,7 @@ export function renderClient(opts) {
         // onPatchClientRoutes 添加的 route 在 opts.routes 里是不存在的
 
 
-        var clientLoader = (_opts$routes$id = opts.routes[id]) === null || _opts$routes$id === void 0 ? void 0 : _opts$routes$id.clientLoader;
+        var clientLoader = (_opts$routes$id2 = opts.routes[id]) === null || _opts$routes$id2 === void 0 ? void 0 : _opts$routes$id2.clientLoader;
 
         if (clientLoader && !clientLoaderData[id]) {
           clientLoader().then(function (data) {
@@ -210,7 +216,8 @@ export function renderClient(opts) {
     ReactDOM.hydrateRoot(rootElement, /*#__PURE__*/_jsx(Browser, {}));
   } else {
     if (ReactDOM.createRoot) {
-      ReactDOM.createRoot(rootElement).render( /*#__PURE__*/_jsx(Browser, {}));
+      root = ReactDOM.createRoot(rootElement);
+      root.render( /*#__PURE__*/_jsx(Browser, {}));
     } else {
       // @ts-ignore
       ReactDOM.render( /*#__PURE__*/_jsx(Browser, {}), rootElement);

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 export { createBrowserHistory, createHashHistory, createMemoryHistory, type History, } from 'history';
 export { createSearchParams, matchPath, matchRoutes, Navigate, NavLink, Outlet, resolvePath, useLocation, useMatch, useNavigate, useOutlet, useOutletContext, useParams, useResolvedPath, useRoutes, useSearchParams, } from 'react-router-dom';
 export { useAppData, useClientLoaderData, useServerLoaderData, } from './appContext';
-export { renderClient } from './browser';
+export { renderClient, __getRoot } from './browser';
 export { LinkWithPrefetch as Link } from './link';
 export { useRouteData } from './routeContext';
 export { __useFetcher } from './useFetcher';

package/dist/index.js

@@ -1,7 +1,7 @@
 export { createBrowserHistory, createHashHistory, createMemoryHistory } from 'history';
 export { createSearchParams, matchPath, matchRoutes, Navigate, NavLink, Outlet, resolvePath, useLocation, useMatch, useNavigate, useOutlet, useOutletContext, useParams, useResolvedPath, useRoutes, useSearchParams } from 'react-router-dom';
 export { useAppData, useClientLoaderData, useServerLoaderData } from "./appContext";
-export { renderClient } from "./browser";
+export { renderClient, __getRoot } from "./browser";
 export { LinkWithPrefetch as Link } from "./link";
 export { useRouteData } from "./routeContext";
 export { __useFetcher } from "./useFetcher";

package/dist/routes.js

@@ -43,7 +43,9 @@ function NavigateWithParams(props) {
     to: generatePath(props.to, params)
   });
 
-  return /*#__PURE__*/_jsx(Navigate, _objectSpread({}, propsWithParams));
+  return /*#__PURE__*/_jsx(Navigate, _objectSpread({
+    replace: true
+  }, propsWithParams));
 }
 
 function createClientRoute(opts) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/renderer-react",
-  "version": "4.0.0-canary.20220720.1",
+  "version": "4.0.0-canary.20220727.1",
   "description": "@umijs/renderer-react",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/renderer-react#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -16,13 +16,13 @@
     "dist"
   ],
   "scripts": {
-    "build": "pnpm father build",
+    "build": "umi-scripts father build",
     "build:deps": "umi-scripts bundleDeps",
-    "dev": "pnpm father dev",
+    "dev": "umi-scripts father dev",
     "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "@babel/runtime": "7.17.9",
+    "@babel/runtime": "7.18.9",
     "@loadable/component": "5.15.2",
     "history": "5.3.0",
     "react-router-dom": "6.3.0"