@umijs/renderer-react 4.0.0-rc.13 → 4.0.0-rc.16

package/dist/browser.js

@@ -1,5 +1,6 @@
 import React from 'react';
-import ReactDOM from 'react-dom';
+// compatible with < react@18 in @umijs/preset-umi/src/features/react
+import ReactDOM from 'react-dom/client';
 import { Router, useRoutes } from 'react-router-dom';
 import { AppContext, useAppData } from './appContext';
 import { createClientRoutes } from './routes';
@@ -73,12 +74,11 @@ export function renderClient(opts) {
             rootElement: opts.rootElement,
             basename,
         } }, rootContainer));
-    // @ts-ignore
     if (ReactDOM.createRoot) {
-        // @ts-ignore
         ReactDOM.createRoot(rootElement).render(browser);
     }
     else {
+        // @ts-ignore
         ReactDOM.render(browser, rootElement);
     }
 }

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 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 { createSearchParams, Link, matchPath, matchRoutes, Navigate, NavLink, Outlet, useLocation, useMatch, useNavigate, useOutlet, useParams, useResolvedPath, useRoutes, useSearchParams, } from 'react-router-dom';
 export { useAppData } from './appContext';
 export { renderClient } from './browser';
 export { useRouteData } from './routeContext';

package/dist/index.js

@@ -1,5 +1,5 @@
 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 { createSearchParams, Link, matchPath, matchRoutes, Navigate, NavLink, Outlet, useLocation, useMatch, useNavigate, useOutlet, useParams, useResolvedPath, useRoutes, useSearchParams, } from 'react-router-dom';
 export { useAppData } from './appContext';
 export { renderClient } from './browser';
 export { useRouteData } from './routeContext';

package/dist/routes.js

@@ -1,18 +1,7 @@
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 // @ts-ignore
 import loadable from '@loadable/component';
 import React from 'react';
-import { Navigate, useLocation, useParams, useSearchParams, } from 'react-router-dom';
+import { Navigate } from 'react-router-dom';
 import { RouteContext } from './routeContext';
 export function createClientRoutes(opts) {
     const { routesById, parentId, routeComponents } = opts;
@@ -43,21 +32,24 @@ export function createClientRoutes(opts) {
 }
 export function createClientRoute(opts) {
     const { route } = opts;
-    const { id, path, index, redirect } = route, props = __rest(route, ["id", "path", "index", "redirect"]);
-    return Object.assign({ id: id, path: path, index: index, element: redirect ? (React.createElement(Navigate, { to: redirect })) : (React.createElement(RouteContext.Provider, { value: {
+    const { id, path, index, redirect, ...props } = route;
+    return {
+        id: id,
+        path: path,
+        index: index,
+        element: redirect ? (React.createElement(Navigate, { to: redirect })) : (React.createElement(RouteContext.Provider, { value: {
                 route: opts.route,
             } },
-            React.createElement(RemoteComponent, { loader: opts.routeComponent, loadingComponent: opts.loadingComponent || DefaultLoading, route: route }))) }, props);
+            React.createElement(RemoteComponent, { loader: opts.routeComponent, loadingComponent: opts.loadingComponent || DefaultLoading }))),
+        ...props,
+    };
 }
 function DefaultLoading() {
     return React.createElement("div", null);
 }
 function RemoteComponent(props) {
-    const location = useLocation();
-    const params = useParams();
-    const [searchParams] = useSearchParams();
     const Component = loadable(props.loader, {
         fallback: React.createElement(props.loadingComponent, null),
     });
-    return (React.createElement(Component, { location: location, params: params, searchParams: searchParams, route: props.route }));
+    return React.createElement(Component, null);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/renderer-react",
-  "version": "4.0.0-rc.13",
+  "version": "4.0.0-rc.16",
   "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",
@@ -17,9 +17,9 @@
   ],
   "scripts": {
     "build": "pnpm tsc",
-    "build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
+    "build:deps": "umi-scripts bundleDeps",
     "dev": "pnpm build -- --watch",
-    "test": "jest -c ../../jest.turbo.config.ts"
+    "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
     "@loadable/component": "5.15.2",
@@ -27,8 +27,8 @@
     "react-router-dom": "6.3.0"
   },
   "devDependencies": {
-    "react": "17.0.2",
-    "react-dom": "17.0.2"
+    "react": "18.1.0",
+    "react-dom": "18.1.0"
   },
   "peerDependencies": {
     "react": ">=16.8",