vike-react 0.4.13 → 0.4.15-commit-9c8eeea

package/README.md

@@ -1,5 +1,2 @@
-Source code of `vike-react`.
-
-See also:
-- Docs at [`vike.dev`](https://vike.dev) and [`vike.dev/vike-react`](https://vike.dev/vike-react)
-- [CHANGELOG.md](https://github.com/vikejs/vike-react/blob/main/packages/vike-react/CHANGELOG.md)
+Docs: [vike.dev/vike-react](https://vike.dev/vike-react)  
+Source code: [GitHub > vikejs/vike-react](https://github.com/vikejs/vike-react)

package/dist/+config.d.ts

@@ -21,6 +21,7 @@ declare const _default: {
                 server: true;
                 client: true;
             };
+            cumulative: true;
         };
         title: {
             env: {

package/dist/+config.js

@@ -5,7 +5,7 @@ import './types/index.js';
 export default {
     name: 'vike-react',
     require: {
-        vike: '>=0.4.173'
+        vike: '>=0.4.178'
     },
     // https://vike.dev/onRenderHtml
     onRenderHtml: 'import:vike-react/renderer/onRenderHtml:onRenderHtml',
@@ -24,7 +24,8 @@ export default {
             env: { server: true }
         },
         Layout: {
-            env: { server: true, client: true }
+            env: { server: true, client: true },
+            cumulative: true
         },
         title: {
             env: { server: true, client: true }

package/dist/renderer/getPageElement.js

@@ -2,11 +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 { Page } = pageContext;
-    let page = React.createElement(Layout, null, Page ? React.createElement(Page, null) : null);
-    (pageContext.config.Wrapper || []).forEach((Wrapper) => {
+    let page = Page ? React.createElement(Page, null) : null;
+    [
+        // Inner wrapping
+        ...(pageContext.config.Layout || []),
+        // Outer wrapping
+        ...(pageContext.config.Wrapper || [])
+    ].forEach((Wrapper) => {
         page = React.createElement(Wrapper, null, page);
     });
     page = React.createElement(PageContextProvider, { pageContext: pageContext }, page);
@@ -15,6 +18,3 @@ function getPageElement(pageContext) {
     }
     return page;
 }
-function PassThrough({ children }) {
-    return React.createElement(React.Fragment, null, children);
-}

package/dist/renderer/onRenderHtml.js

@@ -1,19 +1,19 @@
 // https://vike.dev/onRenderHtml
 export { onRenderHtml };
+import React from 'react';
 import { renderToString } from 'react-dom/server';
 import { renderToStream } from 'react-streaming/server';
-import { escapeInject, dangerouslySkipEscape, version } from 'vike/server';
+import { dangerouslySkipEscape, escapeInject, version } from 'vike/server';
+import { PageContextProvider } from '../hooks/usePageContext.js';
 import { getHeadSetting } from './getHeadSetting.js';
 import { getPageElement } from './getPageElement.js';
-import { PageContextProvider } from '../hooks/usePageContext.js';
-import React from 'react';
 checkVikeVersion();
 addEcosystemStamp();
 const onRenderHtml = async (pageContext) => {
     const title = getHeadSetting('title', pageContext);
     const favicon = getHeadSetting('favicon', pageContext);
     const lang = getHeadSetting('lang', pageContext) || 'en';
-    const titleTag = !title ? '' : escapeInject `<title>${title}</title>`;
+    const titleTags = !title ? '' : escapeInject `<title>${title}</title><meta property="og:title" content="${title}" />`;
     const faviconTag = !favicon ? '' : escapeInject `<link rel="icon" href="${favicon}" />`;
     const Head = pageContext.config.Head || (() => React.createElement(React.Fragment, null));
     let head = (React.createElement(PageContextProvider, { pageContext: pageContext },
@@ -35,6 +35,7 @@ const onRenderHtml = async (pageContext) => {
         else {
             const disable = stream === false ? true : undefined;
             pageView = await renderToStream(page, {
+                webStream: typeof stream === 'string' ? stream === 'web' : undefined,
                 userAgent: pageContext.headers?.['user-agent'] ||
                     // Deprecated way of acccessing User Agent header. Eventually remove it.
                     pageContext.userAgent,
@@ -46,7 +47,7 @@ const onRenderHtml = async (pageContext) => {
     <html lang='${lang}'>
       <head>
         <meta charset="UTF-8" />
-        ${titleTag}
+        ${titleTags}
         ${headHtml}
         ${faviconTag}
       </head>

package/dist/types/Config.d.ts

@@ -9,13 +9,11 @@ declare global {
             /**
              * A component that defines the visual layout of the page common to several pages.
              *
-             * Technically: the `<Layou>` component wraps the root component `<Page>`.
+             * Technically: the `<Layout>` component wraps the root component `<Page>`.
              *
              * https://vike.dev/Layout
              */
-            Layout?: (props: {
-                children: React.ReactNode;
-            }) => React.ReactNode;
+            Layout?: Layout;
             /**
              * A component wrapping the the root component `<Page>`.
              *
@@ -44,14 +42,20 @@ declare global {
              */
             ssr?: boolean;
             /**
-             * Whether to stream the page's HTML. Requires Server-Side Rendering (`ssr: true`).
+             * Whether to stream the page's HTML.
+             *
+             * Requires Server-Side Rendering (`ssr: true`).
+             *
+             * A Node.js Stream is used whenever possible, falling back to a Web Stream otherwise.
+             *
+             * By setting the value to `web` or `node`, you force the usage of a Web Stream or Node.js Stream.
              *
              * @default false
              *
              * https://vike.dev/stream
              *
              */
-            stream?: boolean;
+            stream?: boolean | 'node' | 'web';
             /**
              * Whether the existence of the React SSR stream is required (some integrations require it).
              *
@@ -81,10 +85,12 @@ declare global {
         }
         interface ConfigResolved {
             Wrapper?: Wrapper[];
+            Layout?: Layout[];
         }
     }
 }
 type Wrapper = (props: {
     children: React.ReactNode;
 }) => React.ReactNode;
+type Layout = Wrapper;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike-react",
-  "version": "0.4.13",
+  "version": "0.4.15-commit-9c8eeea",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -23,7 +23,7 @@
   "peerDependencies": {
     "react": ">=18.0.0",
     "react-dom": ">=18.0.0",
-    "vike": ">=0.4.173",
+    "vike": ">=0.4.178",
     "vite": ">=4.3.8"
   },
   "devDependencies": {
@@ -36,10 +36,10 @@
     "react-dom": "^18.2.0",
     "rimraf": "^5.0.5",
     "typescript": "^5.3.3",
-    "vike": "^0.4.173"
+    "vike": "^0.4.178"
   },
   "dependencies": {
-    "react-streaming": "^0.3.27"
+    "react-streaming": "^0.3.36"
   },
   "typesVersions": {
     "*": {