@umijs/renderer-react 4.0.29 → 4.0.31
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/browser.js +7 -3
- package/dist/index.d.ts +1 -0
- package/dist/index.js +1 -0
- package/dist/server.d.ts +1 -0
- package/dist/server.js +11 -2
- package/dist/useFetcher.d.ts +1 -1
- package/package.json +2 -1
package/dist/browser.js
CHANGED
|
@@ -4,6 +4,7 @@ import _createForOfIteratorHelper from "@babel/runtime/helpers/createForOfIterat
|
|
|
4
4
|
import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
|
|
5
5
|
import React, { useCallback, useEffect, useState } from 'react'; // compatible with < react@18 in @umijs/preset-umi/src/features/react
|
|
6
6
|
|
|
7
|
+
import { HelmetProvider } from 'react-helmet-async';
|
|
7
8
|
import ReactDOM from 'react-dom/client';
|
|
8
9
|
import { matchRoutes, Router, useRoutes } from 'react-router-dom';
|
|
9
10
|
import { AppContext, useAppData } from "./appContext";
|
|
@@ -233,7 +234,9 @@ var getBrowser = function getBrowser(opts, routesElement) {
|
|
|
233
234
|
handleRouteChange(e.location.pathname);
|
|
234
235
|
});
|
|
235
236
|
}, []);
|
|
236
|
-
return /*#__PURE__*/React.createElement(
|
|
237
|
+
return /*#__PURE__*/React.createElement(HelmetProvider, {
|
|
238
|
+
context: {}
|
|
239
|
+
}, /*#__PURE__*/React.createElement(AppContext.Provider, {
|
|
237
240
|
value: {
|
|
238
241
|
routes: opts.routes,
|
|
239
242
|
routeComponents: opts.routeComponents,
|
|
@@ -246,7 +249,7 @@ var getBrowser = function getBrowser(opts, routesElement) {
|
|
|
246
249
|
preloadRoute: handleRouteChange,
|
|
247
250
|
history: opts.history
|
|
248
251
|
}
|
|
249
|
-
}, rootContainer);
|
|
252
|
+
}, rootContainer));
|
|
250
253
|
};
|
|
251
254
|
|
|
252
255
|
return Browser;
|
|
@@ -270,7 +273,8 @@ export function renderClient(opts) {
|
|
|
270
273
|
}
|
|
271
274
|
|
|
272
275
|
if (ReactDOM.createRoot) {
|
|
273
|
-
ReactDOM.createRoot(rootElement)
|
|
276
|
+
root = ReactDOM.createRoot(rootElement);
|
|
277
|
+
root.render( /*#__PURE__*/React.createElement(Browser, null));
|
|
274
278
|
return;
|
|
275
279
|
} // @ts-ignore
|
|
276
280
|
|
package/dist/index.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export { createBrowserHistory, createHashHistory, createMemoryHistory, type History, } from 'history';
|
|
2
2
|
export { createSearchParams, generatePath, matchPath, matchRoutes, Navigate, NavLink, Outlet, resolvePath, useLocation, useMatch, useNavigate, useOutlet, useOutletContext, useParams, useResolvedPath, useRoutes, useSearchParams, } from 'react-router-dom';
|
|
3
|
+
export { Helmet } from 'react-helmet-async';
|
|
3
4
|
export { useAppData, useClientLoaderData, useServerLoaderData, } from './appContext';
|
|
4
5
|
export { renderClient, __getRoot } from './browser';
|
|
5
6
|
export { LinkWithPrefetch as Link } from './link';
|
package/dist/index.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export { createBrowserHistory, createHashHistory, createMemoryHistory } from 'history';
|
|
2
2
|
export { createSearchParams, generatePath, matchPath, matchRoutes, Navigate, NavLink, Outlet, resolvePath, useLocation, useMatch, useNavigate, useOutlet, useOutletContext, useParams, useResolvedPath, useRoutes, useSearchParams } from 'react-router-dom';
|
|
3
|
+
export { Helmet } from 'react-helmet-async';
|
|
3
4
|
export { useAppData, useClientLoaderData, useServerLoaderData } from "./appContext";
|
|
4
5
|
export { renderClient, __getRoot } from "./browser";
|
|
5
6
|
export { LinkWithPrefetch as Link } from "./link";
|
package/dist/server.d.ts
CHANGED
package/dist/server.js
CHANGED
|
@@ -2,11 +2,18 @@ import _regeneratorRuntime from "@babel/runtime/helpers/regeneratorRuntime";
|
|
|
2
2
|
import _objectSpread from "@babel/runtime/helpers/objectSpread2";
|
|
3
3
|
import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
|
|
4
4
|
import React from 'react';
|
|
5
|
+
import { HelmetProvider } from 'react-helmet-async';
|
|
5
6
|
import { StaticRouter } from 'react-router-dom/server';
|
|
6
7
|
import { AppContext } from "./appContext";
|
|
7
8
|
import { Routes } from "./browser";
|
|
8
9
|
import { createClientRoutes } from "./routes";
|
|
9
|
-
//
|
|
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
|
+
|
|
10
17
|
export function getClientRootComponent(_x) {
|
|
11
18
|
return _getClientRootComponent.apply(this, arguments);
|
|
12
19
|
}
|
|
@@ -44,6 +51,8 @@ function _getClientRootComponent() {
|
|
|
44
51
|
return _context.abrupt("return", /*#__PURE__*/React.createElement(Html, {
|
|
45
52
|
loaderData: opts.loaderData,
|
|
46
53
|
manifest: opts.manifest
|
|
54
|
+
}, /*#__PURE__*/React.createElement(HelmetProvider, {
|
|
55
|
+
context: helmetContext
|
|
47
56
|
}, /*#__PURE__*/React.createElement(AppContext.Provider, {
|
|
48
57
|
value: {
|
|
49
58
|
routes: opts.routes,
|
|
@@ -54,7 +63,7 @@ function _getClientRootComponent() {
|
|
|
54
63
|
clientLoaderData: {},
|
|
55
64
|
serverLoaderData: opts.loaderData
|
|
56
65
|
}
|
|
57
|
-
}, rootContainer)));
|
|
66
|
+
}, rootContainer))));
|
|
58
67
|
|
|
59
68
|
case 6:
|
|
60
69
|
case "end":
|
package/dist/useFetcher.d.ts
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@umijs/renderer-react",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.31",
|
|
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",
|
|
@@ -25,6 +25,7 @@
|
|
|
25
25
|
"@babel/runtime": "7.18.9",
|
|
26
26
|
"@loadable/component": "5.15.2",
|
|
27
27
|
"history": "5.3.0",
|
|
28
|
+
"react-helmet-async": "1.3.0",
|
|
28
29
|
"react-router-dom": "6.3.0"
|
|
29
30
|
},
|
|
30
31
|
"devDependencies": {
|