@umijs/renderer-react 4.0.12 → 4.0.15

package/dist/browser.js

@@ -7,7 +7,6 @@ import ReactDOM from 'react-dom/client';
 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() {
@@ -48,12 +47,11 @@ function BrowserRoutes(props) {
       action: state.action
     });
   }, [history, props.routes, props.clientRoutes]);
-  return /*#__PURE__*/_jsx(Router, {
+  return /*#__PURE__*/React.createElement(Router, {
     navigator: history,
     location: state.location,
-    basename: props.basename,
-    children: props.children
-  });
+    basename: props.basename
+  }, props.children);
 }
 
 export function Routes() {
@@ -77,15 +75,13 @@ export function renderClient(opts) {
       routes: clientRoutes
     }
   });
-
-  var rootContainer = /*#__PURE__*/_jsx(BrowserRoutes, {
+  var rootContainer = /*#__PURE__*/React.createElement(BrowserRoutes, {
     basename: basename,
     pluginManager: opts.pluginManager,
     routes: opts.routes,
     clientRoutes: clientRoutes,
-    history: opts.history,
-    children: /*#__PURE__*/_jsx(Routes, {})
-  });
+    history: opts.history
+  }, /*#__PURE__*/React.createElement(Routes, null));
 
   for (var _i = 0, _arr = [// Lowest to the highest priority
   'innerProvider', 'i18nProvider', 'accessProvider', 'dataflowProvider', 'outerProvider', 'rootContainer']; _i < _arr.length; _i++) {
@@ -114,7 +110,7 @@ export function renderClient(opts) {
       var _matchRoutes;
 
       // Patched routes has to id
-      var matchedRouteIds = (((_matchRoutes = matchRoutes(clientRoutes, id)) === null || _matchRoutes === void 0 ? void 0 : _matchRoutes.map( // @ts-ignore
+      var matchedRouteIds = (((_matchRoutes = matchRoutes(clientRoutes, id, basename)) === null || _matchRoutes === void 0 ? void 0 : _matchRoutes.map( // @ts-ignore
       function (route) {
         return route.route.id;
       })) || []).filter(Boolean);
@@ -196,7 +192,7 @@ export function renderClient(opts) {
         handleRouteChange(e.location.pathname);
       });
     }, []);
-    return /*#__PURE__*/_jsx(AppContext.Provider, {
+    return /*#__PURE__*/React.createElement(AppContext.Provider, {
       value: {
         routes: opts.routes,
         routeComponents: opts.routeComponents,
@@ -207,20 +203,19 @@ export function renderClient(opts) {
         clientLoaderData: clientLoaderData,
         serverLoaderData: serverLoaderData,
         preloadRoute: handleRouteChange
-      },
-      children: rootContainer
-    });
+      }
+    }, rootContainer);
   };
 
   if (opts.hydrate) {
-    ReactDOM.hydrateRoot(rootElement, /*#__PURE__*/_jsx(Browser, {}));
+    ReactDOM.hydrateRoot(rootElement, /*#__PURE__*/React.createElement(Browser, null));
   } else {
     if (ReactDOM.createRoot) {
       root = ReactDOM.createRoot(rootElement);
-      root.render( /*#__PURE__*/_jsx(Browser, {}));
+      root.render( /*#__PURE__*/React.createElement(Browser, null));
     } else {
       // @ts-ignore
-      ReactDOM.render( /*#__PURE__*/_jsx(Browser, {}), rootElement);
+      ReactDOM.render( /*#__PURE__*/React.createElement(Browser, null), rootElement);
     }
   }
 }

package/dist/withRouter.d.ts

@@ -1,17 +1,17 @@
 import React from 'react';
 import { useLocation, useNavigate, useParams } from 'react-router-dom';
 export interface RouteComponentProps<T = ReturnType<typeof useParams>> {
-    history: {
+    history?: {
         back: () => void;
         goBack: () => void;
         location: ReturnType<typeof useLocation>;
         push: (url: string, state?: any) => void;
     };
-    location: ReturnType<typeof useLocation>;
-    match: {
+    location?: ReturnType<typeof useLocation>;
+    match?: {
         params: T;
     };
-    params: T;
-    navigate: ReturnType<typeof useNavigate>;
+    params?: T;
+    navigate?: ReturnType<typeof useNavigate>;
 }
 export declare function withRouter<P extends RouteComponentProps<P>>(Component: React.ComponentType<P>): (props: P) => JSX.Element;

package/dist/withRouter.js

@@ -1,7 +1,6 @@
-import _objectSpread from "@babel/runtime/helpers/objectSpread2";
+import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import { useLocation, useNavigate, useParams } from 'react-router-dom';
-import { jsx as _jsx } from "react/jsx-runtime";
 export function withRouter(Component) {
   function ComponentWithRouterProp(props) {
     var location = useLocation();
@@ -30,7 +29,7 @@ export function withRouter(Component) {
         });
       }
     };
-    return /*#__PURE__*/_jsx(Component, _objectSpread(_objectSpread({}, props), {}, {
+    return /*#__PURE__*/React.createElement(Component, _extends({}, props, {
       history: history,
       location: location,
       match: match,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/renderer-react",
-  "version": "4.0.12",
+  "version": "4.0.15",
   "description": "@umijs/renderer-react",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/renderer-react#readme",
   "bugs": "https://github.com/umijs/umi/issues",