vike-react 0.3.8 → 0.3.9

package/dist/renderer/+config.d.ts

@@ -36,6 +36,7 @@ declare const _default: {
         lang: {
             env: {
                 server: true;
+                client: true;
             };
         };
         ssr: {

package/dist/renderer/+config.js

@@ -29,7 +29,7 @@ export default {
     // be used by the renderers.
     // It is a cumulative config option, so a web app using vike-react can extend
     // this list.
-    passToClient: ['pageProps', 'title'],
+    passToClient: ['pageProps', 'title', 'lang'],
     clientRouting: true,
     hydrationCanBeAborted: true,
     meta: {
@@ -49,7 +49,7 @@ export default {
             env: { server: true }
         },
         lang: {
-            env: { server: true }
+            env: { server: true, client: true }
         },
         ssr: {
             env: { config: true },

package/dist/renderer/getLang.d.ts

@@ -0,0 +1,7 @@
+export { getLang };
+import type { PageContext } from 'vike/types';
+/**
+ * Get the page's lang if defined, either from the config, the additional data fetched by
+ * the page's data() and onBeforeRender() hooks or from other hooks.
+ */
+declare function getLang(pageContext: PageContext): null | string;

package/dist/renderer/getLang.js

@@ -0,0 +1,32 @@
+export { getLang };
+import { isCallable } from './utils/isCallable.js';
+/**
+ * Get the page's lang if defined, either from the config, the additional data fetched by
+ * the page's data() and onBeforeRender() hooks or from other hooks.
+ */
+function getLang(pageContext) {
+    // from onBeforeRoute() hook & other hooks, e.g. onPrerenderStart() hook
+    if (pageContext.lang !== undefined) {
+        return pageContext.lang;
+    }
+    const langConfig = pageContext.configEntries.lang?.[0];
+    if (!langConfig) {
+        return null;
+    }
+    const lang = langConfig.configValue;
+    if (typeof lang === 'string') {
+        return lang;
+    }
+    if (!lang) {
+        return null;
+    }
+    const { configDefinedAt } = langConfig;
+    if (isCallable(lang)) {
+        const val = lang(pageContext);
+        if (typeof val !== 'string') {
+            throw new Error(configDefinedAt + ' should return a string');
+        }
+        return val;
+    }
+    throw new Error(configDefinedAt + ' should be a string or a function returning a string');
+}

package/dist/renderer/onRenderClient.js

@@ -3,6 +3,7 @@ export { onRenderClient };
 import ReactDOM from 'react-dom/client';
 import { getTitle } from './getTitle.js';
 import { getPageElement } from './getPageElement.js';
+import { getLang } from './getLang.js';
 let root;
 const onRenderClient = async (pageContext) => {
     const page = getPageElement(pageContext);
@@ -23,7 +24,9 @@ const onRenderClient = async (pageContext) => {
             // previous page. It can even be null, in which case we should unset the
             // document title.
             const title = getTitle(pageContext);
+            const lang = getLang(pageContext) || 'en';
             document.title = title || '';
+            document.documentElement.lang = lang;
         }
         root.render(page);
     }

package/dist/renderer/onRenderHtml.js

@@ -7,14 +7,15 @@ import { getTitle } from './getTitle.js';
 import { getPageElement } from './getPageElement.js';
 import { PageContextProvider } from './PageContextProvider.js';
 import React from 'react';
+import { getLang } from './getLang.js';
 checkVikeVersion();
 const onRenderHtml = async (pageContext) => {
-    const lang = pageContext.config.lang || 'en';
     const { stream, favicon, description } = pageContext.config;
     const faviconTag = !favicon ? '' : escapeInject `<link rel="icon" href="${favicon}" />`;
     const descriptionTag = !description ? '' : escapeInject `<meta name="description" content="${description}" />`;
     const title = getTitle(pageContext);
     const titleTag = !title ? '' : escapeInject `<title>${title}</title>`;
+    const lang = getLang(pageContext) || 'en';
     const Head = pageContext.config.Head || (() => React.createElement(React.Fragment, null));
     const head = (React.createElement(React.StrictMode, null,
         React.createElement(PageContextProvider, { pageContext: pageContext },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike-react",
-  "version": "0.3.8",
+  "version": "0.3.9",
   "type": "module",
   "main": "./dist/renderer/+config.js",
   "types": "./dist/renderer/+config.d.ts",
@@ -22,20 +22,20 @@
     "react": "18.x.x",
     "react-dom": "18.x.x",
     "vike": "^0.4.151",
-    "vite": "^4.3.8"
+    "vite": "^4.3.8 || ^5.0.10"
   },
   "devDependencies": {
-    "@brillout/release-me": "^0.1.13",
-    "@types/node": "^18.19.3",
-    "@types/react": "^18.2.45",
+    "@brillout/release-me": "^0.1.14",
+    "@types/node": "^20.11.4",
+    "@types/react": "^18.2.48",
     "@types/react-dom": "^18.2.18",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^5.3.3",
-    "vike": "^0.4.151"
+    "vike": "^0.4.156"
   },
   "dependencies": {
-    "react-streaming": "^0.3.18"
+    "react-streaming": "^0.3.19"
   },
   "typesVersions": {
     "*": {