@umijs/renderer-react 4.0.86 → 4.0.88

package/dist/appContext.d.ts

@@ -16,8 +16,9 @@ export declare const AppContext: React.Context<IAppContextType>;
 export declare function useAppData(): IAppContextType;
 export declare function useSelectedRoutes(): import("react-router-dom").RouteMatch<string>[];
 export declare function useRouteProps<T extends Record<string, any> = any>(): T;
-export declare function useServerLoaderData(): {
-    data: any;
+declare type ServerLoaderFunc = (...args: any[]) => Promise<any> | any;
+export declare function useServerLoaderData<T extends ServerLoaderFunc = any>(): {
+    data: Awaited<ReturnType<T>>;
 };
 export declare function useClientLoaderData(): {
     data: any;

package/dist/browser.js

@@ -182,7 +182,15 @@ var getBrowser = function getBrowser(opts, routesElement) {
         // server loader
         // use ?. since routes patched with patchClientRoutes is not exists in opts.routes
         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) {
+          var query = new URLSearchParams({
+            route: id,
+            url: window.location.href
+          }).toString();
+          // 在有basename的情况下__serverLoader的请求路径需要加上basename
+          var url = "".concat(withEndSlash(basename), "__serverLoader?").concat(query);
+          fetch(url, {
+            credentials: 'include'
+          }).then(function (d) {
             return d.json();
           }).then(function (data) {
             // setServerLoaderData when startTransition because if ssr is enabled,
@@ -255,4 +263,7 @@ export function renderClient(opts) {
   }
   // @ts-ignore
   ReactDOM.render( /*#__PURE__*/React.createElement(Browser, null), rootElement);
+}
+function withEndSlash(str) {
+  return str.endsWith('/') ? str : "".concat(str, "/");
 }

package/dist/server.d.ts

@@ -1,5 +1,6 @@
+import type { IMetadata } from '@umijs/server/dist/types';
 import { IRouteComponents, IRoutesById } from './types';
-export declare function getClientRootComponent(opts: {
+interface IHtmlProps {
     routes: IRoutesById;
     routeComponents: IRouteComponents;
     pluginManager: any;
@@ -8,5 +9,7 @@ export declare function getClientRootComponent(opts: {
         [routeKey: string]: any;
     };
     manifest: any;
-    withoutHTML?: boolean;
-}): Promise<JSX.Element>;
+    metadata?: IMetadata;
+}
+export declare function getClientRootComponent(opts: IHtmlProps): Promise<JSX.Element>;
+export {};

package/dist/server.js

@@ -48,19 +48,8 @@ function _getClientRootComponent() {
               serverLoaderData: opts.loaderData
             }
           }, rootContainer);
-          if (!opts.withoutHTML) {
-            _context.next = 8;
-            break;
-          }
-          return _context.abrupt("return", /*#__PURE__*/React.createElement("div", {
-            id: "root"
-          }, app));
-        case 8:
-          return _context.abrupt("return", /*#__PURE__*/React.createElement(Html, {
-            loaderData: opts.loaderData,
-            manifest: opts.manifest
-          }, app));
-        case 9:
+          return _context.abrupt("return", /*#__PURE__*/React.createElement(Html, opts, app));
+        case 7:
         case "end":
           return _context.stop();
       }
@@ -69,19 +58,33 @@ function _getClientRootComponent() {
   return _getClientRootComponent.apply(this, arguments);
 }
 function Html(_ref) {
+  var _metadata$keywords, _metadata$metas;
   var children = _ref.children,
     loaderData = _ref.loaderData,
-    manifest = _ref.manifest;
+    manifest = _ref.manifest,
+    metadata = _ref.metadata;
   // TODO: 处理 head 标签，比如 favicon.ico 的一致性
   // TODO: root 支持配置
 
   return /*#__PURE__*/React.createElement("html", {
-    lang: "en"
+    lang: (metadata === null || metadata === void 0 ? void 0 : metadata.lang) || 'en'
   }, /*#__PURE__*/React.createElement("head", null, /*#__PURE__*/React.createElement("meta", {
     charSet: "utf-8"
   }), /*#__PURE__*/React.createElement("meta", {
     name: "viewport",
     content: "width=device-width, initial-scale=1"
+  }), (metadata === null || metadata === void 0 ? void 0 : metadata.title) && /*#__PURE__*/React.createElement("title", null, metadata.title), (metadata === null || metadata === void 0 ? void 0 : metadata.description) && /*#__PURE__*/React.createElement("meta", {
+    name: "description",
+    content: metadata.description
+  }), (metadata === null || metadata === void 0 ? void 0 : (_metadata$keywords = metadata.keywords) === null || _metadata$keywords === void 0 ? void 0 : _metadata$keywords.length) && /*#__PURE__*/React.createElement("meta", {
+    name: "keywords",
+    content: metadata.keywords.join(',')
+  }), metadata === null || metadata === void 0 ? void 0 : (_metadata$metas = metadata.metas) === null || _metadata$metas === void 0 ? void 0 : _metadata$metas.map(function (em) {
+    return /*#__PURE__*/React.createElement("meta", {
+      key: em.name,
+      name: em.name,
+      content: em.content
+    });
   }), manifest.assets['umi.css'] && /*#__PURE__*/React.createElement("link", {
     rel: "stylesheet",
     href: manifest.assets['umi.css']

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/renderer-react",
-  "version": "4.0.86",
+  "version": "4.0.88",
   "description": "@umijs/renderer-react",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/renderer-react#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -16,7 +16,7 @@
     "dist"
   ],
   "dependencies": {
-    "@babel/runtime": "7.21.0",
+    "@babel/runtime": "7.23.2",
     "@loadable/component": "5.15.2",
     "history": "5.3.0",
     "react-helmet-async": "1.3.0",