vike-react 0.4.11 → 0.4.13

package/dist/+config.d.ts

@@ -2,6 +2,9 @@ import { ssrEffect } from './renderer/ssrEffect.js';
 import './types/index.js';
 declare const _default: {
     name: string;
+    require: {
+        vike: string;
+    };
     onRenderHtml: "import:vike-react/renderer/onRenderHtml:onRenderHtml";
     onRenderClient: "import:vike-react/renderer/onRenderClient:onRenderClient";
     passToClient: string[];
@@ -48,7 +51,7 @@ declare const _default: {
                 server: true;
             };
         };
-        _streamIsRequied: {
+        streamIsRequired: {
             env: {
                 server: true;
             };
@@ -63,19 +66,19 @@ declare const _default: {
                 client: true;
             };
         };
-        VikeReactQueryWrapper: {
+        Wrapper: {
+            cumulative: true;
             env: {
                 client: true;
                 server: true;
             };
         };
-        Wrapper: {
+        name: {
             env: {
-                client: true;
-                server: true;
+                config: true;
             };
         };
-        name: {
+        require: {
             env: {
                 config: true;
             };

package/dist/+config.js

@@ -4,6 +4,9 @@ import { ssrEffect } from './renderer/ssrEffect.js';
 import './types/index.js';
 export default {
     name: 'vike-react',
+    require: {
+        vike: '>=0.4.173'
+    },
     // https://vike.dev/onRenderHtml
     onRenderHtml: 'import:vike-react/renderer/onRenderHtml:onRenderHtml',
     // https://vike.dev/onRenderClient
@@ -39,7 +42,7 @@ export default {
         stream: {
             env: { server: true }
         },
-        _streamIsRequied: {
+        streamIsRequired: {
             env: { server: true }
         },
         onBeforeRenderClient: {
@@ -48,16 +51,18 @@ export default {
         onAfterRenderClient: {
             env: { client: true }
         },
-        VikeReactQueryWrapper: {
-            env: { client: true, server: true }
-        },
         Wrapper: {
+            cumulative: true,
             env: { client: true, server: true }
         },
-        // Vike already defines the setting 'name', but we redundantly define it here for older Vike versions (otherwise older Vike versions will complain that 'name` is an unknown config).
+        // Vike already defines the setting 'name', but we redundantly define it here for older Vike versions (otherwise older Vike versions will complain that 'name` is an unknown config). TODO/eventually: remove this once <=0.4.172 versions become rare (also because we use the `require` setting starting from `0.4.173`).
         name: {
             env: { config: true }
         },
+        // Vike already defines the setting 'require', but we redundantly define it here for older Vike versions (otherwise older Vike versions will complain that 'require` is an unknown config). TODO/eventually: remove this once <=0.4.172 versions become rare (also because we use the `require` setting starting from `0.4.173`).
+        require: {
+            env: { config: true }
+        },
         reactStrictMode: {
             env: { client: true, server: true }
         }

package/dist/renderer/getPageElement.js

@@ -2,14 +2,14 @@ export { getPageElement };
 import React from 'react';
 import { PageContextProvider } from '../hooks/usePageContext.js';
 function getPageElement(pageContext) {
+    // Main component
     const Layout = pageContext.config.Layout ?? PassThrough;
-    const Wrapper = pageContext.config.Wrapper ?? PassThrough;
-    const VikeReactQueryWrapper = pageContext.config.VikeReactQueryWrapper ?? PassThrough;
     const { Page } = pageContext;
-    let page = (React.createElement(PageContextProvider, { pageContext: pageContext },
-        React.createElement(VikeReactQueryWrapper, { pageContext: pageContext },
-            React.createElement(Wrapper, null,
-                React.createElement(Layout, null, Page ? React.createElement(Page, null) : null)))));
+    let page = React.createElement(Layout, null, Page ? React.createElement(Page, null) : null);
+    (pageContext.config.Wrapper || []).forEach((Wrapper) => {
+        page = React.createElement(Wrapper, null, page);
+    });
+    page = React.createElement(PageContextProvider, { pageContext: pageContext }, page);
     if (pageContext.config.reactStrictMode !== false) {
         page = React.createElement(React.StrictMode, null, page);
     }

package/dist/renderer/onRenderHtml.js

@@ -28,15 +28,18 @@ const onRenderHtml = async (pageContext) => {
     }
     else {
         const page = getPageElement(pageContext);
-        const { stream, 
-        // @ts-expect-error
-        _streamIsRequied } = pageContext.config;
-        if (!stream && !_streamIsRequied) {
+        const { stream, streamIsRequired } = pageContext.config;
+        if (!stream && !streamIsRequired) {
             pageView = dangerouslySkipEscape(renderToString(page));
         }
         else {
             const disable = stream === false ? true : undefined;
-            pageView = await renderToStream(page, { userAgent: pageContext.userAgent, disable });
+            pageView = await renderToStream(page, {
+                userAgent: pageContext.headers?.['user-agent'] ||
+                    // Deprecated way of acccessing User Agent header. Eventually remove it.
+                    pageContext.userAgent,
+                disable
+            });
         }
     }
     const documentHtml = escapeInject `<!DOCTYPE html>
@@ -53,6 +56,8 @@ const onRenderHtml = async (pageContext) => {
     </html>`;
     return documentHtml;
 };
+// We don't need this anymore starting from vike@0.4.173 which added the `require` setting.
+// TODO/eventually: remove this once <=0.4.172 versions become rare.
 function checkVikeVersion() {
     if (version) {
         const versionParts = version.split('.').map((s) => parseInt(s, 10));
@@ -60,10 +65,11 @@ function checkVikeVersion() {
             return;
         if (versionParts[1] > 4)
             return;
-        if (versionParts[2] >= 147)
+        if (versionParts[2] >= 173)
             return;
     }
-    throw new Error('Update Vike to 0.4.147 or above');
+    // We can leave it 0.4.173 until we entirely remove checkVikeVersion() (because starting vike@0.4.173 we use the new `require` setting).
+    throw new Error('Update Vike to 0.4.173 or above');
 }
 // Used by:
 // - react-streaming (to improve error messages, see https://github.com/brillout/react-streaming/blob/70c168de1e97b9c4385a4c3002b5013f1e406341/src/utils/isVikeReactApp.ts#L4)

package/dist/types/Config.d.ts

@@ -1,7 +1,7 @@
-import type { PageContextClient } from 'vike/types';
+import type { ImportString, PageContextClient } from 'vike/types';
 declare global {
-    namespace VikePackages {
-        interface ConfigVikeReact {
+    namespace Vike {
+        interface Config {
             /** The page's root React component */
             Page?: () => React.ReactNode;
             /** React element rendered and appended into <head></head> */
@@ -21,9 +21,7 @@ declare global {
              *
              * https://vike.dev/Wrapper
              */
-            Wrapper?: (props: {
-                children: React.ReactNode;
-            }) => React.ReactNode;
+            Wrapper?: Wrapper | ImportString;
             /** <title>${title}</title> */
             title?: string;
             /** <link rel="icon" href="${favicon}" /> */
@@ -54,6 +52,12 @@ declare global {
              *
              */
             stream?: boolean;
+            /**
+             * Whether the existence of the React SSR stream is required (some integrations require it).
+             *
+             * HTML Streaming can still be disabled: the SSR stream is awaited and converted to a string.
+             */
+            streamIsRequired?: boolean;
             /**
              * Whether to use `<StrictMode>`.
              *
@@ -74,7 +78,13 @@ declare global {
              * https://vike.dev/onAfterRenderClient
              */
             onAfterRenderClient?: (pageContext: PageContextClient) => void;
-            VikeReactQueryWrapper?: React.ReactNode;
+        }
+        interface ConfigResolved {
+            Wrapper?: Wrapper[];
         }
     }
 }
+type Wrapper = (props: {
+    children: React.ReactNode;
+}) => React.ReactNode;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike-react",
-  "version": "0.4.11",
+  "version": "0.4.13",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -21,10 +21,10 @@
     "release:commit": "release-me commit"
   },
   "peerDependencies": {
-    "react": "18.x.x",
-    "react-dom": "18.x.x",
-    "vike": "^0.4.160",
-    "vite": "^4.3.8 || ^5.0.10"
+    "react": ">=18.0.0",
+    "react-dom": ">=18.0.0",
+    "vike": ">=0.4.173",
+    "vite": ">=4.3.8"
   },
   "devDependencies": {
     "@biomejs/biome": "^1.6.4",
@@ -36,7 +36,7 @@
     "react-dom": "^18.2.0",
     "rimraf": "^5.0.5",
     "typescript": "^5.3.3",
-    "vike": "^0.4.168"
+    "vike": "^0.4.173"
   },
   "dependencies": {
     "react-streaming": "^0.3.27"