fix rebase

examples/zustand/pages/+config.h.ts

@@ -2,7 +2,7 @@ import type { Config } from 'vike/types'
 import Layout from '../layouts/LayoutDefault'
 import Head from '../layouts/HeadDefault'
 import logoUrl from '../assets/logo.svg'
-import vikeReact from 'vike-react'
+import vikeReact from 'vike-react/config'
 import vikeReactZustand from 'vike-react-zustand/config'
 
 // Default configs (can be overridden by pages)
@@ -11,8 +11,6 @@ export default {
   Head,
   // <title>
   title: 'My Vike + React App',
-  // <meta name="description">
-  description: 'Demo showcasing Vike + React',
   // <link rel="icon" href="${favicon}" />
   favicon: logoUrl,
   extends: [vikeReact, vikeReactZustand],

packages/vike-react/src/+config.ts

@@ -50,6 +50,9 @@ export default {
     VikeReactQueryWrapper: {
       env: { client: true, server: true }
     },
+    VikeReactZustandWrapper:{
+      env: { client: true, server: true }
+    },
     Wrapper: {
       env: { client: true, server: true }
     },

packages/vike-react/src/renderer/getPageElement.tsx

@@ -15,9 +15,6 @@ function getPageElement(pageContext: PageContext): JSX.Element {
     <React.StrictMode>
       <PageContextProvider pageContext={pageContext}>
         <VikeReactQueryWrapper pageContext={pageContext}>
-          <Wrapper>
-            <Layout>{Page ? <Page /> : null}</Layout>
-          </Wrapper>
           <VikeReactZustandWrapper pageContext={pageContext}>
             <Wrapper>
               <Layout>{Page ? <Page  /> : null}</Layout>

packages/vike-react/src/types/Config.ts

@@ -40,6 +40,7 @@ declare global {
       stream?: boolean
 
       VikeReactQueryWrapper?: React.ReactNode
+      VikeReactZustandWrapper?: React.ReactNode
 
       Wrapper?: () => React.ReactNode
     }