vike 0.4.235 → 0.4.236-commit-85d361d

package/dist/cjs/__internal/index.js

@@ -12,7 +12,7 @@ const assertSetup_js_1 = require("../utils/assertSetup.js");
 /**
  * Used by {@link https://github.com/magne4000/vite-plugin-vercel|vite-plugin-vercel} to compute some rewrite rules and extract { isr } configs.
  *
- * TODO/eventually: remove
+ * TO-DO/eventually: remove
  */
 async function getPagesAndRoutes() {
     (0, assertSetup_js_1.setNodeEnvProduction)();

package/dist/cjs/client/shared/createGetGlobalContextClient.js

@@ -46,7 +46,6 @@ function createGetGlobalContextClient(virtualFileExports, isClientRouting, addGl
         return globalContext;
     }
 }
-// The type is never used: it's the type of the server-side getGlobalContext() that is used.
 async function getGlobalContext() {
     const globalContext = await globalObject.globalContextPromise;
     return globalContext;

package/dist/cjs/client/shared/preparePageContextForPublicUsageClientShared.js

@@ -5,14 +5,14 @@ exports.preparePageContextForPublicUsageClientMinimal = preparePageContextForPub
 const utils_js_1 = require("../runtime-server-routing/utils.js");
 const preparePageContextForPublicUsage_js_1 = require("../../shared/preparePageContextForPublicUsage.js");
 function preparePageContextForPublicUsageClientShared(pageContext) {
-    // TODO/now-proxy use proxy
+    // TO-DO/soon/proxy: use proxy
     const Page = pageContext.config?.Page ||
-        // TODO/next-major-release: remove
+        // TO-DO/next-major-release: remove
         pageContext.exports?.Page;
     (0, utils_js_1.objectAssign)(pageContext, { Page });
-    // TODO/next-major-release: after we remove supportVueReactiviy() we can call this later inside the agnostic preparePageContextForPublicUsage()
+    // TO-DO/next-major-release: after we remove supportVueReactiviy() we can call this later inside the agnostic preparePageContextForPublicUsage()
     (0, preparePageContextForPublicUsage_js_1.assertPropertyGetters)(pageContext);
-    // TODO/next-major-release: remove
+    // TO-DO/next-major-release: remove
     // - Requires https://github.com/vikejs/vike-vue/issues/198
     // - Last time I tried to remove it (https://github.com/vikejs/vike/commit/705fd23598d9d69bf46a52c8550216cd7117ce71) the tests were failing as expected: only the Vue integrations that used shallowReactive() failed.
     supportVueReactiviy(pageContext);

package/dist/cjs/node/api/prepareViteApiCall.js

@@ -122,7 +122,7 @@ async function getViteInfo(viteConfigFromUserApiOptions, operation) {
     const root = normalizeViteRoot(viteConfigResolved.root ?? process.cwd());
     globalObject.root = root;
     // - Find options `vike(options)` set in vite.config.js
-    //   - TODO/next-major: remove
+    //   - TO-DO/next-major-release: remove
     // - Add Vike's Vite plugin if missing
     let vikeVitePluginOptions;
     const found = findVikeVitePlugin(viteConfigResolved);

package/dist/cjs/node/cli/index.js

@@ -1,5 +1,5 @@
 "use strict";
-// TODO/v1-release: remove this file
+// TO-DO/next-major-release: remove this file
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/dist/cjs/node/createPageRenderer.js

@@ -1,5 +1,5 @@
 "use strict";
-// TODO/v1-release: remove this file
+// TO-DO/next-major-release: remove this file
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPageRenderer = createPageRenderer;
 //import { SsrEnv, setSsrEnv } from './ssrEnv.js'

package/dist/cjs/node/importBuild.js

@@ -1,3 +1,3 @@
 "use strict";
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 console.warn("[vike][Warning] importBuild.js is not needed anymore; it has no effect. Remove `import 'dist/server/importBuild.js'` to remove this warning. More infos at https://vike.dev/importBuild.js");

package/dist/cjs/node/prerender/context.js

@@ -14,7 +14,7 @@ function isPrerenderAutoRunEnabled(vikeConfig) {
         !globalObject.isDisabled &&
         vikeConfig.config.disableAutoFullBuild !== 'prerender');
 }
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 function temp_disablePrerenderAutoRun() {
     globalObject.isDisabled = true;
 }

package/dist/cjs/node/prerender/index.js

@@ -1,5 +1,5 @@
 "use strict";
-// TODO/v1-release: remove this file
+// TO-DO/next-major-release: remove this file
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/dist/cjs/node/prerender/resolvePrerenderConfig.js

@@ -24,7 +24,7 @@ function resolvePrerenderConfigGlobal(vikeConfig) {
             defaultLocalValue = true;
         }
     }
-    // TODO/next-major: remove
+    // TO-DO/next-major-release: remove
     // Backwards compatibility for `vike({prerender:true})` in vite.config.js
     {
         const valuesWithDefinedAt = vikeConfig._from.configsCumulative.prerender?.values ?? [];
@@ -39,7 +39,7 @@ function resolvePrerenderConfigGlobal(vikeConfig) {
         isPrerenderingEnabled: vikeConfig._pageConfigs.length > 0 &&
             vikeConfig._pageConfigs.some((pageConfig) => resolvePrerenderConfigLocal(pageConfig)?.value ?? defaultLocalValue),
     });
-    // TODO/next-major remove
+    // TO-DO/next-major-release: remove
     if (vikeConfig._pageConfigs.length === 0 && defaultLocalValue)
         prerenderConfigGlobal.isPrerenderingEnabled = true;
     return prerenderConfigGlobal;

package/dist/cjs/node/prerender/runPrerender.js

@@ -87,7 +87,7 @@ async function runPrerender(options = {}, trigger) {
     const { partial, noExtraDir, parallel, defaultLocalValue, isPrerenderingEnabled } = prerenderConfigGlobal;
     if (!isPrerenderingEnabled) {
         (0, utils_js_1.assert)(trigger !== 'auto-run');
-        /* TODO/v1-release: use this assertUsage() again.
+        /* TO-DO/next-major-release: use this assertUsage() again.
          * - Make sure https://github.com/magne4000/vite-plugin-vercel/pull/156 is merged before using this assertUsage() again. (Otherwise vite-plugin-vercel will trigger this assertUsage() call.)
          *   - Done: PR is merged as of June 20205
         assertUsage(
@@ -169,7 +169,7 @@ async function collectDoNoPrerenderList(pageConfigs, doNotPrerenderList, default
         }
     });
     // Old design
-    // TODO/v1-release: remove
+    // TO-DO/next-major-release: remove
     await Promise.all(globalContext._pageFilesAll
         .filter((p) => {
         assertExportNames(p);
@@ -332,7 +332,7 @@ async function createPageContextPrerendering(urlOriginal, prerenderContext, glob
         urlOriginal,
         ...prerenderContext._pageContextInit,
     };
-    const pageContext = await (0, createPageContextServerSide_js_1.createPageContextServerSide)(pageContextInit, globalContext, {
+    const pageContext = (0, createPageContextServerSide_js_1.createPageContextServerSide)(pageContextInit, globalContext, {
         isPrerendering: true,
     });
     (0, utils_js_1.assert)(pageContext.isPrerendering === true);
@@ -423,7 +423,7 @@ async function callOnPrerenderStartHook(prerenderContext, globalContext, concurr
         }
     }
     // Old design
-    // TODO/v1-release: remove
+    // TO-DO/next-major-release: remove
     if (globalContext._pageConfigs.length === 0) {
         const hookTimeout = (0, getHook_js_1.getHookTimeoutDefault)('onBeforePrerender');
         const pageFilesWithOnBeforePrerenderHook = globalContext._pageFilesAll.filter((p) => {
@@ -463,7 +463,7 @@ async function callOnPrerenderStartHook(prerenderContext, globalContext, concurr
     (0, utils_js_1.assertUsage)((0, utils_js_1.isCallable)(hookFn), `${msgPrefix} should be a function.`);
     prerenderContext.pageContexts.forEach((pageContext) => {
         Object.defineProperty(pageContext, 'url', {
-            // TODO/v1-release: remove warning
+            // TO-DO/next-major-release: remove warning
             get() {
                 (0, utils_js_1.assertWarning)(false, msgPrefix +
                     ' uses pageContext.url but it should use pageContext.urlOriginal instead, see https://vike.dev/migration/0.4.23', { showStackTrace: true, onlyOnce: true });
@@ -493,7 +493,7 @@ async function callOnPrerenderStartHook(prerenderContext, globalContext, concurr
     }
     const errPrefix = `The ${hookName}() hook exported by ${hookFilePath}`;
     const rightUsage = `${errPrefix} should return ${picocolors_1.default.cyan('null')}, ${picocolors_1.default.cyan('undefined')}, or ${picocolors_1.default.cyan('{ prerenderContext: { pageContexts } }')}`;
-    // TODO/v1-release: remove
+    // TO-DO/next-major-release: remove
     if ((0, utils_js_1.hasProp)(result, 'globalContext')) {
         (0, utils_js_1.assertUsage)((0, utils_js_1.isObjectWithKeys)(result, ['globalContext']) &&
             (0, utils_js_1.hasProp)(result, 'globalContext', 'object') &&
@@ -510,7 +510,7 @@ async function callOnPrerenderStartHook(prerenderContext, globalContext, concurr
         (0, utils_js_1.hasProp)(result.prerenderContext, 'pageContexts', 'array'), rightUsage);
     prerenderContext.pageContexts = result.prerenderContext.pageContexts;
     prerenderContext.pageContexts.forEach((pageContext) => {
-        // TODO/v1-release: remove
+        // TO-DO/next-major-release: remove
         if (pageContext.url && !(0, utils_js_1.isPropertyGetter)(pageContext, 'url')) {
             (0, utils_js_1.assertWarning)(false, msgPrefix +
                 ' provided pageContext.url but it should provide pageContext.urlOriginal instead, see https://vike.dev/migration/0.4.23', { onlyOnce: true });
@@ -571,10 +571,6 @@ function warnContradictoryNoPrerenderList(prerenderedPageContexts, doNotPrerende
 async function warnMissingPages(prerenderedPageContexts, globalContext, doNotPrerenderList, partial) {
     const isV1 = globalContext._pageConfigs.length > 0;
     const hookName = isV1 ? 'onBeforePrerenderStart' : 'prerender';
-    /* TODO/after-v1-design-release: document setting `prerender: false` as an alternative to using prerender.partial (both in the warnings and the docs)
-    const optOutName = isV1 ? 'prerender' : 'doNotPrerender'
-    const msgAddendum = `Explicitly opt-out by setting the config ${optOutName} to ${isV1 ? 'false' : 'true'} or use the option prerender.partial`
-    */
     globalContext._allPageIds
         .filter((pageId) => !prerenderedPageContexts[pageId])
         .filter((pageId) => !doNotPrerenderList.find((p) => p.pageId === pageId))
@@ -677,7 +673,7 @@ function normalizeOnPrerenderHookResult(prerenderResult, prerenderHookFile, hook
         return prerenderElement;
     }
 }
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 function checkOutdatedOptions(options) {
     (0, utils_js_1.assertUsage)(options.root === undefined, 'Option `prerender({ root })` deprecated: set `prerender({ viteConfig: { root }})` instead.', { showStackTrace: true });
     (0, utils_js_1.assertUsage)(options.configFile === undefined, 'Option `prerender({ configFile })` deprecated: set `prerender({ viteConfig: { configFile }})` instead.', { showStackTrace: true });
@@ -722,7 +718,7 @@ function assertIsNotAbort(err, urlOriginal) {
     (0, utils_js_1.assertUsage)(false, `${picocolors_1.default.cyan(abortCall)} thrown${thrownBy} while pre-rendering ${urlOriginal} but ${picocolors_1.default.cyan(abortCaller)} isn't supported for pre-rendered pages`);
 }
 function preparePrerenderContextForPublicUsage(prerenderContext) {
-    // TODO/v1-release: remove
+    // TO-DO/next-major-release: remove
     if (!('prerenderPageContexts' in prerenderContext)) {
         Object.defineProperty(prerenderContext, 'prerenderPageContexts', {
             get() {

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

@@ -42,7 +42,7 @@ const loggerRuntime_js_1 = require("./loggerRuntime.js");
 const getVikeConfigError_js_1 = require("../shared/getVikeConfigError.js");
 const isNewError_js_1 = require("./renderPage/isNewError.js");
 const debug = (0, utils_js_1.createDebugger)('vike:globalContext');
-const globalObject = (0, utils_js_1.getGlobalObject)('runtime/globalContext.ts', getInitialGlobalContext());
+const globalObject = (0, utils_js_1.getGlobalObject)('runtime/globalContext.ts', getInitialGlobalObject());
 // Trick to break down TypeScript circular dependency
 // https://chat.deepseek.com/a/chat/s/d7e9f90a-c7f3-4108-9cd5-4ad6caed3539
 const globalObjectTyped = globalObject;
@@ -103,17 +103,19 @@ async function getGlobalContextAsync(isProduction) {
  * Get runtime information about your app.
  *
  * https://vike.dev/getGlobalContext
- *
- * @deprecated
  */
 function getGlobalContextSync() {
     debug('getGlobalContextSync()');
     const { globalContext } = globalObjectTyped;
     (0, utils_js_1.assertUsage)(globalContext, createGlobalContextShared_js_1.getGlobalContextSyncErrMsg);
-    (0, utils_js_1.assertWarning)(false, 
-    // We discourage users from using it because `pageContext.globalContext` is safer: I ain't sure but there could be race conditions when using `getGlobalContextSync()` inside React/Vue components upon HMR.
-    // We're lying about "is going to be deprecated in the next major release": let's keep it and see if users need it (so far I can't see a use case for it).
-    'getGlobalContextSync() is going to be deprecated in the next major release, see https://vike.dev/getGlobalContext', { onlyOnce: true });
+    const isProd = globalContext._isProduction;
+    (0, utils_js_1.assert)(typeof isProd === 'boolean');
+    (0, utils_js_1.assertWarning)(isProd, 
+    // - We discourage users from using it in development because `pageContext.globalContext` is safer: I ain't sure but there could be race conditions when using `getGlobalContextSync()` inside React/Vue components upon HMR.
+    // - I don't see any issues with getGlobalContextSync() in production.
+    // - getGlobalContextSync() is used in production by vike-vercel
+    //   - https://discord.com/channels/@me/942519153502339072/1389546794676916344 (PM between Rom and Joël)
+    "getGlobalContextSync() shouldn't be used in development, see https://vike.dev/getGlobalContext", { onlyOnce: true });
     return getGlobalContextForPublicUsage();
 }
 function getGlobalContextForPublicUsage() {
@@ -152,7 +154,9 @@ function setGlobalContext_isPrerendering() {
     globalObject.isPrerendering = true;
     setIsProduction(true);
 }
-function setGlobalContext_isProduction(isProduction, tolerateContraditction) {
+function setGlobalContext_isProduction(isProduction, tolerateContraditction = false) {
+    if (debug.isActivated)
+        debug('setGlobalContext_isProduction()', { isProduction, tolerateContraditction });
     if (globalObject.isProduction === undefined) {
         setIsProduction(isProduction);
     }
@@ -234,6 +238,7 @@ function assertViteManifest(manifest) {
 async function loadBuildEntry(outDir) {
     debug('loadBuildEntry()');
     if (globalObject.globalContext) {
+        debug('loadBuildEntry() - already done');
         return;
     }
     if (!globalObject.buildEntry) {
@@ -259,6 +264,8 @@ async function loadBuildEntry(outDir) {
     globalObject.buildInfo = buildEntry.buildInfo;
     await setGlobalContext(buildEntry.virtualFileExports);
 }
+// This is the production entry, see:
+// https://github.com/vikejs/vike/blob/798e5465dc3e3e6723b38b601a50350c0a006fb8/packages/vike/node/vite/plugins/pluginBuild/pluginBuildEntry.ts#L47
 async function setGlobalContext_buildEntry(buildEntry) {
     debug('setGlobalContext_buildEntry()');
     setIsProduction(true);
@@ -268,6 +275,7 @@ async function setGlobalContext_buildEntry(buildEntry) {
     (0, utils_js_1.assert)(globalObject.buildEntry); // ensure no infinite loop
     await loadBuildEntry();
     assertGlobalContextIsDefined();
+    debug('setGlobalContext_buildEntry() - done');
 }
 function assertBuildEntry(buildEntry) {
     (0, utils_js_1.assert)((0, utils_js_1.isObject)(buildEntry));
@@ -364,18 +372,29 @@ async function updateUserFiles() {
     return onSuccess();
 }
 async function setGlobalContext(virtualFileExports) {
+    debug('setGlobalContext()');
     (0, utils_js_1.assert)(!(0, getVikeConfigError_js_1.getVikeConfigErrorBuild)());
-    const globalContext = await (0, createGlobalContextShared_js_1.createGlobalContextShared)(virtualFileExports, globalObject, addGlobalContext);
+    const globalContext = await (0, createGlobalContextShared_js_1.createGlobalContextShared)(virtualFileExports, globalObject, addGlobalContextAsync, addGlobalContextSync);
     (0, assertV1Design_js_1.assertV1Design)(
     // pageConfigs is PageConfigRuntime[] but assertV1Design() requires PageConfigBuildTime[]
     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 addGlobalContext(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);
+}
+function addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook) {
     const globalContextBase = {
         isClientSide: false,
         _pageRoutes: pageRoutes,
@@ -434,10 +453,10 @@ async function addGlobalContext(globalContext) {
 }
 function clearGlobalContext() {
     debug('clearGlobalContext()');
-    (0, utils_js_1.objectReplace)(globalObject, getInitialGlobalContext(), ['buildEntryPrevious']);
+    (0, utils_js_1.objectReplace)(globalObject, getInitialGlobalObject(), ['buildEntryPrevious']);
 }
-function getInitialGlobalContext() {
-    debug('getInitialGlobalContext()');
+function getInitialGlobalObject() {
+    debug('getInitialGlobalObject()');
     const { promise: viteDevServerPromise, resolve: viteDevServerPromiseResolve } = (0, utils_js_1.genPromise)();
     return {
         viteDevServerPromise,

package/dist/cjs/node/runtime/html/injectAssets/injectAssets__public.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.injectAssets__public = injectAssets__public;
 const utils_js_1 = require("../../utils.js");
 const injectAssets_js_1 = require("../injectAssets.js");
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 async function injectAssets__public(htmlString, pageContext) {
     (0, utils_js_1.assertWarning)(false, '`_injectAssets()` is deprecated and will be removed.', { onlyOnce: true, showStackTrace: true });
     (0, utils_js_1.assertUsage)(typeof htmlString === 'string', '[injectAssets(htmlString, pageContext)]: Argument `htmlString` should be a string.', { showStackTrace: true });

package/dist/cjs/node/runtime/html/injectAssets/injectHtmlTags.js

@@ -150,6 +150,8 @@ function getTagClosing(tag) {
     return tagClosing;
 }
 function injectAtPlaceholder(htmlFragment, htmlString, isFirst) {
+    // TO-DO/eventually: soft deprecate in favor of https://github.com/vikejs/vike/issues/695
+    // Used by BurdaForward https://github.com/vikejs/vike/discussions/2528#discussioncomment-13637156
     const placeholder = isFirst ? '__VITE_PLUGIN_SSR__ASSETS_FIRST__' : '__VITE_PLUGIN__SSR_ASSETS_LAST__';
     const parts = htmlString.split(placeholder);
     if (parts.length === 1)

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);
@@ -108,7 +133,20 @@ function serializeObject(obj, objName, passToClient) {
     return serialized;
 }
 function serializeValue(value, varName) {
-    return (0, stringify_1.stringify)(value, { forbidReactElements: true, valueName: varName });
+    return (0, stringify_1.stringify)(value, {
+        forbidReactElements: true,
+        valueName: varName,
+        // Prevent Google from crawling URLs in JSON:
+        //  - https://github.com/vikejs/vike/discussions/2541#discussioncomment-13660198
+        //  - https://github.com/vikejs/vike/discussions/2277
+        //  - https://github.com/vikejs/vike/pull/2542
+        replacer(_key, value) {
+            if (typeof value === 'string' && value.startsWith('/')) {
+                // No need to use a reviver: https://github.com/brillout/json-serializer/blob/70fc8ed3741306391b51655b05df24e6963d1fdb/test/main.spec.ts#L74-L80
+                return { replacement: (value = '!' + value) };
+            }
+        },
+    });
 }
 function getPassToClientPageContext(pageContext) {
     let passToClient = [...pageContext._passToClient, ...passToClientBuiltInPageContext];
@@ -144,7 +182,7 @@ function getPageContextClientSerializedAbort(pageContext) {
         (0, utils_js_1.assert)(unknownProps.length === 0);
     }
     else {
-        // TODO/v1-release: remove
+        // TO-DO/next-major-release: remove
         (0, utils_js_1.assertWarning)(unknownProps.length === 0, [
             "The following pageContext values won't be available on the client-side:",
             unknownProps.map((p) => `  pageContext[${JSON.stringify(p)}]`),
@@ -155,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/index-deprecated.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-// TO-DO/soon: point package.json#exports['./server'] to this file.
+// TO-DO/eventually: point package.json#exports['./server'] to this file.
 // - Write migration guide, see comment below.
 __exportStar(require("./index.js"), exports);
 const utils_js_1 = require("./utils.js");

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

@@ -39,7 +39,7 @@ Object.defineProperty(exports, "getGlobalContextSync", { enumerable: true, get:
 Object.defineProperty(exports, "getGlobalContextAsync", { enumerable: true, get: function () { return globalContext_js_1.getGlobalContextAsync; } });
 var index_js_1 = require("../runtime-dev/index.js");
 Object.defineProperty(exports, "createDevMiddleware", { enumerable: true, get: function () { return index_js_1.createDevMiddleware; } });
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 // Deprecated exports
 __exportStar(require("../../types/index-dreprecated.js"), exports);
 var injectAssets__public_js_1 = require("./html/injectAssets/injectAssets__public.js");

package/dist/cjs/node/runtime/page-files/setup.js

@@ -1,3 +1,3 @@
 "use strict";
-// TODO/v1-release: remove https://github.com/vikejs/vike/issues/2122
+// TO-DO/next-major-release: remove https://github.com/vikejs/vike/issues/2122
 // This doesn't do anything anymore. (It's kept to avoid introducing a breaking change.)

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

@@ -15,7 +15,7 @@ function assertArguments(...args) {
         showStackTrace: true,
     });
     (0, utils_js_1.assertUsage)((0, utils_js_1.isObject)(pageContextInit), `${prefix} called with ${picocolors_1.default.code(`typeof pageContextInit === ${JSON.stringify(typeof pageContextInit)}`)} but ${picocolors_1.default.code('pageContextInit')} should be an object.`, { showStackTrace: true });
-    // TODO/v1-release: remove
+    // TO-DO/next-major-release: remove
     if ('url' in pageContextInit) {
         (0, utils_js_1.assertWarning)(false, '`pageContextInit.url` has been renamed to `pageContextInit.urlOriginal`: replace `renderPage({ url })` with `renderPage({ urlOriginal })`. (See https://vike.dev/migration/0.4.23 for more information.)', { showStackTrace: true, onlyOnce: true });
         pageContextInit.urlOriginal = pageContextInit.url;

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

@@ -11,8 +11,8 @@ const utils_js_1 = require("../utils.js");
 const error_page_js_1 = require("../../../shared/error-page.js");
 const getHttpResponseBody_js_1 = require("./getHttpResponseBody.js");
 const getEarlyHints_js_1 = require("./getEarlyHints.js");
-const getCacheControl_js_1 = require("./createHttpResponse/getCacheControl.js");
 const assertNoInfiniteHttpRedirect_js_1 = require("./createHttpResponse/assertNoInfiniteHttpRedirect.js");
+const getCacheControl_js_1 = require("./getCacheControl.js");
 async function createHttpResponsePage(htmlRender, renderHook, pageContext) {
     let statusCode = pageContext.abortStatusCode;
     if (!statusCode) {
@@ -31,10 +31,13 @@ async function createHttpResponsePage(htmlRender, renderHook, pageContext) {
     }
     const earlyHints = (0, getEarlyHints_js_1.getEarlyHints)(await pageContext.__getPageAssets());
     const headers = [];
-    const cacheControl = (0, getCacheControl_js_1.getCacheControl)(pageContext.pageId, pageContext._globalContext._pageConfigs, statusCode);
-    if (cacheControl) {
-        headers.push(['Cache-Control', cacheControl]);
-    }
+    const headersResponse = pageContext.headersResponse || new Headers();
+    headersResponse.forEach((value, key) => {
+        headers.push([key, value]);
+    });
+    // An 5xx error page shouldn't be cached (it should be temporary)
+    if (statusCode >= 500)
+        headersResponse.set('Cache-Control', getCacheControl_js_1.cacheControlDisable);
     return createHttpResponse(statusCode, 'text/html;charset=utf-8', headers, htmlRender, earlyHints, renderHook);
 }
 function createHttpResponse404(errMsg404) {
@@ -104,7 +107,7 @@ function createHttpResponse(statusCode, contentType, headers, htmlRender, earlyH
     return {
         statusCode,
         headers,
-        // TODO/v1-release: remove
+        // TO-DO/next-major-release: remove
         get contentType() {
             (0, utils_js_1.assertWarning)(false, 'pageContext.httpResponse.contentType is deprecated and will be removed in the next major release. Use pageContext.httpResponse.headers instead, see https://vike.dev/migration/0.4.134', { onlyOnce: true });
             return contentType;

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

@@ -5,7 +5,7 @@ exports.createPageContextServerSideWithoutGlobalContext = createPageContextServe
 const utils_js_1 = require("../utils.js");
 const getPageContextUrlComputed_js_1 = require("../../../shared/getPageContextUrlComputed.js");
 const createPageContextShared_js_1 = require("../../../shared/createPageContextShared.js");
-async function createPageContextServerSide(pageContextInit, globalContext, { isPrerendering, ssr: { urlHandler, isClientSideNavigation } = {
+function createPageContextServerSide(pageContextInit, globalContext, { isPrerendering, ssr: { urlHandler, isClientSideNavigation } = {
     urlHandler: null,
     isClientSideNavigation: false,
 }, }) {
@@ -13,7 +13,7 @@ async function createPageContextServerSide(pageContextInit, globalContext, { isP
     const pageContextCreated = createPageContext(pageContextInit, isPrerendering);
     (0, utils_js_1.objectAssign)(pageContextCreated, {
         _globalContext: globalContext,
-        _pageFilesAll: globalContext._pageFilesAll, // TODO/v1-release: remove
+        _pageFilesAll: globalContext._pageFilesAll, // TO-DO/next-major-release: remove
         // We use pageContext._baseServer and pageContext._baseAssets instead of pageContext._globalContext.baseServer and pageContext._globalContext.baseAssets because the Base URLs can (eventually one day if needed) be made non-global
         _baseServer: globalContext.baseServer,
         _baseAssets: globalContext.baseAssets,
@@ -35,7 +35,7 @@ async function createPageContextServerSide(pageContextInit, globalContext, { isP
         }
         else if (pageContextInit.headers) {
             headers = pageContextInit.headers;
-            // TODO/next-major-release: remove
+            // TO-DO/next-major-release: remove
             (0, utils_js_1.assertWarning)(false, 'Setting pageContextInit.headers is deprecated: set pageContextInit.headersOriginal instead, see https://vike.dev/headers', { onlyOnce: true });
         }
         else {
@@ -43,7 +43,7 @@ async function createPageContextServerSide(pageContextInit, globalContext, { isP
         }
         (0, utils_js_1.objectAssign)(pageContextCreated, { headers });
     }
-    const pageContextAugmented = await (0, createPageContextShared_js_1.createPageContextShared)(pageContextCreated, globalContext._pageConfigGlobal, globalContext._vikeConfigPublicGlobal);
+    const pageContextAugmented = (0, createPageContextShared_js_1.createPageContextShared)(pageContextCreated, globalContext._vikeConfigPublicGlobal);
     (0, utils_js_1.augmentType)(pageContextCreated, pageContextAugmented);
     return pageContextCreated;
 }

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

@@ -8,7 +8,7 @@ async function execHookDataAndOnBeforeRender(pageContext) {
         return;
     }
     const hooks = await (0, execHookServer_js_1.execHookServer)('data', pageContext);
-    const dataHook = hooks[0]; // TO-DO/soon: support cumulative
+    const dataHook = hooks[0]; // TO-DO/soon/cumulative-hooks: support cumulative
     if (dataHook) {
         // Note: hookReturn can be anything (e.g. an object) and is to be assigned to pageContext.data
         const pageContextFromHook = {
@@ -21,7 +21,7 @@ async function execHookDataAndOnBeforeRender(pageContext) {
         }
     }
     const res = await (0, execHookServer_js_1.execHookServer)('onBeforeRender', pageContext);
-    const onBeforeRenderHook = res[0]; // TO-DO/soon: support cumulative
+    const onBeforeRenderHook = res[0]; // TO-DO/soon/cumulative-hooks: support cumulative
     if (onBeforeRenderHook) {
         const { hookReturn } = onBeforeRenderHook;
         (0, assertOnBeforeRenderHookReturn_js_1.assertOnBeforeRenderHookReturn)(hookReturn, onBeforeRenderHook.hookFilePath);