@umijs/renderer-react 4.0.55 → 4.0.56

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/server.d.ts CHANGED
@@ -1,6 +1,5 @@
1
1
  /// <reference types="react" />
2
2
  import { IRouteComponents, IRoutesById } from './types';
3
- export declare function getHelmetContext(): {};
4
3
  export declare function getClientRootComponent(opts: {
5
4
  routes: IRoutesById;
6
5
  routeComponents: IRouteComponents;
package/dist/server.js CHANGED
@@ -2,83 +2,67 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
2
2
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
3
3
  import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
4
4
  import React from 'react';
5
- import { HelmetProvider } from 'react-helmet-async';
6
5
  import { StaticRouter } from 'react-router-dom/server';
7
6
  import { AppContext } from "./appContext";
8
7
  import { Routes } from "./browser";
9
8
  import { createClientRoutes } from "./routes";
10
- // store helmet data
11
- var helmetContext = {}; // get helmet context
12
-
13
- export function getHelmetContext() {
14
- return helmetContext;
15
- } // Get the root React component for ReactDOMServer.renderToString
16
-
9
+ // Get the root React component for ReactDOMServer.renderToString
17
10
  export function getClientRootComponent(_x) {
18
11
  return _getClientRootComponent.apply(this, arguments);
19
12
  }
20
-
21
13
  function _getClientRootComponent() {
22
14
  _getClientRootComponent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(opts) {
23
15
  var basename, components, clientRoutes, rootContainer, _i, _arr, key;
24
-
25
16
  return _regeneratorRuntime().wrap(function _callee$(_context) {
26
- while (1) {
27
- switch (_context.prev = _context.next) {
28
- case 0:
29
- basename = '/';
30
- components = _objectSpread({}, opts.routeComponents);
31
- clientRoutes = createClientRoutes({
32
- routesById: opts.routes,
33
- routeComponents: components
17
+ while (1) switch (_context.prev = _context.next) {
18
+ case 0:
19
+ basename = '/';
20
+ components = _objectSpread({}, opts.routeComponents);
21
+ clientRoutes = createClientRoutes({
22
+ routesById: opts.routes,
23
+ routeComponents: components
24
+ });
25
+ rootContainer = /*#__PURE__*/React.createElement(StaticRouter, {
26
+ basename: basename,
27
+ location: opts.location
28
+ }, /*#__PURE__*/React.createElement(Routes, null));
29
+ for (_i = 0, _arr = [
30
+ // Lowest to the highest priority
31
+ 'innerProvider', 'i18nProvider', 'accessProvider', 'dataflowProvider', 'outerProvider', 'rootContainer']; _i < _arr.length; _i++) {
32
+ key = _arr[_i];
33
+ rootContainer = opts.pluginManager.applyPlugins({
34
+ type: 'modify',
35
+ key: key,
36
+ initialValue: rootContainer,
37
+ args: {}
34
38
  });
35
- rootContainer = /*#__PURE__*/React.createElement(StaticRouter, {
39
+ }
40
+ return _context.abrupt("return", /*#__PURE__*/React.createElement(Html, {
41
+ loaderData: opts.loaderData,
42
+ manifest: opts.manifest
43
+ }, /*#__PURE__*/React.createElement(AppContext.Provider, {
44
+ value: {
45
+ routes: opts.routes,
46
+ routeComponents: opts.routeComponents,
47
+ clientRoutes: clientRoutes,
48
+ pluginManager: opts.pluginManager,
36
49
  basename: basename,
37
- location: opts.location
38
- }, /*#__PURE__*/React.createElement(Routes, null));
39
-
40
- for (_i = 0, _arr = [// Lowest to the highest priority
41
- 'innerProvider', 'i18nProvider', 'accessProvider', 'dataflowProvider', 'outerProvider', 'rootContainer']; _i < _arr.length; _i++) {
42
- key = _arr[_i];
43
- rootContainer = opts.pluginManager.applyPlugins({
44
- type: 'modify',
45
- key: key,
46
- initialValue: rootContainer,
47
- args: {}
48
- });
50
+ clientLoaderData: {},
51
+ serverLoaderData: opts.loaderData
49
52
  }
50
-
51
- return _context.abrupt("return", /*#__PURE__*/React.createElement(Html, {
52
- loaderData: opts.loaderData,
53
- manifest: opts.manifest
54
- }, /*#__PURE__*/React.createElement(HelmetProvider, {
55
- context: helmetContext
56
- }, /*#__PURE__*/React.createElement(AppContext.Provider, {
57
- value: {
58
- routes: opts.routes,
59
- routeComponents: opts.routeComponents,
60
- clientRoutes: clientRoutes,
61
- pluginManager: opts.pluginManager,
62
- basename: basename,
63
- clientLoaderData: {},
64
- serverLoaderData: opts.loaderData
65
- }
66
- }, rootContainer))));
67
-
68
- case 6:
69
- case "end":
70
- return _context.stop();
71
- }
53
+ }, rootContainer)));
54
+ case 6:
55
+ case "end":
56
+ return _context.stop();
72
57
  }
73
58
  }, _callee);
74
59
  }));
75
60
  return _getClientRootComponent.apply(this, arguments);
76
61
  }
77
-
78
62
  function Html(_ref) {
79
63
  var children = _ref.children,
80
- loaderData = _ref.loaderData,
81
- manifest = _ref.manifest;
64
+ loaderData = _ref.loaderData,
65
+ manifest = _ref.manifest;
82
66
  // TODO: 处理 head 标签,比如 favicon.ico 的一致性
83
67
  // TODO: root 支持配置
84
68
  return /*#__PURE__*/React.createElement("html", {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@umijs/renderer-react",
3
- "version": "4.0.55",
3
+ "version": "4.0.56",
4
4
  "description": "@umijs/renderer-react",
5
5
  "homepage": "https://github.com/umijs/umi/tree/master/packages/renderer-react#readme",
6
6
  "bugs": "https://github.com/umijs/umi/issues",