@umijs/renderer-react 4.3.18 → 4.3.19

package/dist/browser.d.ts

@@ -88,4 +88,4 @@ export declare type RenderClientOpts = {
  * @param {RenderClientOpts} opts - 插件相关的配置
  * @returns void
  */
-export declare function renderClient(opts: RenderClientOpts): (() => React.JSX.Element) | undefined;
+export declare function renderClient(opts: RenderClientOpts): (() => 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>): React.JSX.Element;
+export declare function Html({ children, loaderData, manifest, htmlPageOpts, __INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, mountElementId, }: React.PropsWithChildren<IHtmlProps>): JSX.Element;

package/dist/link.d.ts

@@ -2,4 +2,4 @@ import React, { PropsWithChildren } from 'react';
 import { LinkProps } from 'react-router-dom';
 export declare function LinkWithPrefetch(props: PropsWithChildren<{
     prefetch?: boolean;
-} & LinkProps & React.RefAttributes<HTMLAnchorElement>>): React.JSX.Element | null;
+} & LinkProps & React.RefAttributes<HTMLAnchorElement>>): JSX.Element | null;

package/dist/server.js

@@ -17,7 +17,7 @@ function _getClientRootComponent() {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          basename = '/';
+          basename = opts.basename || '/';
           components = _objectSpread({}, opts.routeComponents); // todo 参数对齐
           clientRoutes = createClientRoutes({
             routesById: opts.routes,
@@ -30,7 +30,13 @@ function _getClientRootComponent() {
               routes: clientRoutes
             }
           });
-          rootContainer = /*#__PURE__*/React.createElement(StaticRouter, {
+          rootContainer =
+          /*#__PURE__*/
+          // 这里的 location 需要包含 basename, 否则会影响 StaticRouter 的匹配.
+          // 由于 getClientRootComponent 方法会同时用于 ssr 和 ssg, 所以在调用该方法时需要注意传入的 location 是否包含 basename.
+          // 1. 在用于 ssr 时传入的 location 来源于 request.url, 它是包含 basename 的, 所以没有问题.
+          // 2. 但是在用于 ssg 时(static export), 需要注意传入的 locaiton 要拼接上 basename.
+          React.createElement(StaticRouter, {
             basename: basename,
             location: opts.location
           }, /*#__PURE__*/React.createElement(Routes, null));

package/dist/types.d.ts

@@ -64,6 +64,7 @@ export interface IRootComponentOptions extends IHtmlHydrateOptions {
         [routeKey: string]: any;
     };
     manifest: any;
+    basename?: string;
 }
 export interface IHtmlProps extends IHtmlHydrateOptions {
     children?: React.ReactNode;

package/dist/withRouter.d.ts

@@ -14,4 +14,4 @@ export interface RouteComponentProps<T = ReturnType<typeof useParams>> {
     params?: T;
     navigate?: ReturnType<typeof useNavigate>;
 }
-export declare function withRouter<P extends RouteComponentProps<P>>(Component: React.ComponentType<P>): (props: P) => React.JSX.Element;
+export declare function withRouter<P extends RouteComponentProps<P>>(Component: React.ComponentType<P>): (props: P) => JSX.Element;

package/package.json

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