Merge pull request #160 from vikejs/brillout/dev

fix: stop overriding Wrapper meta

examples/apollo/package.json

@@ -11,7 +11,7 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "typescript": "^5.3.3",
-    "vike": "^0.4.203",
+    "vike": "^0.4.211",
     "vike-react": "^0.5.11",
     "vike-react-apollo": "^0.1.1",
     "@apollo/client": "^3.10.8",

examples/full/package.json

@@ -13,7 +13,7 @@
     "react-dom": "^18.3.1",
     "react-streaming": "^0.3.43",
     "typescript": "^5.5.4",
-    "vike": "^0.4.203",
+    "vike": "^0.4.211",
     "vike-react": "^0.5.11",
     "vite": "^5.4.0"
   },

examples/react-query/package.json

@@ -10,7 +10,7 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "typescript": "^5.5.3",
-    "vike": "^0.4.203",
+    "vike": "^0.4.211",
     "vike-react": "^0.5.11",
     "vike-react-query": "^0.1.3",
     "@tanstack/react-query": "^5.20.1",

packages/vike-react-antd/Wrapper.tsx → packages/vike-react-antd/Wrapper.server.tsx

@@ -7,14 +7,13 @@ import { usePageContext } from 'vike-react/usePageContext'
 function Wrapper({ children }: { children: ReactNode }) {
   const pageContext = usePageContext()
   const { antd } = pageContext.config
-  const cache = 'antd' in pageContext ? pageContext.antd?.cache : undefined
 
-  if (antd === null || !cache) {
+  if (antd === null) {
     return <>{children}</>
   }
 
   return (
-    <StyleProvider cache={cache} {...antd}>
+    <StyleProvider cache={pageContext.antd!.cache} {...antd}>
       {children}
     </StyleProvider>
   )

packages/vike-react-antd/config.ts

@@ -6,16 +6,13 @@ import type { Config } from 'vike/types'
 const config = {
   name: 'vike-react-antd',
   require: {
-    vike: '>=0.4.203',
+    vike: '>=0.4.211',
     'vike-react': '>=0.4.13',
   },
   onAfterRenderHtml: 'import:vike-react-antd/__internal/onAfterRenderHtml:onAfterRenderHtml',
   onBeforeRenderHtml: 'import:vike-react-antd/__internal/onBeforeRenderHtml:onBeforeRenderHtml',
   Wrapper: 'import:vike-react-antd/__internal/Wrapper:Wrapper',
   meta: {
-    Wrapper: {
-      env: { server: true },
-    },
     antd: {
       env: {
         server: true,

packages/vike-react-antd/package.json

@@ -6,7 +6,7 @@
     "./config": "./dist/config.js",
     "./__internal/onAfterRenderHtml": "./dist/onAfterRenderHtml.js",
     "./__internal/onBeforeRenderHtml": "./dist/onBeforeRenderHtml.js",
-    "./__internal/Wrapper": "./dist/Wrapper.js"
+    "./__internal/Wrapper": "./dist/Wrapper.server.js"
   },
   "scripts": {
     "dev": "tsc --watch",
@@ -30,7 +30,7 @@
     "react": "^18.3.1",
     "rimraf": "^5.0.5",
     "typescript": "^5.5.3",
-    "vike": "^0.4.203",
+    "vike": "^0.4.211",
     "vike-react": "^0.5.11",
     "vite": "^5.4.0"
   },
@@ -46,7 +46,7 @@
         "dist/onBeforeRenderHtml.d.ts"
       ],
       "__internal/Wrapper": [
-        "dist/Wrapper.d.ts"
+        "dist/Wrapper.server.d.ts"
       ]
     }
   },

packages/vike-react-apollo/package.json

@@ -38,7 +38,7 @@
     "react-streaming": "^0.3.43",
     "rimraf": "^5.0.5",
     "typescript": "^5.3.3",
-    "vike": "^0.4.203",
+    "vike": "^0.4.211",
     "vike-react": "^0.5.11",
     "vite": "^5.4.0"
   },

packages/vike-react-chakra/package.json

@@ -28,7 +28,7 @@
     "react": "^18.3.1",
     "rimraf": "^5.0.5",
     "typescript": "^5.5.3",
-    "vike": "^0.4.203",
+    "vike": "^0.4.211",
     "vike-react": "^0.5.11",
     "vite": "^5.4.0"
   },

packages/vike-react-query/package.json

@@ -35,7 +35,7 @@
     "react-streaming": "^0.3.43",
     "rimraf": "^5.0.5",
     "typescript": "^5.5.3",
-    "vike": "^0.4.203",
+    "vike": "^0.4.211",
     "vike-react": "^0.5.11",
     "vite": "^5.4.0",
     "vitest": "^1.2.2"

packages/vike-react-styled-components/Wrapper.tsx → packages/vike-react-styled-components/Wrapper.server.tsx

@@ -7,14 +7,13 @@ import { usePageContext } from 'vike-react/usePageContext'
 function Wrapper({ children }: { children: ReactNode }) {
   const pageContext = usePageContext()
   const { styledComponents } = pageContext.config
-  const sheet = 'styledComponents' in pageContext ? pageContext.styledComponents?.sheet : undefined
 
-  if (styledComponents === null || !sheet) {
+  if (styledComponents === null) {
     return <>{children}</>
   }
 
   return (
-    <StyleSheetManager sheet={sheet.instance} {...styledComponents?.styleSheetManager}>
+    <StyleSheetManager sheet={pageContext.styledComponents!.sheet?.instance} {...styledComponents?.styleSheetManager}>
       {children}
     </StyleSheetManager>
   )

packages/vike-react-styled-components/config.ts

@@ -6,16 +6,13 @@ import type { Config } from 'vike/types'
 const config = {
   name: 'vike-react-styled-components',
   require: {
-    vike: '>=0.4.203',
+    vike: '>=0.4.211',
     'vike-react': '>=0.4.13',
   },
   onAfterRenderHtml: 'import:vike-react-styled-components/__internal/onAfterRenderHtml:onAfterRenderHtml',
   onBeforeRenderHtml: 'import:vike-react-styled-components/__internal/onBeforeRenderHtml:onBeforeRenderHtml',
   Wrapper: 'import:vike-react-styled-components/__internal/Wrapper:Wrapper',
   meta: {
-    Wrapper: {
-      env: { server: true },
-    },
     styledComponents: {
       env: {
         server: true,

packages/vike-react-styled-components/package.json

@@ -6,7 +6,7 @@
     "./config": "./dist/config.js",
     "./__internal/onAfterRenderHtml": "./dist/onAfterRenderHtml.js",
     "./__internal/onBeforeRenderHtml": "./dist/onBeforeRenderHtml.js",
-    "./__internal/Wrapper": "./dist/Wrapper.js"
+    "./__internal/Wrapper": "./dist/Wrapper.server.js"
   },
   "scripts": {
     "dev": "tsc --watch",
@@ -28,7 +28,7 @@
     "rimraf": "^5.0.5",
     "styled-components": "^6.1.13",
     "typescript": "^5.5.3",
-    "vike": "^0.4.203",
+    "vike": "^0.4.211",
     "vike-react": "^0.5.11",
     "vite": "^5.4.0"
   },
@@ -44,7 +44,7 @@
         "dist/onBeforeRenderHtml.d.ts"
       ],
       "__internal/Wrapper": [
-        "dist/Wrapper.d.ts"
+        "dist/Wrapper.server.d.ts"
       ]
     }
   },

packages/vike-react-styled-jsx/Wrapper.tsx → packages/vike-react-styled-jsx/Wrapper.server.tsx

@@ -7,11 +7,10 @@ import { usePageContext } from 'vike-react/usePageContext'
 function Wrapper({ children }: { children: ReactNode }) {
   const pageContext = usePageContext()
   const { styledJsx } = pageContext.config
-  const registry = 'styledJsx' in pageContext ? pageContext.styledJsx?.registry : undefined
 
-  if (styledJsx === null || !registry) {
+  if (styledJsx === null) {
     return <>{children}</>
   }
 
-  return <StyleRegistry registry={registry}>{children}</StyleRegistry>
+  return <StyleRegistry registry={pageContext.styledJsx!.registry}>{children}</StyleRegistry>
 }

packages/vike-react-styled-jsx/config.ts

@@ -6,7 +6,7 @@ import type { StyledJsxStyleRegistry } from 'styled-jsx'
 const config = {
   name: 'vike-react-styled-jsx',
   require: {
-    vike: '>=0.4.203',
+    vike: '>=0.4.211',
     'vike-react': '>=0.4.13',
   },
   onBeforeRenderHtml: 'import:vike-react-styled-jsx/__internal/onBeforeRenderHtml:onBeforeRenderHtml',
@@ -16,9 +16,6 @@ const config = {
     styledJsx: {
       env: { server: true },
     },
-    Wrapper: {
-      env: { server: true },
-    },
   },
 } satisfies Config
 

packages/vike-react-styled-jsx/package.json

@@ -6,7 +6,7 @@
     "./config": "./dist/config.js",
     "./__internal/onAfterRenderHtml": "./dist/onAfterRenderHtml.js",
     "./__internal/onBeforeRenderHtml": "./dist/onBeforeRenderHtml.js",
-    "./__internal/Wrapper": "./dist/Wrapper.js"
+    "./__internal/Wrapper": "./dist/Wrapper.server.js"
   },
   "scripts": {
     "dev": "tsc --watch",
@@ -28,7 +28,7 @@
     "rimraf": "^5.0.5",
     "styled-jsx": "^5.1.6",
     "typescript": "^5.5.3",
-    "vike": "^0.4.203",
+    "vike": "^0.4.211",
     "vike-react": "^0.5.11",
     "vite": "^5.4.0"
   },
@@ -44,7 +44,7 @@
         "dist/onBeforeRenderHtml.d.ts"
       ],
       "__internal/Wrapper": [
-        "dist/Wrapper.d.ts"
+        "dist/Wrapper.server.d.ts"
       ]
     }
   },

packages/vike-react/package.json

@@ -53,7 +53,7 @@
     "react-streaming": "^0.3.43",
     "rimraf": "^5.0.5",
     "typescript": "^5.5.4",
-    "vike": "^0.4.203",
+    "vike": "^0.4.211",
     "vite": "^5.4.0"
   },
   "typesVersions": {