vike-react 0.5.5 → 0.5.7
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/+config.d.ts +1 -1
- package/dist/+config.js +1 -1
- package/dist/components/Loading.d.ts +1 -1
- package/dist/components/Loading.js +1 -1
- package/dist/hooks/useData.js +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.js +1 -1
- package/dist/integration/getPageElement.d.ts +4 -1
- package/dist/integration/getPageElement.js +9 -2
- package/dist/integration/onRenderClient.js +2 -1
- package/dist/integration/onRenderHtml.js +1 -1
- package/package.json +1 -1
package/dist/+config.d.ts
CHANGED
package/dist/+config.js
CHANGED
package/dist/hooks/useData.js
CHANGED
package/dist/index.d.ts
CHANGED
@@ -1 +1 @@
|
|
1
|
-
export {
|
1
|
+
export { default } from './+config.js';
|
package/dist/index.js
CHANGED
@@ -1,3 +1,3 @@
|
|
1
1
|
// TODO/next-major-release: remove this file/export
|
2
2
|
console.warn("[vike-react][warning][deprecation] Replace `import vikeReact from 'vike-react'` with `import vikeReact from 'vike-react/config'` (typically in your /pages/+config.js)");
|
3
|
-
export {
|
3
|
+
export { default } from './+config.js';
|
@@ -1,3 +1,6 @@
|
|
1
1
|
export { getPageElement };
|
2
2
|
import type { PageContext } from 'vike/types';
|
3
|
-
declare function getPageElement(pageContext: PageContext):
|
3
|
+
declare function getPageElement(pageContext: PageContext): {
|
4
|
+
page: JSX.Element;
|
5
|
+
renderPromise: Promise<void>;
|
6
|
+
};
|
@@ -1,5 +1,5 @@
|
|
1
1
|
export { getPageElement };
|
2
|
-
import React, { Suspense } from 'react';
|
2
|
+
import React, { Suspense, useEffect } from 'react';
|
3
3
|
import { PageContextProvider } from '../hooks/usePageContext.js';
|
4
4
|
function getPageElement(pageContext) {
|
5
5
|
const { Page, config: { Loading }, } = pageContext;
|
@@ -21,8 +21,15 @@ function getPageElement(pageContext) {
|
|
21
21
|
page = addSuspense(page);
|
22
22
|
});
|
23
23
|
page = React.createElement(PageContextProvider, { pageContext: pageContext }, page);
|
24
|
+
let renderPromiseResolve;
|
25
|
+
let renderPromise = new Promise((r) => (renderPromiseResolve = r));
|
26
|
+
page = React.createElement(RenderPromiseProvider, { renderPromiseResolve: renderPromiseResolve }, page);
|
24
27
|
if (pageContext.config.reactStrictMode !== false) {
|
25
28
|
page = React.createElement(React.StrictMode, null, page);
|
26
29
|
}
|
27
|
-
return page;
|
30
|
+
return { page, renderPromise };
|
31
|
+
}
|
32
|
+
function RenderPromiseProvider({ children, renderPromiseResolve, }) {
|
33
|
+
useEffect(renderPromiseResolve);
|
34
|
+
return children;
|
28
35
|
}
|
@@ -12,7 +12,7 @@ const onRenderClient = async (pageContext) => {
|
|
12
12
|
// Use case:
|
13
13
|
// - Store hydration https://github.com/vikejs/vike-react/issues/110
|
14
14
|
await callCumulativeHooks(pageContext.config.onBeforeRenderClient, pageContext);
|
15
|
-
const page = getPageElement(pageContext);
|
15
|
+
const { page, renderPromise } = getPageElement(pageContext);
|
16
16
|
pageContext.page = page;
|
17
17
|
// TODO: implement this? So that, upon errors, onRenderClient() throws an error and Vike can render the error. As of April 2024 it isn't released yet.
|
18
18
|
// - https://react-dev-git-fork-rickhanlonii-rh-root-options-fbopensource.vercel.app/reference/react-dom/client/createRoot#show-a-dialog-for-uncaught-errors
|
@@ -39,6 +39,7 @@ const onRenderClient = async (pageContext) => {
|
|
39
39
|
root.render(page);
|
40
40
|
}
|
41
41
|
pageContext.root = root;
|
42
|
+
await renderPromise;
|
42
43
|
if (!pageContext.isHydration) {
|
43
44
|
pageContext._headAlreadySet = true;
|
44
45
|
applyHead(pageContext);
|
@@ -37,7 +37,7 @@ async function getPageHtml(pageContext) {
|
|
37
37
|
pageHtml = '';
|
38
38
|
}
|
39
39
|
else {
|
40
|
-
const page = getPageElement(pageContext);
|
40
|
+
const { page } = getPageElement(pageContext);
|
41
41
|
const { stream, streamIsRequired } = pageContext.config;
|
42
42
|
if (!stream && !streamIsRequired) {
|
43
43
|
const pageHtmlString = renderToString(page);
|