vike-react 0.5.6 → 0.5.7

package/dist/+config.d.ts

@@ -1,5 +1,6 @@
+export { config as default };
 import { ssrEffect } from './integration/ssrEffect.js';
-declare const _default: {
+declare const config: {
     name: string;
     require: {
         vike: string;
@@ -140,6 +141,5 @@ declare const _default: {
         };
     };
 };
-export default _default;
 import './types/Config.js';
 import './types/PageContext.js';

package/dist/+config.js

@@ -1,6 +1,7 @@
+export { config as default };
 import { ssrEffect } from './integration/ssrEffect.js';
 import { isNotFalse } from './utils/isNotFalse.js';
-export default {
+const config = {
     name: 'vike-react',
     require: {
         vike: '>=0.4.182',

package/dist/components/Loading.d.ts

@@ -1,6 +1,6 @@
-import React from 'react';
 declare const _default: {
     component: typeof LoadingComponent;
 };
 export default _default;
+import React from 'react';
 declare function LoadingComponent(): React.JSX.Element;

package/dist/components/Loading.js

@@ -1,7 +1,7 @@
-import React from 'react';
 export default {
     component: LoadingComponent,
 };
+import React from 'react';
 function LoadingComponent() {
     return (React.createElement("div", { style: {
             width: '100%',

package/dist/integration/getPageElement.d.ts

@@ -1,3 +1,6 @@
 export { getPageElement };
 import type { PageContext } from 'vike/types';
-declare function getPageElement(pageContext: PageContext): JSX.Element;
+declare function getPageElement(pageContext: PageContext): {
+    page: JSX.Element;
+    renderPromise: Promise<void>;
+};

package/dist/integration/getPageElement.js

@@ -1,5 +1,5 @@
 export { getPageElement };
-import React, { Suspense } from 'react';
+import React, { Suspense, useEffect } from 'react';
 import { PageContextProvider } from '../hooks/usePageContext.js';
 function getPageElement(pageContext) {
     const { Page, config: { Loading }, } = pageContext;
@@ -21,8 +21,15 @@ function getPageElement(pageContext) {
         page = addSuspense(page);
     });
     page = React.createElement(PageContextProvider, { pageContext: pageContext }, page);
+    let renderPromiseResolve;
+    let renderPromise = new Promise((r) => (renderPromiseResolve = r));
+    page = React.createElement(RenderPromiseProvider, { renderPromiseResolve: renderPromiseResolve }, page);
     if (pageContext.config.reactStrictMode !== false) {
         page = React.createElement(React.StrictMode, null, page);
     }
-    return page;
+    return { page, renderPromise };
+}
+function RenderPromiseProvider({ children, renderPromiseResolve, }) {
+    useEffect(renderPromiseResolve);
+    return children;
 }

package/dist/integration/onRenderClient.js

@@ -12,7 +12,7 @@ const onRenderClient = async (pageContext) => {
     // Use case:
     // - Store hydration https://github.com/vikejs/vike-react/issues/110
     await callCumulativeHooks(pageContext.config.onBeforeRenderClient, pageContext);
-    const page = getPageElement(pageContext);
+    const { page, renderPromise } = getPageElement(pageContext);
     pageContext.page = page;
     // 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.
     //  - 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) => {
         root.render(page);
     }
     pageContext.root = root;
+    await renderPromise;
     if (!pageContext.isHydration) {
         pageContext._headAlreadySet = true;
         applyHead(pageContext);

package/dist/integration/onRenderHtml.js

@@ -37,7 +37,7 @@ async function getPageHtml(pageContext) {
         pageHtml = '';
     }
     else {
-        const page = getPageElement(pageContext);
+        const { page } = getPageElement(pageContext);
         const { stream, streamIsRequired } = pageContext.config;
         if (!stream && !streamIsRequired) {
             const pageHtmlString = renderToString(page);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike-react",
-  "version": "0.5.6",
+  "version": "0.5.7",
   "repository": "https://github.com/vikejs/vike-react",
   "type": "module",
   "exports": {