@umijs/renderer-react 4.2.6-alpha.1 → 4.2.6-alpha.10

package/dist/browser.d.ts

@@ -88,4 +88,4 @@ export declare type RenderClientOpts = {
  * @param {RenderClientOpts} opts - 插件相关的配置
  * @returns void
  */
-export declare function renderClient(opts: RenderClientOpts): (() => JSX.Element) | undefined;
+export declare function renderClient(opts: RenderClientOpts): (() => React.JSX.Element) | undefined;

package/dist/html.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
 import { IHtmlProps } from './types';
-export declare function Html({ children, loaderData, manifest, htmlPageOpts, __INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, mountElementId, }: React.PropsWithChildren<IHtmlProps>): JSX.Element;
+export declare function Html({ children, loaderData, manifest, htmlPageOpts, __INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, mountElementId, }: React.PropsWithChildren<IHtmlProps>): React.JSX.Element;

package/dist/html.js

@@ -123,13 +123,7 @@ export function Html(_ref) {
     })));
   }
   if (__INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED !== null && __INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED !== void 0 && __INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.pureApp) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(EnableJsScript, null), /*#__PURE__*/React.createElement("div", {
-      id: mountElementId
-    }, children), /*#__PURE__*/React.createElement(GlobalDataScript, {
-      manifest: manifest,
-      loaderData: loaderData,
-      htmlPageOpts: htmlPageOpts
-    }));
+    return /*#__PURE__*/React.createElement(React.Fragment, null, children);
   }
   var serverBuildManifest = typeof window === 'undefined' ? manifest : window.__UMI_BUILD_MANIFEST_DATA__;
   return (

package/dist/routes.js

@@ -4,9 +4,9 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 var _excluded = ["redirect"];
 // @ts-ignore
 import React from 'react';
-import { generatePath, Navigate, useParams, Outlet } from 'react-router-dom';
+import { generatePath, Navigate, Outlet, useLocation, useParams } from 'react-router-dom';
+import { useAppData, useRouteProps } from "./appContext";
 import { RouteContext, useRouteData } from "./routeContext";
-import { useAppData } from "./appContext";
 export function createClientRoutes(opts) {
   var routesById = opts.routesById,
     parentId = opts.parentId,
@@ -43,8 +43,15 @@ export function createClientRoutes(opts) {
 }
 function NavigateWithParams(props) {
   var params = useParams();
+  var to = generatePath(props.to, params);
+  var routeProps = useRouteProps();
+  var location = useLocation();
+  if (routeProps !== null && routeProps !== void 0 && routeProps.keepQuery) {
+    var queryAndHash = location.search + location.hash;
+    to += queryAndHash;
+  }
   var propsWithParams = _objectSpread(_objectSpread({}, props), {}, {
-    to: generatePath(props.to, params)
+    to: to
   });
   return /*#__PURE__*/React.createElement(Navigate, _extends({
     replace: true

package/dist/server.d.ts

@@ -1,2 +1,3 @@
+import React from 'react';
 import { IRootComponentOptions } from './types';
-export declare function getClientRootComponent(opts: IRootComponentOptions): Promise<JSX.Element>;
+export declare function getClientRootComponent(opts: IRootComponentOptions): Promise<React.JSX.Element>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/renderer-react",
-  "version": "4.2.6-alpha.1",
+  "version": "4.2.6-alpha.10",
   "description": "@umijs/renderer-react",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/renderer-react#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -23,8 +23,8 @@
     "react-router-dom": "6.3.0"
   },
   "devDependencies": {
-    "react": "18.1.0",
-    "react-dom": "18.1.0"
+    "react": "18.3.1",
+    "react-dom": "18.3.1"
   },
   "peerDependencies": {
     "react": ">=16.8",