minor refactor

packages/vike-react-redux/Wrapper.tsx

@@ -7,16 +7,15 @@ import type { Store } from '@reduxjs/toolkit'
 
 function Wrapper({ children }: { children: React.ReactNode }) {
   const pageContext = usePageContext()
-  const { redux } = pageContext.config
   const storeRef = useRef<Store>()
 
-  if (!redux?.store) {
+  if (!pageContext.config.redux) {
     return <>{children}</>
   }
 
   if (!storeRef.current) {
-    storeRef.current = redux.store
+    storeRef.current = pageContext.reduxStore
   }
 
-  return <Provider store={storeRef.current}>{children}</Provider>
+  return <Provider store={storeRef.current!}>{children}</Provider>
 }

packages/vike-react-redux/config.ts

@@ -9,7 +9,7 @@ const config = {
     vike: '>=0.4.211',
     'vike-react': '>=0.4.13',
   },
-  passToClient: ['redux'],
+  passToClient: ['reduxState'],
   onAfterRenderHtml: 'import:vike-react-redux/__internal/onAfterRenderHtml:onAfterRenderHtml',
   onBeforeRenderHtml: 'import:vike-react-redux/__internal/onBeforeRenderHtml:onBeforeRenderHtml',
   onBeforeRenderClient: 'import:vike-react-redux/__internal/onBeforeRenderClient:onBeforeRenderClient',
@@ -24,14 +24,12 @@ const config = {
 declare global {
   namespace Vike {
     interface PageContext {
-      redux?: {
-        state?: unknown
-      }
+      reduxStore?: Store
+      reduxState?: unknown
     }
     interface Config {
       redux?: null | {
         createStore?: (preloadedState?: any) => Store
-        store?: Store
       }
     }
   }

packages/vike-react-redux/onAfterRenderHtml.ts

@@ -3,10 +3,8 @@ export { onAfterRenderHtml }
 import type { PageContext } from 'vike/types'
 
 function onAfterRenderHtml(pageContext: PageContext) {
-  const store = pageContext.config.redux?.store
-  if (store) {
-    pageContext.redux ??= {
-      state: store.getState(),
-    }
+  const { reduxStore } = pageContext
+  if (reduxStore) {
+    pageContext.reduxState = reduxStore.getState()
   }
 }

packages/vike-react-redux/onBeforeRenderClient.ts

@@ -6,7 +6,7 @@ function onBeforeRenderClient(pageContext: PageContext) {
   if (pageContext.config.redux) {
     const { createStore } = pageContext.config.redux
     if (createStore) {
-      pageContext.config.redux.store = createStore(pageContext.redux?.state)
+      pageContext.reduxStore = createStore(pageContext.reduxState)
     }
   }
 }

packages/vike-react-redux/onBeforeRenderHtml.ts

@@ -6,7 +6,7 @@ function onBeforeRenderHtml(pageContext: PageContext) {
   if (pageContext.config.redux) {
     const { createStore } = pageContext.config.redux
     if (createStore) {
-      pageContext.config.redux.store = createStore()
+      pageContext.reduxStore = createStore()
     }
   }
 }

packages/vike-react-redux/package.json

@@ -23,17 +23,26 @@
       "react": ">=18",
       "vike-react": ">=0.4.13"
     },
+    "peerDependenciesMeta": {
+      "@reduxjs/toolkit": {
+        "optional": true
+      },
+      "react-redux": {
+        "optional": true
+      }
+    },
+    "dependencies": {
+      "@reduxjs/toolkit": "^2.5.0",
+      "react-redux": "^9.2.0"
+    },
     "devDependencies": {
       "@brillout/release-me": "^0.4.2",
-      "@reduxjs/toolkit": "^2.5.0",
       "@types/react": "^18.2.55",
       "react": "^18.3.1",
-      "react-redux": "^9.2.0",
       "rimraf": "^5.0.5",
       "typescript": "^5.5.3",
       "vike": "^0.4.211",
-      "vike-react": "^0.5.12",
-      "vite": "^5.4.0"
+      "vike-react": "^0.5.12"
     },
     "typesVersions": {
       "*": {