@umijs/renderer-react 4.0.20 → 4.0.21

package/dist/link.js

@@ -1,18 +1,15 @@
-import _objectSpread from "@babel/runtime/helpers/objectSpread2";
+import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import { Link } from 'react-router-dom';
 import { useAppData } from "./appContext";
-import { jsx as _jsx } from "react/jsx-runtime";
 export function LinkWithPrefetch(props) {
   var appData = useAppData();
   var to = typeof props.to === 'string' ? props.to : props.to.pathname;
-  return /*#__PURE__*/_jsx(Link, _objectSpread(_objectSpread({
+  return /*#__PURE__*/React.createElement(Link, _extends({
     onMouseEnter: function onMouseEnter() {
       var _appData$preloadRoute;
 
       return props.prefetch && to && ((_appData$preloadRoute = appData.preloadRoute) === null || _appData$preloadRoute === void 0 ? void 0 : _appData$preloadRoute.call(appData, to));
     }
-  }, props), {}, {
-    children: props.children
-  }));
+  }, props), props.children);
 }

package/dist/server.js

@@ -1,23 +1,21 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/regeneratorRuntime";
 import _objectSpread from "@babel/runtime/helpers/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React from 'react';
 import { StaticRouter } from 'react-router-dom/server';
 import { AppContext } from "./appContext";
 import { Routes } from "./browser";
 import { createClientRoutes } from "./routes";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
 // 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) {
+  _getClientRootComponent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(opts) {
     var basename, components, clientRoutes, rootContainer, _i, _arr, key;
 
-    return _regeneratorRuntime.wrap(function _callee$(_context) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
@@ -27,11 +25,10 @@ function _getClientRootComponent() {
               routesById: opts.routes,
               routeComponents: components
             });
-            rootContainer = /*#__PURE__*/_jsx(StaticRouter, {
+            rootContainer = /*#__PURE__*/React.createElement(StaticRouter, {
               basename: basename,
-              location: opts.location,
-              children: /*#__PURE__*/_jsx(Routes, {})
-            });
+              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++) {
@@ -44,22 +41,20 @@ function _getClientRootComponent() {
               });
             }
 
-            return _context.abrupt("return", /*#__PURE__*/_jsx(Html, {
+            return _context.abrupt("return", /*#__PURE__*/React.createElement(Html, {
               loaderData: opts.loaderData,
-              manifest: opts.manifest,
-              children: /*#__PURE__*/_jsx(AppContext.Provider, {
-                value: {
-                  routes: opts.routes,
-                  routeComponents: opts.routeComponents,
-                  clientRoutes: clientRoutes,
-                  pluginManager: opts.pluginManager,
-                  basename: basename,
-                  clientLoaderData: {},
-                  serverLoaderData: opts.loaderData
-                },
-                children: rootContainer
-              })
-            }));
+              manifest: opts.manifest
+            }, /*#__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":
@@ -77,31 +72,25 @@ function Html(_ref) {
       manifest = _ref.manifest;
   // TODO: 处理 head 标签，比如 favicon.ico 的一致性
   // TODO: root 支持配置
-  return /*#__PURE__*/_jsxs("html", {
-    lang: "en",
-    children: [/*#__PURE__*/_jsxs("head", {
-      children: [/*#__PURE__*/_jsx("meta", {
-        charSet: "utf-8"
-      }), /*#__PURE__*/_jsx("meta", {
-        name: "viewport",
-        content: "width=device-width, initial-scale=1"
-      }), manifest.assets['umi.css'] && /*#__PURE__*/_jsx("link", {
-        rel: "stylesheet",
-        href: manifest.assets['umi.css']
-      })]
-    }), /*#__PURE__*/_jsxs("body", {
-      children: [/*#__PURE__*/_jsx("noscript", {
-        dangerouslySetInnerHTML: {
-          __html: "<b>Enable JavaScript to run this app.</b>"
-        }
-      }), /*#__PURE__*/_jsx("div", {
-        id: "root",
-        children: children
-      }), /*#__PURE__*/_jsx("script", {
-        dangerouslySetInnerHTML: {
-          __html: "window.__UMI_LOADER_DATA__ = ".concat(JSON.stringify(loaderData))
-        }
-      })]
-    })]
-  });
+  return /*#__PURE__*/React.createElement("html", {
+    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"
+  }), manifest.assets['umi.css'] && /*#__PURE__*/React.createElement("link", {
+    rel: "stylesheet",
+    href: manifest.assets['umi.css']
+  })), /*#__PURE__*/React.createElement("body", null, /*#__PURE__*/React.createElement("noscript", {
+    dangerouslySetInnerHTML: {
+      __html: "<b>Enable JavaScript to run this app.</b>"
+    }
+  }), /*#__PURE__*/React.createElement("div", {
+    id: "root"
+  }, children), /*#__PURE__*/React.createElement("script", {
+    dangerouslySetInnerHTML: {
+      __html: "window.__UMI_LOADER_DATA__ = ".concat(JSON.stringify(loaderData))
+    }
+  })));
 }

package/package.json

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