npm - vike-react - Versions diffs - 0.5.0 → 0.5.2-commit-c9911b5 - Mend

vike-react 0.5.0 → 0.5.2-commit-c9911b5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (25) hide show

package/dist/+config.d.ts +3 -10
package/dist/+config.js +6 -11
package/dist/components/Head/Head-client.d.ts +1 -11
package/dist/components/Head/Head-client.js +2 -13
package/dist/components/Head/Head-server.js +0 -1
package/dist/hooks/useConfig/useConfig-client.d.ts +2 -7
package/dist/hooks/useConfig/useConfig-client.js +8 -21
package/dist/hooks/useConfig/useConfig-server.d.ts +5 -3
package/dist/hooks/useConfig/useConfig-server.js +29 -29
package/dist/renderer/getHeadSetting.d.ts +4 -2
package/dist/renderer/getHeadSetting.js +7 -18
package/dist/renderer/onRenderClient.d.ts +2 -2
package/dist/renderer/onRenderClient.js +6 -5
package/dist/renderer/onRenderHtml.js +11 -27
package/dist/types/Config.d.ts +31 -26
package/dist/types/PageContext.d.ts +1 -2
package/dist/utils/callCumulativeHooks.d.ts +1 -0
package/dist/utils/callCumulativeHooks.js +16 -0
package/dist/utils/includes.d.ts +2 -0
package/dist/utils/includes.js +10 -0
package/dist/utils/objectKeys.d.ts +2 -0
package/dist/utils/objectKeys.js +6 -0
package/package.json +16 -15
package/dist/hooks/useConfig/shared.d.ts +0 -3
package/dist/hooks/useConfig/shared.js +0 -1

package/dist/+config.d.ts CHANGED Viewed

@@ -16,6 +16,7 @@ declare const _default: {
             env: {
                 server: true;
             };
+            cumulative: true;
         };
         Layout: {
             env: {
@@ -91,11 +92,13 @@ declare const _default: {
             env: {
                 client: true;
             };
+            cumulative: true;
         };
         onAfterRenderClient: {
             env: {
                 client: true;
             };
+            cumulative: true;
         };
         Wrapper: {
             cumulative: true;
@@ -104,16 +107,6 @@ declare const _default: {
                 server: true;
             };
         };
-        name: {
-            env: {
-                config: true;
-            };
-        };
-        require: {
-            env: {
-                config: true;
-            };
-        };
         reactStrictMode: {
             env: {
                 client: true;

package/dist/+config.js CHANGED Viewed

@@ -23,7 +23,8 @@ export default {
     // https://vike.dev/meta
     meta: {
         Head: {
-            env: { server: true }
+            env: { server: true },
+            cumulative: true
         },
         Layout: {
             env: { server: true, client: true },
@@ -69,23 +70,17 @@ export default {
             env: { server: true }
         },
         onBeforeRenderClient: {
-            env: { client: true }
+            env: { client: true },
+            cumulative: true
         },
         onAfterRenderClient: {
-            env: { client: true }
+            env: { client: true },
+            cumulative: true
         },
         Wrapper: {
             cumulative: true,
             env: { client: true, server: true }
         },
-        // Vike already defines the setting 'name', but we redundantly define it here for older Vike versions (otherwise older Vike versions will complain that 'name` is an unknown config). TODO/eventually: remove this once <=0.4.172 versions become rare (also because we use the `require` setting starting from `0.4.173`).
-        name: {
-            env: { config: true }
-        },
-        // Vike already defines the setting 'require', but we redundantly define it here for older Vike versions (otherwise older Vike versions will complain that 'require` is an unknown config). TODO/eventually: remove this once <=0.4.172 versions become rare (also because we use the `require` setting starting from `0.4.173`).
-        require: {
-            env: { config: true }
-        },
         reactStrictMode: {
             env: { client: true, server: true }
         },

package/dist/components/Head/Head-client.d.ts CHANGED Viewed

@@ -1,11 +1 @@
-export { Head };
-/**
- * Add arbitrary `<head>` tags.
- *
- * (The children are teleported to `<head>`.)
- *
- * https://vike.dev/Head
- */
-declare function Head({ children }: {
-    children: React.ReactNode;
-}): null;
+export declare function Head(): null;

package/dist/components/Head/Head-client.js CHANGED Viewed

@@ -1,15 +1,4 @@
-export { Head };
-// Same as ./Head-server.ts but importing useConfig-client.js
-import { useConfig } from '../../hooks/useConfig/useConfig-client.js';
-/**
- * Add arbitrary `<head>` tags.
- *
- * (The children are teleported to `<head>`.)
- *
- * https://vike.dev/Head
- */
-function Head({ children }) {
-    const config = useConfig();
-    config({ Head: children });
+// https://vike.dev/Head#only-html
+export function Head() {
     return null;
 }

package/dist/components/Head/Head-server.js CHANGED Viewed

@@ -1,5 +1,4 @@
 export { Head };
-// Same as ./Head-client.ts but importing useConfig-server.js
 import { useConfig } from '../../hooks/useConfig/useConfig-server.js';
 /**
  * Add arbitrary `<head>` tags.

package/dist/hooks/useConfig/useConfig-client.d.ts CHANGED Viewed

@@ -1,8 +1,3 @@
 export { useConfig };
-import type { ConfigSetter } from './shared.js';
-/**
- * Set configurations inside React components and Vike hooks.
- *
- * https://vike.dev/useConfig
- */
-declare function useConfig(): ConfigSetter;
+import type { ConfigFromHook } from '../../types/Config.js';
+declare function useConfig(): (config: ConfigFromHook) => void;

package/dist/hooks/useConfig/useConfig-client.js CHANGED Viewed

@@ -1,41 +1,28 @@
 export { useConfig };
 import { usePageContext } from '../usePageContext.js';
 import { getPageContext } from 'vike/getPageContext';
-/**
- * Set configurations inside React components and Vike hooks.
- *
- * https://vike.dev/useConfig
- */
 function useConfig() {
-    const configSetter = (config) => setConfigOverPageContext(config, pageContext);
     // Vike hook
     let pageContext = getPageContext();
     if (pageContext)
-        return configSetter;
-    // React component
+        return (config) => setPageContextConfigFromHook(config, pageContext);
+    // Component
     pageContext = usePageContext();
     return (config) => {
         if (!('_headAlreadySet' in pageContext)) {
-            configSetter(config);
+            setPageContextConfigFromHook(config, pageContext);
         }
         else {
-            sideEffect(config);
+            apply(config);
         }
     };
 }
-const configsClientSide = ['title'];
-function setConfigOverPageContext(config, pageContext) {
+function setPageContextConfigFromHook(config, pageContext) {
     pageContext._configFromHook ?? (pageContext._configFromHook = {});
-    configsClientSide.forEach((configName) => {
-        const configValue = config[configName];
-        if (!configValue)
-            return;
-        pageContext._configFromHook[configName] = configValue;
-    });
+    Object.assign(pageContext._configFromHook, config);
 }
-function sideEffect(config) {
+function apply(config) {
     const { title } = config;
-    if (title) {
+    if (title)
         window.document.title = title;
-    }
 }

package/dist/hooks/useConfig/useConfig-server.d.ts CHANGED Viewed

@@ -1,8 +1,10 @@
 export { useConfig };
-import type { ConfigSetter } from './shared.js';
+export type ConfigFromHookCumulative = (typeof configsCumulative)[number];
+import type { ConfigFromHook } from '../../types/Config.js';
 /**
- * Set configurations inside React components and Vike hooks.
+ * Set configurations inside components and Vike hooks.
  *
  * https://vike.dev/useConfig
  */
-declare function useConfig(): ConfigSetter;
+declare function useConfig(): (config: ConfigFromHook) => void;
+declare const configsCumulative: readonly ["Head", "bodyAttributes", "htmlAttributes"];

package/dist/hooks/useConfig/useConfig-server.js CHANGED Viewed

@@ -2,58 +2,58 @@ export { useConfig };
 import { usePageContext } from '../usePageContext.js';
 import { getPageContext } from 'vike/getPageContext';
 import { useStream } from 'react-streaming';
+import { objectKeys } from '../../utils/objectKeys.js';
+import { includes } from '../../utils/includes.js';
 /**
- * Set configurations inside React components and Vike hooks.
+ * Set configurations inside components and Vike hooks.
  *
  * https://vike.dev/useConfig
  */
 function useConfig() {
-    const configSetter = (config) => setConfigOverPageContext(config, pageContext);
     // Vike hook
     let pageContext = getPageContext();
     if (pageContext)
-        return configSetter;
-    // React component
+        return (config) => setPageContextConfigFromHook(config, pageContext);
+    // Component
     pageContext = usePageContext();
     const stream = useStream();
     return (config) => {
         if (!pageContext._headAlreadySet) {
-            configSetter(config);
+            setPageContextConfigFromHook(config, pageContext);
         }
         else {
             // <head> already sent to the browser => send DOM-manipulating scripts during HTML streaming
-            sideEffect(config, stream);
+            apply(config, stream);
         }
     };
 }
-const configsHtmlOnly = ['Head', 'description', 'image'];
-const configsCumulative = ['Head'];
-const configsOverridable = ['title', 'description', 'image'];
-function setConfigOverPageContext(config, pageContext) {
+const configsClientSide = ['title'];
+const configsCumulative = ['Head', 'bodyAttributes', 'htmlAttributes'];
+function setPageContextConfigFromHook(config, pageContext) {
     pageContext._configFromHook ?? (pageContext._configFromHook = {});
-    if (pageContext.isClientSideNavigation) {
-        // Remove HTML only configs which the client-side doesn't need (also avoiding serialization errors)
-        for (const configName of configsHtmlOnly)
-            delete config[configName];
-    }
-    // Cumulative values
-    configsCumulative.forEach((configName) => {
+    objectKeys(config).forEach((configName) => {
         var _a;
-        const configValue = config[configName];
-        if (!configValue)
-            return;
-        (_a = pageContext._configFromHook)[configName] ?? (_a[configName] = []);
-        pageContext._configFromHook[configName].push(configValue);
-    });
-    // Overridable values
-    configsOverridable.forEach((configName) => {
-        const configValue = config[configName];
-        if (!configValue)
+        // Skip HTML only configs which the client-side doesn't need, saving KBs sent to the client as well as avoiding serialization errors.
+        if (pageContext.isClientSideNavigation && !configsClientSide.includes(configName))
             return;
-        pageContext._configFromHook[configName] = configValue;
+        if (!includes(configsCumulative, configName)) {
+            // Overridable config
+            const configValue = config[configName];
+            if (configValue === undefined)
+                return;
+            pageContext._configFromHook[configName] = configValue;
+        }
+        else {
+            // Cumulative config
+            const configValue = config[configName];
+            if (!configValue)
+                return;
+            (_a = pageContext._configFromHook)[configName] ?? (_a[configName] = []);
+            pageContext._configFromHook[configName].push(configValue);
+        }
     });
 }
-function sideEffect(config, stream) {
+function apply(config, stream) {
     const { title } = config;
     if (title) {
         const htmlSnippet = `<script>document.title = ${JSON.stringify(title)}</script>`;

package/dist/renderer/getHeadSetting.d.ts CHANGED Viewed

@@ -1,4 +1,6 @@
 export { getHeadSetting };
+import type { PageContext } from 'vike/types';
 import type { PageContextInternal } from '../types/PageContext.js';
-type HeadSetting = 'favicon' | 'lang' | 'title' | 'description' | 'image';
-declare function getHeadSetting(headSetting: HeadSetting, pageContext: PageContextInternal): undefined | null | string;
+import type { ConfigFromHookResolved } from '../types/Config.js';
+type HeadSetting = Exclude<keyof ConfigFromHookResolved, 'Head'>;
+declare function getHeadSetting<T>(headSetting: HeadSetting, pageContext: PageContext & PageContextInternal): undefined | T;

package/dist/renderer/getHeadSetting.js CHANGED Viewed

@@ -1,27 +1,16 @@
 export { getHeadSetting };
 import { isCallable } from '../utils/isCallable.js';
 function getHeadSetting(headSetting, pageContext) {
+    // Set by useConfig()
     {
         const val = pageContext._configFromHook?.[headSetting];
         if (val !== undefined)
             return val;
     }
-    const config = pageContext.configEntries[headSetting]?.[0];
-    if (!config)
-        return undefined;
-    const val = config.configValue;
-    if (typeof val === 'string')
-        return val;
-    if (!val)
-        return null;
-    if (isCallable(val)) {
-        const valStr = val(pageContext);
-        if (typeof valStr !== 'string') {
-            throw new Error(config.configDefinedAt + ' should return a string');
-        }
-        return valStr;
-    }
-    else {
-        throw new Error(config.configDefinedAt + ' should be a string or a function returning a string');
-    }
+    // Set by +configName.js
+    const getCallable = (val) => (isCallable(val) ? val() : val);
+    const val = pageContext.config[headSetting];
+    if (Array.isArray(val))
+        return val.map(getCallable); // cumulative configs
+    return getCallable(val);
 }

package/dist/renderer/onRenderClient.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
 export { onRenderClient };
-import type { OnRenderClientSync } from 'vike/types';
+import type { OnRenderClientAsync } from 'vike/types';
 import './styles.css';
-declare const onRenderClient: OnRenderClientSync;
+declare const onRenderClient: OnRenderClientAsync;

package/dist/renderer/onRenderClient.js CHANGED Viewed

@@ -4,11 +4,12 @@ import ReactDOM from 'react-dom/client';
 import { getHeadSetting } from './getHeadSetting.js';
 import { getPageElement } from './getPageElement.js';
 import './styles.css';
+import { callCumulativeHooks } from '../utils/callCumulativeHooks.js';
 let root;
-const onRenderClient = (pageContext) => {
+const onRenderClient = async (pageContext) => {
     // Use case:
     // - Store hydration https://github.com/vikejs/vike-react/issues/110
-    pageContext.config.onBeforeRenderClient?.(pageContext);
+    await callCumulativeHooks(pageContext.config.onBeforeRenderClient, pageContext);
     const page = getPageElement(pageContext);
     pageContext.page = page;
     // TODO: implement this? So that, upon errors, onRenderClient() throws an error and Vike can render the error. As of April 2024 it isn't released yet.
@@ -41,18 +42,18 @@ const onRenderClient = (pageContext) => {
         updateDocument(pageContext);
     }
     // Use cases:
-    // - Custom user settings: https://vike.dev/head#custom-settings
+    // - Custom user settings: https://vike.dev/head-tags#custom-settings
     // - Testing tools: https://github.com/vikejs/vike-react/issues/95
-    pageContext.config.onAfterRenderClient?.(pageContext);
+    await callCumulativeHooks(pageContext.config.onAfterRenderClient, pageContext);
 };
 function updateDocument(pageContext) {
-    ;
     pageContext._headAlreadySet = true;
     const title = getHeadSetting('title', pageContext);
     const lang = getHeadSetting('lang', pageContext);
     // - We skip if `undefined` as we shouldn't remove values set by the Head setting.
     // - Setting a default prevents the previous value to be leaked: upon client-side navigation, the value set by the previous page won't be removed if the next page doesn't override it.
     //   - Most of the time, the user sets a default himself (i.e. a value defined at /pages/+config.js)
+    //     - If he doesn't have a default then he can use `null` to opt into Vike's defaults
     if (title !== undefined)
         document.title = title || '';
     if (lang !== undefined)

package/dist/renderer/onRenderHtml.js CHANGED Viewed

@@ -3,18 +3,19 @@ export { onRenderHtml };
 import React from 'react';
 import { renderToString, renderToStaticMarkup } from 'react-dom/server';
 import { renderToStream } from 'react-streaming/server';
-import { dangerouslySkipEscape, escapeInject, version } from 'vike/server';
+import { dangerouslySkipEscape, escapeInject } from 'vike/server';
 import { PageContextProvider } from '../hooks/usePageContext.js';
 import { getHeadSetting } from './getHeadSetting.js';
 import { getPageElement } from './getPageElement.js';
 import { isReactElement } from '../utils/isReactElement.js';
 import { getTagAttributesString } from '../utils/getTagAttributesString.js';
-checkVikeVersion();
 addEcosystemStamp();
 const onRenderHtml = async (pageContext) => {
     const pageHtml = await getPageHtml(pageContext);
     const headHtml = getHeadHtml(pageContext);
     const { htmlAttributesString, bodyAttributesString } = getTagAttributes(pageContext);
+    // Not needed on the client-side, thus we remove it to save KBs sent to the client
+    delete pageContext._configFromHook;
     return escapeInject `<!DOCTYPE html>
     <html${dangerouslySkipEscape(htmlAttributesString)}>
       <head>
@@ -65,24 +66,22 @@ function getHeadHtml(pageContext) {
     const imageTags = !image
         ? ''
         : escapeInject `<meta property="og:image" content="${image}"><meta name="twitter:card" content="summary_large_image">`;
+    const viewportTag = dangerouslySkipEscape(getViewportTag(getHeadSetting('viewport', pageContext)));
     const headElementsHtml = dangerouslySkipEscape([
-        // <Head> set by +Head
-        pageContext.config.Head,
-        // <Head> set by useConfig()
+        // Added by +Head
+        ...(pageContext.config.Head ?? []),
+        // Added by useConfig()
         ...(pageContext._configFromHook?.Head ?? [])
     ]
         .filter((Head) => Head !== null && Head !== undefined)
         .map((Head) => getHeadElementHtml(Head, pageContext))
         .join('\n'));
-    // Not needed on the client-side, thus we remove it to save KBs sent to the client
-    delete pageContext._configFromHook;
-    const viewportTag = dangerouslySkipEscape(getViewportTag(pageContext.config.viewport));
     const headHtml = escapeInject `
     ${titleTags}
-    ${headElementsHtml}
     ${viewportTag}
-    ${descriptionTags}
+    ${headElementsHtml}
     ${faviconTag}
+    ${descriptionTags}
     ${imageTags}
   `;
     return headHtml;
@@ -106,8 +105,8 @@ function getTagAttributes(pageContext) {
     // Don't set `lang` to its default value if it's `null` (so that users can set it to `null` in order to remove the default value)
     if (lang === undefined)
         lang = 'en';
-    const bodyAttributes = mergeTagAttributesList(pageContext.config.bodyAttributes);
-    const htmlAttributes = mergeTagAttributesList(pageContext.config.htmlAttributes);
+    const bodyAttributes = mergeTagAttributesList(getHeadSetting('bodyAttributes', pageContext));
+    const htmlAttributes = mergeTagAttributesList(getHeadSetting('htmlAttributes', pageContext));
     const bodyAttributesString = getTagAttributesString(bodyAttributes);
     const htmlAttributesString = getTagAttributesString({ ...htmlAttributes, lang: lang ?? htmlAttributes.lang });
     return { htmlAttributesString, bodyAttributesString };
@@ -128,21 +127,6 @@ function getViewportTag(viewport) {
     }
     return '';
 }
-// We don't need this anymore starting from vike@0.4.173 which added the `require` setting.
-// TODO/eventually: remove this once <=0.4.172 versions become rare.
-function checkVikeVersion() {
-    if (version) {
-        const versionParts = version.split('.').map((s) => parseInt(s, 10));
-        if (versionParts[0] > 0)
-            return;
-        if (versionParts[1] > 4)
-            return;
-        if (versionParts[2] >= 173)
-            return;
-    }
-    // We can leave it 0.4.173 until we entirely remove checkVikeVersion() (because starting vike@0.4.173 we use the new `require` setting).
-    throw new Error('Update Vike to 0.4.173 or above');
-}
 // For improving error messages of:
 // - react-streaming https://github.com/brillout/react-streaming/blob/6a43dd20c27fb5d751dca41466b06ee3f4f35462/src/server/useStream.ts#L21
 // - vike https://github.com/vikejs/vike/blob/96c0155380ffebd4976ab076b58e86d8eb2d603a/vike/node/runtime/html/stream/react-streaming.ts#L31

package/dist/types/Config.d.ts CHANGED Viewed

@@ -1,10 +1,15 @@
-import type { ImportString, PageContextClient, PageContext } from 'vike/types';
+import type { ImportString, PageContextClient, PageContext as PageContext_, PageContextServer } from 'vike/types';
 import type { TagAttributes } from '../utils/getTagAttributesString.js';
 import type { Viewport } from '../renderer/onRenderHtml.js';
+import type { ConfigFromHookCumulative } from '../hooks/useConfig/useConfig-server.js';
 declare global {
     namespace Vike {
         interface Config {
-            /** The page's root React component */
+            /**
+             * The page's root React component.
+             *
+             * https://vike.dev/Page
+             */
             Page?: () => React.ReactNode;
             /**
              * Add arbitrary `<head>` tags.
@@ -13,7 +18,7 @@ declare global {
              */
             Head?: Head;
             /**
-             * A component that defines the visual layout of the page common to several pages.
+             * A component that defines the visual layout common to several pages.
              *
              * Technically: the `<Layout>` component wraps the root component `<Page>`.
              *
@@ -39,7 +44,7 @@ declare global {
              *
              * https://vike.dev/title
              */
-            title?: PlainOrGetter<string>;
+            title?: string | null | ((pageContext: PageContext_) => string | null | undefined);
             /**
              * Set the page's description.
              *
@@ -53,7 +58,7 @@ declare global {
              *
              * https://vike.dev/description
              */
-            description?: PlainOrGetter<string>;
+            description?: string | null | ((pageContext: PageContextServer) => string | null | undefined);
             /**
              * Set the page's preview image upon URL sharing.
              *
@@ -67,15 +72,15 @@ declare global {
              *
              * https://vike.dev/image
              */
-            image?: PlainOrGetter<string>;
+            image?: string | null | ((pageContext: PageContextServer) => string | null | undefined);
             /**
              * Set the page's width shown to the user on mobile/tablet devices.
              *
-             * https://vike.dev/viewport
-             *
              * @default "responsive"
+             *
+             * https://vike.dev/viewport
              */
-            viewport?: Viewport;
+            viewport?: Viewport | ((pageContext: PageContextServer) => Viewport | undefined);
             /**
              * Set the page's favicon.
              *
@@ -88,7 +93,7 @@ declare global {
              *
              * https://vike.dev/favicon
              */
-            favicon?: PlainOrGetter<string>;
+            favicon?: string | null | ((pageContext: PageContextServer) => string | null | undefined);
             /**
              * Set the page's language (`<html lang>`).
              *
@@ -96,28 +101,27 @@ declare global {
              *
              * https://vike.dev/lang
              */
-            lang?: PlainOrGetter<string> | null;
+            lang?: string | null | ((pageContext: PageContext_) => string | null | undefined);
             /**
              * Add tag attributes such as `<html class="dark">`.
              *
              * https://vike.dev/htmlAttributes
              */
-            htmlAttributes?: TagAttributes;
+            htmlAttributes?: TagAttributes | ((pageContext: PageContextServer) => TagAttributes | undefined);
             /**
              * Add tag attributes such as `<body class="dark">`.
              *
              * https://vike.dev/bodyAttributes
              */
-            bodyAttributes?: TagAttributes;
+            bodyAttributes?: TagAttributes | ((pageContext: PageContextServer) => TagAttributes | undefined);
             /**
              * If `true`, the page is rendered twice: on the server-side (to HTML) and on the client-side (hydration).
              *
              * If `false`, the page is rendered only once in the browser.
              *
-             * https://vike.dev/ssr
-             *
              * @default true
              *
+             * https://vike.dev/ssr
              */
             ssr?: boolean;
             /**
@@ -132,7 +136,6 @@ declare global {
              * @default false
              *
              * https://vike.dev/stream
-             *
              */
             stream?: boolean | 'node' | 'web';
             /**
@@ -144,9 +147,9 @@ declare global {
             /**
              * Whether to use `<StrictMode>`.
              *
-             * https://vike.dev/reactStrictMode
-             *
              * @default true
+             *
+             * https://vike.dev/reactStrictMode
              */
             reactStrictMode?: boolean;
             /**
@@ -161,17 +164,24 @@ declare global {
              * https://vike.dev/onAfterRenderClient
              */
             onAfterRenderClient?: (pageContext: PageContextClient) => void;
+            /**
+             * Define loading animations.
+             *
+             * https://vike.dev/Loading
+             */
             Loading?: Loading | ImportString;
         }
         interface ConfigResolved {
             Wrapper?: Wrapper[];
             Layout?: Layout[];
+            Head?: Head[];
             bodyAttributes?: TagAttributes[];
             htmlAttributes?: TagAttributes[];
+            onBeforeRenderClient?: Function[];
+            onAfterRenderClient?: Function[];
         }
     }
 }
-type PlainOrGetter<T> = T | ((pageContext: PageContext) => T);
 export type Head = React.ReactNode | (() => React.ReactNode);
 type Wrapper = (props: {
     children: React.ReactNode;
@@ -184,11 +194,6 @@ type Loading = {
 type PickWithoutGetter<T, K extends keyof T> = {
     [P in K]: Exclude<T[P], Function>;
 };
-export type ConfigFromHook = PickWithoutGetter<Vike.Config, 'Head' | 'title' | 'description' | 'image'>;
-export type ConfigFromHookResolved = {
-    Head?: Head[];
-    title?: string;
-    description?: string;
-    image?: string;
-};
+export type ConfigFromHook = PickWithoutGetter<Vike.Config, 'Head' | 'title' | 'description' | 'image' | 'favicon' | 'lang' | 'viewport' | 'bodyAttributes' | 'htmlAttributes'>;
+export type ConfigFromHookResolved = Omit<ConfigFromHook, ConfigFromHookCumulative> & Pick<Vike.ConfigResolved, ConfigFromHookCumulative>;
 export {};

package/dist/types/PageContext.d.ts CHANGED Viewed

@@ -2,7 +2,6 @@ import type React from 'react';
 import type { JSX } from 'react';
 import type ReactDOM from 'react-dom/client';
 import type { ConfigFromHookResolved } from './Config.js';
-import type { PageContext } from 'vike/types';
 declare global {
     namespace Vike {
         interface PageContext {
@@ -15,7 +14,7 @@ declare global {
         }
     }
 }
-export type PageContextInternal = PageContext & {
+export type PageContextInternal = {
     _configFromHook?: ConfigFromHookResolved;
     _headAlreadySet?: true;
 };

package/dist/utils/callCumulativeHooks.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export declare function callCumulativeHooks(values: undefined \| unknown[], pageContext: unknown): Promise<unknown[]>;

package/dist/utils/callCumulativeHooks.js ADDED Viewed

@@ -0,0 +1,16 @@
+export async function callCumulativeHooks(values, pageContext) {
+    if (!values)
+        return [];
+    const valuesPromises = values.map((val) => {
+        if (typeof val === 'function') {
+            // Hook
+            return val(pageContext);
+        }
+        else {
+            // Plain value
+            return val;
+        }
+    });
+    const valuesResolved = await Promise.all(valuesPromises);
+    return valuesResolved;
+}

package/dist/utils/includes.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ /** Same as Array.prototype.includes() but with type inference */
2	+ export declare function includes<T>(values: readonly T[], x: unknown): x is T;

package/dist/utils/includes.js ADDED Viewed

@@ -0,0 +1,10 @@
+// https://stackoverflow.com/questions/56565528/typescript-const-assertions-how-to-use-array-prototype-includes/74213179#74213179
+/** Same as Array.prototype.includes() but with type inference */
+export function includes(values, x) {
+    return values.includes(x);
+}
+/*
+export function includes<Arr extends any[] | readonly any[]>(arr: Arr, el: unknown): el is Arr[number] {
+  return arr.includes(el as any)
+}
+*/

package/dist/utils/objectKeys.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ /** Same as Object.keys() but with type inference */
2	+ export declare function objectKeys<T extends object>(obj: T): (keyof T)[];

package/dist/utils/objectKeys.js ADDED Viewed

@@ -0,0 +1,6 @@
+// https://stackoverflow.com/questions/52856496/typescript-object-keys-return-string
+// https://github.com/sindresorhus/ts-extras/blob/main/source/object-keys.ts
+/** Same as Object.keys() but with type inference */
+export function objectKeys(obj) {
+    return Object.keys(obj);
+}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "vike-react",
-  "version": "0.5.0",
+  "version": "0.5.2-commit-c9911b5",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -11,15 +11,15 @@
       "browser": "./dist/hooks/useConfig/useConfig-client.js",
       "default": "./dist/hooks/useConfig/useConfig-server.js"
     },
-    "./ClientOnly": "./dist/components/ClientOnly.js",
-    "./Head": {
-      "browser": "./dist/components/Head/Head-client.js",
-      "default": "./dist/components/Head/Head-server.js"
-    },
     "./Config": {
       "browser": "./dist/components/Config/Config-client.js",
       "default": "./dist/components/Config/Config-server.js"
     },
+    "./Head": {
+      "browser": "./dist/components/Head/Head-client.js",
+      "default": "./dist/components/Head/Head-server.js"
+    },
+    "./ClientOnly": "./dist/components/ClientOnly.js",
     "./clientOnly": "./dist/helpers/clientOnly.js",
     ".": "./dist/index.js",
     "./config": "./dist/+config.js",
@@ -38,8 +38,7 @@
   "peerDependencies": {
     "react": ">=18.0.0",
     "react-dom": ">=18.0.0",
-    "vike": ">=0.4.182",
-    "vite": ">=4.3.8"
+    "vike": ">=0.4.182"
   },
   "devDependencies": {
     "@biomejs/biome": "^1.6.4",
@@ -47,11 +46,13 @@
     "@types/node": "^20.11.17",
     "@types/react": "^18.2.55",
     "@types/react-dom": "^18.2.19",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "react-streaming": "^0.3.43",
     "rimraf": "^5.0.5",
-    "typescript": "^5.5.3",
-    "vike": "^0.4.182"
+    "typescript": "^5.5.4",
+    "vike": "^0.4.183",
+    "vite": "^5.4.0"
   },
   "dependencies": {
     "react-streaming": "^0.3.42"
@@ -67,12 +68,12 @@
       "useConfig": [
         "./dist/hooks/useConfig/useConfig-server.d.ts"
       ],
-      "Head": [
-        "./dist/components/Head/Head-server.d.ts"
-      ],
       "Config": [
         "./dist/components/Config/Config-server.d.ts"
       ],
+      "Head": [
+        "./dist/components/Head/Head-server.d.ts"
+      ],
       "ClientOnly": [
         "./dist/components/ClientOnly.d.ts"
       ],

package/dist/hooks/useConfig/shared.d.ts DELETED Viewed

@@ -1,3 +0,0 @@
-export type { ConfigSetter };
-import type { ConfigFromHook } from '../../types/Config.js';
-type ConfigSetter = (config: ConfigFromHook) => void;

package/dist/hooks/useConfig/shared.js DELETED Viewed

	@@ -1 +0,0 @@
1	- export {};