fix: use latest version of the Vike V1 design

vikejs · Nov 17, 2023 · a446524 · a446524
1 parent 22d01f3
commit a446524
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 25 deletions.
diff --git a/examples/basic/package.json b/examples/basic/package.json
@@ -11,7 +11,7 @@
     "node-fetch": "^3.3.2",
     "solid-js": "^1.7.11",
     "vike-solid": "workspace:*",
-    "vike": "^0.4.144"
+    "vike": "^0.4.147"
   },
   "devDependencies": {
     "typescript": "^5.1.6"

diff --git a/examples/ssr-spa/package.json b/examples/ssr-spa/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "solid-js": "^1.7.11",
     "vike-solid": "workspace:*",
-    "vike": "^0.4.144"
+    "vike": "^0.4.147"
   },
   "devDependencies": {
     "typescript": "^5.1.6"

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/vike-solid/package.json b/vike-solid/package.json
@@ -20,7 +20,7 @@
   "peerDependencies": {
     "solid-js": "^1.8.5",
     "vite": "^4.5.0",
-    "vike": "^0.4.144"
+    "vike": "^0.4.147"
   },
   "devDependencies": {
     "@babel/core": "^7.23.3",
@@ -37,7 +37,7 @@
     "tslib": "^2.6.2",
     "typescript": "^5.2.2",
     "vite": "^4.5.0",
-    "vike": "^0.4.144"
+    "vike": "^0.4.147"
   },
   "typesVersions": {
     "*": {

diff --git a/vike-solid/renderer/+config.ts b/vike-solid/renderer/+config.ts
@@ -19,8 +19,8 @@ const toggleSsrRelatedConfig: ConfigEffect = ({
       // accessible only in the client's renderer.
       Page: {
         env: configValue
-          ? "server-and-client" // default
-          : "client-only",
+          ? { server: true, client: true } // default
+          : { client: true },
       },
     },
   };
@@ -42,25 +42,25 @@ export default {
   hydrationCanBeAborted: true,
   meta: {
     Head: {
-      env: "server-only",
+      env: { server: true },
     },
     Layout: {
-      env: "server-and-client",
+      env: { server: true, client: true },
     },
     title: {
-      env: "server-and-client",
+      env: { server: true, client: true },
     },
     description: {
-      env: "server-only",
+      env: { server: true },
     },
     favicon: {
-      env: "server-only",
+      env: { server: true },
     },
     lang: {
-      env: "server-only",
+      env: { server: true },
     },
     ssr: {
-      env: "config-only",
+      env: { config: true },
       effect: toggleSsrRelatedConfig,
     },
   },

diff --git a/vike-solid/renderer/+onRenderHtml.tsx b/vike-solid/renderer/+onRenderHtml.tsx
@@ -6,12 +6,14 @@ import {
   renderToStream,
   renderToString,
 } from "solid-js/web";
-import { dangerouslySkipEscape, escapeInject, stampPipe } from "vike/server";
+import { dangerouslySkipEscape, escapeInject, stampPipe, version } from "vike/server";
 import { getTitle } from "./getTitle";
 import { getPageElement } from "./getPageElement";
 import type { OnRenderHtmlAsync } from "vike/types";
 import { PageContextProvider } from "./PageContextProvider";
 
+checkVikeVersion()
+
 const onRenderHtml: OnRenderHtmlAsync = async (
   pageContext
 ): ReturnType<OnRenderHtmlAsync> => {
@@ -63,3 +65,13 @@ const onRenderHtml: OnRenderHtmlAsync = async (
 
   return documentHtml;
 };
+
+function checkVikeVersion() {
+  if (version) {
+    const versionParts = version.split('.').map((s) => parseInt(s, 10)) as [number, number, number]
+    if (versionParts[0] > 0) return
+    if (versionParts[1] > 4) return
+    if (versionParts[2] >= 147) return
+  }
+  throw new Error('Update Vike to its latest version (or [email protected] and any version above)')
+}