vike 0.4.235-commit-9b9289b → 0.4.235-commit-d2ac38a

package/dist/cjs/node/runtime/globalContext.js

@@ -378,14 +378,17 @@ async function setGlobalContext(virtualFileExports) {
     globalContext._pageConfigs.length > 0, globalContext._pageFilesAll);
     assertGlobalContextIsDefined();
     (0, utils_js_1.onSetupRuntime)();
+    debug('setGlobalContext() - done');
     // Never actually used, only used for TypeScript `ReturnType<typeof setGlobalContext>`
     return globalContext;
 }
 async function addGlobalContextAsync(globalContext) {
+    debug('addGlobalContextAsync()');
     const { pageRoutes, onBeforeRouteHook } = await (0, loadPageRoutes_js_1.loadPageRoutes)(globalContext._pageFilesAll, globalContext._pageConfigs, globalContext._pageConfigGlobal, globalContext._allPageIds);
     return addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook);
 }
 function addGlobalContextSync(globalContext) {
+    debug('addGlobalContextSync()');
     const { pageRoutes, onBeforeRouteHook } = (0, loadPageRoutes_js_1.loadPageRoutesSync)(globalContext._pageFilesAll, globalContext._pageConfigs, globalContext._pageConfigGlobal, globalContext._allPageIds);
     return addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook);
 }

package/dist/cjs/node/runtime/html/serializeContext.js

@@ -32,20 +32,41 @@ const passToClientBuiltInPageContext = [
 const pageToClientBuiltInPageContextError = ['pageProps', 'is404', isServerSideError_js_1.isServerSideError];
 function getPageContextClientSerialized(pageContext) {
     const passToClientPageContext = getPassToClientPageContext(pageContext);
-    const pageContextClient = applyPassToClient(passToClientPageContext, pageContext);
-    if (passToClientPageContext.some((prop) => (0, propKeys_js_1.getPropVal)(pageContext._pageContextInit, prop))) {
+    const getObj = (passToClientEntry) => {
+        if (passToClientEntry.once)
+            return undefined; // pass it to client-side globalContext
+        return { obj: pageContext, objName: 'pageContext' };
+    };
+    const res = applyPassToClient(passToClientPageContext, getObj);
+    const pageContextClient = res.objClient;
+    const pageContextClientProps = res.objClientProps;
+    if (pageContextClientProps.some((prop) => (0, propKeys_js_1.getPropVal)(pageContext._pageContextInit, prop))) {
         pageContextClient[pageContextInitIsPassedToClient_js_1.pageContextInitIsPassedToClient] = true;
     }
-    const pageContextClientSerialized = serializeObject(pageContextClient, 'pageContext', passToClientPageContext);
+    const pageContextClientSerialized = serializeObject(pageContextClient, passToClientPageContext, getObj);
     return pageContextClientSerialized;
 }
 function getGlobalContextClientSerialized(pageContext) {
     const passToClient = pageContext._passToClient;
-    const globalContextClient = applyPassToClient(passToClient, pageContext._globalContext);
-    const globalContextClientSerialized = serializeObject(globalContextClient, 'globalContext', passToClient);
+    const globalContext = pageContext._globalContext;
+    const getObj = ({ prop, once }) => {
+        if (once && (0, propKeys_js_1.getPropVal)(pageContext, prop)) {
+            (0, utils_js_1.assert)(typeof pageContext.isClientSideNavigation === 'boolean');
+            if (!pageContext.isClientSideNavigation) {
+                return { obj: pageContext, objName: 'pageContext' }; // pass it to client-side globalContext
+            }
+            else {
+                return undefined; // already passed to client-side
+            }
+        }
+        return { obj: globalContext, objName: 'globalContext' };
+    };
+    const res = applyPassToClient(passToClient, getObj);
+    const globalContextClient = res.objClient;
+    const globalContextClientSerialized = serializeObject(globalContextClient, passToClient, getObj);
     return globalContextClientSerialized;
 }
-function serializeObject(obj, objName, passToClient) {
+function serializeObject(obj, passToClient, getObj) {
     let serialized;
     try {
         serialized = serializeValue(obj);
@@ -54,11 +75,15 @@ function serializeObject(obj, objName, passToClient) {
         const h = (s) => picocolors_1.default.cyan(s);
         let hasWarned = false;
         const propsNonSerializable = [];
-        passToClient.forEach((prop) => {
+        passToClient.forEach((entry) => {
+            const entryNormalized = normalizePassToClientEntry(entry);
+            const { prop } = entryNormalized;
             const res = (0, propKeys_js_1.getPropVal)(obj, prop);
             if (!res)
                 return;
             const { value } = res;
+            const { objName } = getObj(entryNormalized) ?? {};
+            (0, utils_js_1.assert)(objName);
             const varName = `${objName}${(0, propKeys_js_1.getPropKeys)(prop).map(utils_js_1.getPropAccessNotation).join('')}`;
             try {
                 serializeValue(value, varName);
@@ -168,16 +193,36 @@ function getPageContextClientSerializedAbort(pageContext) {
     }
     return serializeValue(pageContext);
 }
-function applyPassToClient(passToClient, pageContext) {
-    const pageContextClient = {};
-    passToClient.forEach((prop) => {
+function applyPassToClient(passToClient, getObj) {
+    const objClient = {};
+    const objClientProps = [];
+    passToClient.forEach((entry) => {
+        const entryNormalized = normalizePassToClientEntry(entry);
+        const { prop } = entryNormalized;
+        const { obj } = getObj(entryNormalized) ?? {};
+        if (!obj)
+            return;
         // Get value from pageContext
-        const res = (0, propKeys_js_1.getPropVal)(pageContext, prop);
+        const res = (0, propKeys_js_1.getPropVal)(obj, prop);
         if (!res)
             return;
         const { value } = res;
         // Set value to pageContextClient
-        (0, propKeys_js_1.setPropVal)(pageContextClient, prop, value);
+        (0, propKeys_js_1.setPropVal)(objClient, prop, value);
+        objClientProps.push(prop);
     });
-    return pageContextClient;
+    return { objClient, objClientProps };
+}
+function normalizePassToClientEntry(entry) {
+    let once;
+    let prop;
+    if (typeof entry === 'string') {
+        prop = entry;
+        once = false;
+    }
+    else {
+        prop = entry.prop;
+        once = entry.once ?? false;
+    }
+    return { prop, once };
 }

package/dist/cjs/node/runtime/renderPage/loadPageConfigsLazyServerSide.js

@@ -41,8 +41,9 @@ async function loadPageConfigsLazyServerSide(pageContext) {
     }
     else {
         configPublicPageLazy.from.configsCumulative.passToClient?.values.forEach((v) => {
-            const { value, definedAt } = v;
-            (0, utils_js_1.assertUsage)((0, utils_js_1.isArrayOfStrings)(value), `+passToClient value defined at ${definedAt}${errMsg}`);
+            const { value } = v;
+            // const { definedAt } = v
+            // assertUsage(isArrayOfStrings(value), `+passToClient value defined at ${definedAt}${errMsg}`)
             passToClient.push(...value);
         });
     }

package/dist/cjs/shared/createGlobalContextShared.js

@@ -20,7 +20,9 @@ async function createGlobalContextShared(virtualFileExports, globalObject, addGl
     else {
         isNewGlobalContext = true;
     }
-    if (addGlobalContextSync && globalContext._pageConfigs.length > 0) {
+    if (addGlobalContextSync &&
+        // TODO/next-major-release: remove
+        globalContext._pageConfigs.length > 0) {
         const globalContextAddendum = addGlobalContextSync?.(globalContext);
         (0, utils_js_1.objectAssign)(globalContext, globalContextAddendum);
     }

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.235-commit-9b9289b';
+exports.PROJECT_VERSION = '0.4.235-commit-d2ac38a';

package/dist/esm/node/prerender/runPrerender.d.ts

@@ -559,7 +559,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
 })) & import("../../shared/getPageFiles.js").VikeConfigPublicPageLazy) & {
     Page: unknown;
     _isHtmlOnly: boolean;
-    _passToClient: string[];
+    _passToClient: import("../runtime/html/serializeContext.js").PassToClient;
     _pageFilePathsLoaded: string[];
     headersResponse: Headers;
 } & {

package/dist/esm/node/runtime/globalContext.js

@@ -374,14 +374,17 @@ async function setGlobalContext(virtualFileExports) {
     globalContext._pageConfigs.length > 0, globalContext._pageFilesAll);
     assertGlobalContextIsDefined();
     onSetupRuntime();
+    debug('setGlobalContext() - done');
     // Never actually used, only used for TypeScript `ReturnType<typeof setGlobalContext>`
     return globalContext;
 }
 async function addGlobalContextAsync(globalContext) {
+    debug('addGlobalContextAsync()');
     const { pageRoutes, onBeforeRouteHook } = await loadPageRoutes(globalContext._pageFilesAll, globalContext._pageConfigs, globalContext._pageConfigGlobal, globalContext._allPageIds);
     return addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook);
 }
 function addGlobalContextSync(globalContext) {
+    debug('addGlobalContextSync()');
     const { pageRoutes, onBeforeRouteHook } = loadPageRoutesSync(globalContext._pageFilesAll, globalContext._pageConfigs, globalContext._pageConfigGlobal, globalContext._allPageIds);
     return addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook);
 }

package/dist/esm/node/runtime/html/serializeContext.d.ts

@@ -2,19 +2,25 @@ export { getPageContextClientSerialized };
 export { getPageContextClientSerializedAbort };
 export { getGlobalContextClientSerialized };
 export type { PageContextSerialization };
+export type { PassToClient };
 import type { UrlRedirect } from '../../../shared/route/abort.js';
 import type { GlobalContextServerInternal } from '../globalContext.js';
 type PageContextSerialization = {
     pageId: string;
     routeParams: Record<string, string>;
-    _passToClient: string[];
+    _passToClient: PassToClient;
     is404: null | boolean;
     pageProps?: Record<string, unknown>;
     _pageContextInit: Record<string, unknown>;
     _globalContext: GlobalContextServerInternal;
+    isClientSideNavigation: boolean;
 };
 declare function getPageContextClientSerialized(pageContext: PageContextSerialization): string;
 declare function getGlobalContextClientSerialized(pageContext: PageContextSerialization): string;
+type PassToClient = (string | {
+    prop: string;
+    once?: boolean;
+})[];
 declare function getPageContextClientSerializedAbort(pageContext: Record<string, unknown> & ({
     _urlRedirect: UrlRedirect;
 } | {

package/dist/esm/node/runtime/html/serializeContext.js

@@ -27,20 +27,41 @@ const passToClientBuiltInPageContext = [
 const pageToClientBuiltInPageContextError = ['pageProps', 'is404', isServerSideError];
 function getPageContextClientSerialized(pageContext) {
     const passToClientPageContext = getPassToClientPageContext(pageContext);
-    const pageContextClient = applyPassToClient(passToClientPageContext, pageContext);
-    if (passToClientPageContext.some((prop) => getPropVal(pageContext._pageContextInit, prop))) {
+    const getObj = (passToClientEntry) => {
+        if (passToClientEntry.once)
+            return undefined; // pass it to client-side globalContext
+        return { obj: pageContext, objName: 'pageContext' };
+    };
+    const res = applyPassToClient(passToClientPageContext, getObj);
+    const pageContextClient = res.objClient;
+    const pageContextClientProps = res.objClientProps;
+    if (pageContextClientProps.some((prop) => getPropVal(pageContext._pageContextInit, prop))) {
         pageContextClient[pageContextInitIsPassedToClient] = true;
     }
-    const pageContextClientSerialized = serializeObject(pageContextClient, 'pageContext', passToClientPageContext);
+    const pageContextClientSerialized = serializeObject(pageContextClient, passToClientPageContext, getObj);
     return pageContextClientSerialized;
 }
 function getGlobalContextClientSerialized(pageContext) {
     const passToClient = pageContext._passToClient;
-    const globalContextClient = applyPassToClient(passToClient, pageContext._globalContext);
-    const globalContextClientSerialized = serializeObject(globalContextClient, 'globalContext', passToClient);
+    const globalContext = pageContext._globalContext;
+    const getObj = ({ prop, once }) => {
+        if (once && getPropVal(pageContext, prop)) {
+            assert(typeof pageContext.isClientSideNavigation === 'boolean');
+            if (!pageContext.isClientSideNavigation) {
+                return { obj: pageContext, objName: 'pageContext' }; // pass it to client-side globalContext
+            }
+            else {
+                return undefined; // already passed to client-side
+            }
+        }
+        return { obj: globalContext, objName: 'globalContext' };
+    };
+    const res = applyPassToClient(passToClient, getObj);
+    const globalContextClient = res.objClient;
+    const globalContextClientSerialized = serializeObject(globalContextClient, passToClient, getObj);
     return globalContextClientSerialized;
 }
-function serializeObject(obj, objName, passToClient) {
+function serializeObject(obj, passToClient, getObj) {
     let serialized;
     try {
         serialized = serializeValue(obj);
@@ -49,11 +70,15 @@ function serializeObject(obj, objName, passToClient) {
         const h = (s) => pc.cyan(s);
         let hasWarned = false;
         const propsNonSerializable = [];
-        passToClient.forEach((prop) => {
+        passToClient.forEach((entry) => {
+            const entryNormalized = normalizePassToClientEntry(entry);
+            const { prop } = entryNormalized;
             const res = getPropVal(obj, prop);
             if (!res)
                 return;
             const { value } = res;
+            const { objName } = getObj(entryNormalized) ?? {};
+            assert(objName);
             const varName = `${objName}${getPropKeys(prop).map(getPropAccessNotation).join('')}`;
             try {
                 serializeValue(value, varName);
@@ -163,16 +188,36 @@ function getPageContextClientSerializedAbort(pageContext) {
     }
     return serializeValue(pageContext);
 }
-function applyPassToClient(passToClient, pageContext) {
-    const pageContextClient = {};
-    passToClient.forEach((prop) => {
+function applyPassToClient(passToClient, getObj) {
+    const objClient = {};
+    const objClientProps = [];
+    passToClient.forEach((entry) => {
+        const entryNormalized = normalizePassToClientEntry(entry);
+        const { prop } = entryNormalized;
+        const { obj } = getObj(entryNormalized) ?? {};
+        if (!obj)
+            return;
         // Get value from pageContext
-        const res = getPropVal(pageContext, prop);
+        const res = getPropVal(obj, prop);
         if (!res)
             return;
         const { value } = res;
         // Set value to pageContextClient
-        setPropVal(pageContextClient, prop, value);
+        setPropVal(objClient, prop, value);
+        objClientProps.push(prop);
     });
-    return pageContextClient;
+    return { objClient, objClientProps };
+}
+function normalizePassToClientEntry(entry) {
+    let once;
+    let prop;
+    if (typeof entry === 'string') {
+        prop = entry;
+        once = false;
+    }
+    else {
+        prop = entry.prop;
+        once = entry.once ?? false;
+    }
+    return { prop, once };
 }

package/dist/esm/node/runtime/renderPage/loadPageConfigsLazyServerSide.d.ts

@@ -7,6 +7,7 @@ import { PageContextGetPageAssets, type PageAsset } from './getPageAssets.js';
 import { type PageContextDebugRouteMatches } from './debugPageFiles.js';
 import type { GlobalContextServerInternal } from '../globalContext.js';
 import { type PageContextExecHookServer } from './execHookServer.js';
+import type { PassToClient } from '../html/serializeContext.js';
 type PageContextExecuteHook = Omit<PageContextExecHookServer, keyof Awaited<ReturnType<typeof loadPageConfigsLazyServerSide>>>;
 type PageContext_loadPageConfigsLazyServerSide = PageContextGetPageAssets & PageContextDebugRouteMatches & {
     pageId: string;
@@ -17,7 +18,7 @@ type PageConfigsLazy = PromiseType<ReturnType<typeof loadPageConfigsLazyServerSi
 declare function loadPageConfigsLazyServerSideAndExecHook<PageContext extends PageContext_loadPageConfigsLazyServerSide & PageContextExecuteHook>(pageContext: PageContext): Promise<PageContext & VikeConfigPublicPageLazy & {
     Page: unknown;
     _isHtmlOnly: boolean;
-    _passToClient: string[];
+    _passToClient: PassToClient;
     _pageFilePathsLoaded: string[];
     headersResponse: Headers;
 } & {
@@ -26,7 +27,7 @@ declare function loadPageConfigsLazyServerSideAndExecHook<PageContext extends Pa
 declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPageConfigsLazyServerSide): Promise<VikeConfigPublicPageLazy & {
     Page: unknown;
     _isHtmlOnly: boolean;
-    _passToClient: string[];
+    _passToClient: PassToClient;
     _pageFilePathsLoaded: string[];
     headersResponse: Headers;
 } & {

package/dist/esm/node/runtime/renderPage/loadPageConfigsLazyServerSide.js

@@ -2,7 +2,7 @@ export { loadPageConfigsLazyServerSideAndExecHook };
 import { getPageFilesServerSide } from '../../../shared/getPageFiles.js';
 import { resolveVikeConfigPublicPageLazy } from '../../../shared/page-configs/resolveVikeConfigPublic.js';
 import { analyzePageClientSideInit } from '../../../shared/getPageFiles/analyzePageClientSide.js';
-import { assertUsage, assertWarning, hasProp, objectAssign, isArrayOfStrings } from '../utils.js';
+import { assertUsage, assertWarning, hasProp, objectAssign } from '../utils.js';
 import { getPageAssets } from './getPageAssets.js';
 import { debugPageFiles } from './debugPageFiles.js';
 import { findPageConfig } from '../../../shared/page-configs/findPageConfig.js';
@@ -39,8 +39,9 @@ async function loadPageConfigsLazyServerSide(pageContext) {
     }
     else {
         configPublicPageLazy.from.configsCumulative.passToClient?.values.forEach((v) => {
-            const { value, definedAt } = v;
-            assertUsage(isArrayOfStrings(value), `+passToClient value defined at ${definedAt}${errMsg}`);
+            const { value } = v;
+            // const { definedAt } = v
+            // assertUsage(isArrayOfStrings(value), `+passToClient value defined at ${definedAt}${errMsg}`)
             passToClient.push(...value);
         });
     }

package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.d.ts

@@ -143,7 +143,7 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
     } & import("../../../shared/getPageFiles.js").VikeConfigPublicPageLazy & {
         Page: unknown;
         _isHtmlOnly: boolean;
-        _passToClient: string[];
+        _passToClient: import("../html/serializeContext.js").PassToClient;
         _pageFilePathsLoaded: string[];
         headersResponse: Headers;
     } & {
@@ -278,7 +278,7 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
     } & import("../../../shared/getPageFiles.js").VikeConfigPublicPageLazy & {
         Page: unknown;
         _isHtmlOnly: boolean;
-        _passToClient: string[];
+        _passToClient: import("../html/serializeContext.js").PassToClient;
         _pageFilePathsLoaded: string[];
         headersResponse: Headers;
     } & {

package/dist/esm/shared/createGlobalContextShared.js

@@ -17,7 +17,9 @@ async function createGlobalContextShared(virtualFileExports, globalObject, addGl
     else {
         isNewGlobalContext = true;
     }
-    if (addGlobalContextSync && globalContext._pageConfigs.length > 0) {
+    if (addGlobalContextSync &&
+        // TODO/next-major-release: remove
+        globalContext._pageConfigs.length > 0) {
         const globalContextAddendum = addGlobalContextSync?.(globalContext);
         objectAssign(globalContext, globalContextAddendum);
     }

package/dist/esm/types/Config.d.ts

@@ -44,6 +44,7 @@ import type { Vike, VikePackages } from './VikeNamespace.js';
 import type { HooksTimeoutProvidedByUser } from '../shared/hooks/getHook.js';
 import type { GlobalContext, PageContextClient, PageContextServer } from './PageContext.js';
 import type { InlineConfig } from 'vite';
+import type { PassToClient } from '../node/runtime/html/serializeContext.js';
 type HookNameOld = HookName | HookNameOldDesign;
 type HookName = HookNamePage | HookNameGlobal;
 type HookNamePage = 'onHydrationEnd' | 'onBeforePrerenderStart' | 'onBeforeRender' | 'onPageTransitionStart' | 'onPageTransitionEnd' | 'onRenderHtml' | 'onRenderClient' | 'guard' | 'data' | 'onData' | 'route';
@@ -362,7 +363,7 @@ type ConfigBuiltIn = {
      *
      * https://vike.dev/passToClient
      */
-    passToClient?: string[] | ImportString;
+    passToClient?: PassToClient | ImportString;
     /** Hook called when page is rendered on the client-side.
      *
      * https://vike.dev/onRenderClient

package/dist/esm/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.235-commit-9b9289b";
+export declare const PROJECT_VERSION: "0.4.235-commit-d2ac38a";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.235-commit-9b9289b';
+export const PROJECT_VERSION = '0.4.235-commit-d2ac38a';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.235-commit-9b9289b",
+  "version": "0.4.235-commit-d2ac38a",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {