@umijs/renderer-react 4.0.55 → 4.0.57

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/routes.js

@@ -9,8 +9,8 @@ import { RouteContext, useRouteData } from "./routeContext";
 import { useAppData } from "./appContext";
 export function createClientRoutes(opts) {
   var routesById = opts.routesById,
-      parentId = opts.parentId,
-      routeComponents = opts.routeComponents;
+    parentId = opts.parentId,
+    routeComponents = opts.routeComponents;
   return Object.keys(routesById).filter(function (id) {
     return routesById[id].parentId === parentId;
   }).map(function (id) {
@@ -32,36 +32,28 @@ export function createClientRoutes(opts) {
       loadingComponent: opts.loadingComponent,
       reactRouter5Compat: opts.reactRouter5Compat
     });
-
     if (children.length > 0) {
-      route.children = children; // TODO: remove me
+      route.children = children;
+      // TODO: remove me
       // compatible with @ant-design/pro-layout
-
       route.routes = children;
     }
-
     return route;
   });
 }
-
 function NavigateWithParams(props) {
   var params = useParams();
-
   var propsWithParams = _objectSpread(_objectSpread({}, props), {}, {
     to: generatePath(props.to, params)
   });
-
   return /*#__PURE__*/React.createElement(Navigate, _extends({
     replace: true
   }, propsWithParams));
 }
-
 function createClientRoute(opts) {
   var route = opts.route;
-
   var redirect = route.redirect,
-      props = _objectWithoutProperties(route, _excluded);
-
+    props = _objectWithoutProperties(route, _excluded);
   var Remote = opts.reactRouter5Compat ? RemoteComponentReactRouter5 : RemoteComponent;
   return _objectSpread({
     element: redirect ? /*#__PURE__*/React.createElement(NavigateWithParams, {
@@ -77,27 +69,24 @@ function createClientRoute(opts) {
     }))
   }, props);
 }
-
 function DefaultLoading() {
   return /*#__PURE__*/React.createElement("div", null);
 }
-
 function RemoteComponentReactRouter5(props) {
   var _useRouteData = useRouteData(),
-      route = _useRouteData.route;
-
+    route = _useRouteData.route;
   var _useAppData = useAppData(),
-      history = _useAppData.history,
-      clientRoutes = _useAppData.clientRoutes;
-
+    history = _useAppData.history,
+    clientRoutes = _useAppData.clientRoutes;
   var params = useParams();
   var match = {
     params: params,
     isExact: true,
     path: route.path,
     url: history.location.pathname
-  }; // staticContext 没有兼容 好像没看到对应的兼容写法
+  };
 
+  // staticContext 没有兼容 好像没看到对应的兼容写法
   var Component = props.loader;
   return /*#__PURE__*/React.createElement(React.Suspense, {
     fallback: /*#__PURE__*/React.createElement(props.loadingComponent, null)
@@ -110,7 +99,6 @@ function RemoteComponentReactRouter5(props) {
     routes: clientRoutes
   }, props.hasChildren && /*#__PURE__*/React.createElement(Outlet, null)));
 }
-
 function RemoteComponent(props) {
   var Component = props.loader;
   return /*#__PURE__*/React.createElement(React.Suspense, {

package/dist/server.d.ts

@@ -1,6 +1,5 @@
 /// <reference types="react" />
 import { IRouteComponents, IRoutesById } from './types';
-export declare function getHelmetContext(): {};
 export declare function getClientRootComponent(opts: {
     routes: IRoutesById;
     routeComponents: IRouteComponents;

package/dist/server.js

@@ -2,83 +2,67 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import React from 'react';
-import { HelmetProvider } from 'react-helmet-async';
 import { StaticRouter } from 'react-router-dom/server';
 import { AppContext } from "./appContext";
 import { Routes } from "./browser";
 import { createClientRoutes } from "./routes";
-// store helmet data
-var helmetContext = {}; // get helmet context
-
-export function getHelmetContext() {
-  return helmetContext;
-} // Get the root React component for ReactDOMServer.renderToString
-
+// Get the root React component for ReactDOMServer.renderToString
 export function getClientRootComponent(_x) {
   return _getClientRootComponent.apply(this, arguments);
 }
-
 function _getClientRootComponent() {
   _getClientRootComponent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(opts) {
     var basename, components, clientRoutes, rootContainer, _i, _arr, key;
-
     return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            basename = '/';
-            components = _objectSpread({}, opts.routeComponents);
-            clientRoutes = createClientRoutes({
-              routesById: opts.routes,
-              routeComponents: components
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          basename = '/';
+          components = _objectSpread({}, opts.routeComponents);
+          clientRoutes = createClientRoutes({
+            routesById: opts.routes,
+            routeComponents: components
+          });
+          rootContainer = /*#__PURE__*/React.createElement(StaticRouter, {
+            basename: basename,
+            location: opts.location
+          }, /*#__PURE__*/React.createElement(Routes, null));
+          for (_i = 0, _arr = [
+          // Lowest to the highest priority
+          'innerProvider', 'i18nProvider', 'accessProvider', 'dataflowProvider', 'outerProvider', 'rootContainer']; _i < _arr.length; _i++) {
+            key = _arr[_i];
+            rootContainer = opts.pluginManager.applyPlugins({
+              type: 'modify',
+              key: key,
+              initialValue: rootContainer,
+              args: {}
             });
-            rootContainer = /*#__PURE__*/React.createElement(StaticRouter, {
+          }
+          return _context.abrupt("return", /*#__PURE__*/React.createElement(Html, {
+            loaderData: opts.loaderData,
+            manifest: opts.manifest
+          }, /*#__PURE__*/React.createElement(AppContext.Provider, {
+            value: {
+              routes: opts.routes,
+              routeComponents: opts.routeComponents,
+              clientRoutes: clientRoutes,
+              pluginManager: opts.pluginManager,
               basename: basename,
-              location: opts.location
-            }, /*#__PURE__*/React.createElement(Routes, null));
-
-            for (_i = 0, _arr = [// Lowest to the highest priority
-            'innerProvider', 'i18nProvider', 'accessProvider', 'dataflowProvider', 'outerProvider', 'rootContainer']; _i < _arr.length; _i++) {
-              key = _arr[_i];
-              rootContainer = opts.pluginManager.applyPlugins({
-                type: 'modify',
-                key: key,
-                initialValue: rootContainer,
-                args: {}
-              });
+              clientLoaderData: {},
+              serverLoaderData: opts.loaderData
             }
-
-            return _context.abrupt("return", /*#__PURE__*/React.createElement(Html, {
-              loaderData: opts.loaderData,
-              manifest: opts.manifest
-            }, /*#__PURE__*/React.createElement(HelmetProvider, {
-              context: helmetContext
-            }, /*#__PURE__*/React.createElement(AppContext.Provider, {
-              value: {
-                routes: opts.routes,
-                routeComponents: opts.routeComponents,
-                clientRoutes: clientRoutes,
-                pluginManager: opts.pluginManager,
-                basename: basename,
-                clientLoaderData: {},
-                serverLoaderData: opts.loaderData
-              }
-            }, rootContainer))));
-
-          case 6:
-          case "end":
-            return _context.stop();
-        }
+          }, rootContainer)));
+        case 6:
+        case "end":
+          return _context.stop();
       }
     }, _callee);
   }));
   return _getClientRootComponent.apply(this, arguments);
 }
-
 function Html(_ref) {
   var children = _ref.children,
-      loaderData = _ref.loaderData,
-      manifest = _ref.manifest;
+    loaderData = _ref.loaderData,
+    manifest = _ref.manifest;
   // TODO: 处理 head 标签，比如 favicon.ico 的一致性
   // TODO: root 支持配置
   return /*#__PURE__*/React.createElement("html", {

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.55",
+  "version": "4.0.57",
   "description": "@umijs/renderer-react",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/renderer-react#readme",
   "bugs": "https://github.com/umijs/umi/issues",