@umijs/renderer-react 4.0.84 → 4.0.86

package/dist/appContext.js

@@ -9,23 +9,18 @@ export function useAppData() {
 }
 export function useSelectedRoutes() {
   var location = useLocation();
-
   var _useAppData = useAppData(),
-      clientRoutes = _useAppData.clientRoutes; // use `useLocation` get location without `basename`, not need `basename` param
-
-
+    clientRoutes = _useAppData.clientRoutes;
+  // use `useLocation` get location without `basename`, not need `basename` param
   var routes = matchRoutes(clientRoutes, location.pathname);
   return routes || [];
 }
 export function useRouteProps() {
   var _currentRoute$;
-
   var currentRoute = useSelectedRoutes().slice(-1);
-
   var _ref = ((_currentRoute$ = currentRoute[0]) === null || _currentRoute$ === void 0 ? void 0 : _currentRoute$.route) || {},
-      _ = _ref.element,
-      props = _objectWithoutProperties(_ref, _excluded);
-
+    _ = _ref.element,
+    props = _objectWithoutProperties(_ref, _excluded);
   return props;
 }
 export function useServerLoaderData() {

package/dist/link.js

@@ -6,19 +6,16 @@ import { Link } from 'react-router-dom';
 import { useAppData } from "./appContext";
 export function LinkWithPrefetch(props) {
   var _props$to;
-
   var prefetch = props.prefetch,
-      linkProps = _objectWithoutProperties(props, _excluded);
-
+    linkProps = _objectWithoutProperties(props, _excluded);
   var appData = useAppData();
-  var to = typeof props.to === 'string' ? props.to : (_props$to = props.to) === null || _props$to === void 0 ? void 0 : _props$to.pathname; // compatible with old code
+  var to = typeof props.to === 'string' ? props.to : (_props$to = props.to) === null || _props$to === void 0 ? void 0 : _props$to.pathname;
+  // compatible with old code
   // which to might be undefined
-
   if (!to) return null;
   return /*#__PURE__*/React.createElement(Link, _extends({
     onMouseEnter: function onMouseEnter() {
       var _appData$preloadRoute;
-
       return prefetch && to && ((_appData$preloadRoute = appData.preloadRoute) === null || _appData$preloadRoute === void 0 ? void 0 : _appData$preloadRoute.call(appData, to));
     }
   }, linkProps), props.children);

package/dist/server.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { IRouteComponents, IRoutesById } from './types';
 export declare function getClientRootComponent(opts: {
     routes: IRoutesById;
@@ -9,4 +8,5 @@ export declare function getClientRootComponent(opts: {
         [routeKey: string]: any;
     };
     manifest: any;
+    withoutHTML?: boolean;
 }): Promise<JSX.Element>;

package/dist/server.js

@@ -12,7 +12,7 @@ export function getClientRootComponent(_x) {
 }
 function _getClientRootComponent() {
   _getClientRootComponent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(opts) {
-    var basename, components, clientRoutes, rootContainer, _i, _arr, key;
+    var basename, components, clientRoutes, rootContainer, _i, _arr, key, app;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -37,10 +37,7 @@ function _getClientRootComponent() {
               args: {}
             });
           }
-          return _context.abrupt("return", /*#__PURE__*/React.createElement(Html, {
-            loaderData: opts.loaderData,
-            manifest: opts.manifest
-          }, /*#__PURE__*/React.createElement(AppContext.Provider, {
+          app = /*#__PURE__*/React.createElement(AppContext.Provider, {
             value: {
               routes: opts.routes,
               routeComponents: opts.routeComponents,
@@ -50,8 +47,20 @@ function _getClientRootComponent() {
               clientLoaderData: {},
               serverLoaderData: opts.loaderData
             }
-          }, rootContainer)));
-        case 6:
+          }, 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:
         case "end":
           return _context.stop();
       }

package/dist/useFetcher.js

@@ -2,8 +2,7 @@ import { useLocation } from 'react-router-dom';
 import { useAppData } from "./appContext";
 export function __useFetcher() {
   var _useAppData = useAppData(),
-      preloadRoute = _useAppData.preloadRoute;
-
+    preloadRoute = _useAppData.preloadRoute;
   var location = useLocation();
   return {
     load: function load(path) {

package/dist/withRouter.js

@@ -37,6 +37,5 @@ export function withRouter(Component) {
       navigate: navigate
     }));
   }
-
   return ComponentWithRouterProp;
 }

package/package.json

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