vike 0.4.234 → 0.4.235-commit-7b1ab35

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

@@ -84,7 +84,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/esm/node/cli/index.js

@@ -1,4 +1,4 @@
-// TODO/v1-release: remove this file
+// TO-DO/next-major-release: remove this file
 export { prerender } from '../api/prerender.js';
 import { assertWarning } from '../../utils/assert.js';
 import pc from '@brillout/picocolors';

package/dist/esm/node/createPageRenderer.js

@@ -1,4 +1,4 @@
-// TODO/v1-release: remove this file
+// TO-DO/next-major-release: remove this file
 //import { SsrEnv, setSsrEnv } from './ssrEnv.js'
 import { renderPage } from './runtime/renderPage.js';
 import { assertWarning } from './runtime/utils.js';

package/dist/esm/node/importBuild.js

@@ -1,3 +1,3 @@
-// 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");
 export {};

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

@@ -12,7 +12,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/esm/node/prerender/index.js

@@ -1,4 +1,4 @@
-// TODO/v1-release: remove this file
+// TO-DO/next-major-release: remove this file
 export { prerender } from '../api/prerender.js';
 import { assertWarning } from '../../utils/assert.js';
 import pc from '@brillout/picocolors';

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

@@ -22,7 +22,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 ?? [];
@@ -37,7 +37,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/esm/node/prerender/runPrerender.js

@@ -49,7 +49,7 @@ async function runPrerender(options = {}, trigger) {
     const { partial, noExtraDir, parallel, defaultLocalValue, isPrerenderingEnabled } = prerenderConfigGlobal;
     if (!isPrerenderingEnabled) {
         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(
@@ -131,7 +131,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);
@@ -294,7 +294,7 @@ async function createPageContextPrerendering(urlOriginal, prerenderContext, glob
         urlOriginal,
         ...prerenderContext._pageContextInit,
     };
-    const pageContext = await createPageContextServerSide(pageContextInit, globalContext, {
+    const pageContext = createPageContextServerSide(pageContextInit, globalContext, {
         isPrerendering: true,
     });
     assert(pageContext.isPrerendering === true);
@@ -385,7 +385,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 = getHookTimeoutDefault('onBeforePrerender');
         const pageFilesWithOnBeforePrerenderHook = globalContext._pageFilesAll.filter((p) => {
@@ -425,7 +425,7 @@ async function callOnPrerenderStartHook(prerenderContext, globalContext, concurr
     assertUsage(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() {
                 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 });
@@ -455,7 +455,7 @@ async function callOnPrerenderStartHook(prerenderContext, globalContext, concurr
     }
     const errPrefix = `The ${hookName}() hook exported by ${hookFilePath}`;
     const rightUsage = `${errPrefix} should return ${pc.cyan('null')}, ${pc.cyan('undefined')}, or ${pc.cyan('{ prerenderContext: { pageContexts } }')}`;
-    // TODO/v1-release: remove
+    // TO-DO/next-major-release: remove
     if (hasProp(result, 'globalContext')) {
         assertUsage(isObjectWithKeys(result, ['globalContext']) &&
             hasProp(result, 'globalContext', 'object') &&
@@ -472,7 +472,7 @@ async function callOnPrerenderStartHook(prerenderContext, globalContext, concurr
         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 && !isPropertyGetter(pageContext, 'url')) {
             assertWarning(false, msgPrefix +
                 ' provided pageContext.url but it should provide pageContext.urlOriginal instead, see https://vike.dev/migration/0.4.23', { onlyOnce: true });
@@ -533,10 +533,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))
@@ -639,7 +635,7 @@ function normalizeOnPrerenderHookResult(prerenderResult, prerenderHookFile, hook
         return prerenderElement;
     }
 }
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 function checkOutdatedOptions(options) {
     assertUsage(options.root === undefined, 'Option `prerender({ root })` deprecated: set `prerender({ viteConfig: { root }})` instead.', { showStackTrace: true });
     assertUsage(options.configFile === undefined, 'Option `prerender({ configFile })` deprecated: set `prerender({ viteConfig: { configFile }})` instead.', { showStackTrace: true });
@@ -684,7 +680,7 @@ function assertIsNotAbort(err, urlOriginal) {
     assertUsage(false, `${pc.cyan(abortCall)} thrown${thrownBy} while pre-rendering ${urlOriginal} but ${pc.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/esm/node/runtime/globalContext.d.ts

@@ -164,8 +164,6 @@ declare function getGlobalContextAsync(isProduction: boolean): Promise<GlobalCon
  * Get runtime information about your app.
  *
  * https://vike.dev/getGlobalContext
- *
- * @deprecated
  */
 declare function getGlobalContextSync(): GlobalContext;
 declare function setGlobalContext_viteDevServer(viteDevServer: ViteDevServer): Promise<void>;

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

@@ -99,17 +99,19 @@ async function getGlobalContextAsync(isProduction) {
  * Get runtime information about your app.
  *
  * https://vike.dev/getGlobalContext
- *
- * @deprecated
  */
 function getGlobalContextSync() {
     debug('getGlobalContextSync()');
     const { globalContext } = globalObjectTyped;
     assertUsage(globalContext, getGlobalContextSyncErrMsg);
-    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;
+    assert(typeof isProd === 'boolean');
+    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() {

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

@@ -1,7 +1,7 @@
 export { injectAssets__public };
 import { assertUsage, assertWarning, castProp, hasProp } from '../../utils.js';
 import { injectHtmlTagsToString } from '../injectAssets.js';
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 async function injectAssets__public(htmlString, pageContext) {
     assertWarning(false, '`_injectAssets()` is deprecated and will be removed.', { onlyOnce: true, showStackTrace: true });
     assertUsage(typeof htmlString === 'string', '[injectAssets(htmlString, pageContext)]: Argument `htmlString` should be a string.', { showStackTrace: true });

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

@@ -139,7 +139,7 @@ function getPageContextClientSerializedAbort(pageContext) {
         assert(unknownProps.length === 0);
     }
     else {
-        // TODO/v1-release: remove
+        // TO-DO/next-major-release: remove
         assertWarning(unknownProps.length === 0, [
             "The following pageContext values won't be available on the client-side:",
             unknownProps.map((p) => `  pageContext[${JSON.stringify(p)}]`),

package/dist/esm/node/runtime/index-deprecated.js

@@ -1,4 +1,4 @@
-// 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.
 export * from './index.js';
 import { assertWarning } from './utils.js';

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

@@ -7,7 +7,7 @@ export { pipeWebStream, pipeNodeStream, pipeStream, stampPipe } from './html/str
 export { PROJECT_VERSION as version } from './utils.js';
 export { getGlobalContext, getGlobalContextSync, getGlobalContextAsync } from './globalContext.js';
 export { createDevMiddleware } from '../runtime-dev/index.js';
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 // Deprecated exports
 export * from '../../types/index-dreprecated.js';
 export { injectAssets__public as _injectAssets } from './html/injectAssets/injectAssets__public.js';

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

@@ -1,3 +1,3 @@
 export {};
-// 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/esm/node/runtime/renderPage/assertArguments.js

@@ -10,7 +10,7 @@ function assertArguments(...args) {
         showStackTrace: true,
     });
     assertUsage(isObject(pageContextInit), `${prefix} called with ${pc.code(`typeof pageContextInit === ${JSON.stringify(typeof pageContextInit)}`)} but ${pc.code('pageContextInit')} should be an object.`, { showStackTrace: true });
-    // TODO/v1-release: remove
+    // TO-DO/next-major-release: remove
     if ('url' in pageContextInit) {
         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/esm/node/runtime/renderPage/createHttpResponse/getCacheControl.js

@@ -3,7 +3,7 @@ import { getPageConfig } from '../../../../shared/page-configs/helpers.js';
 import { getConfigValueRuntime } from '../../../../shared/page-configs/getConfigValueRuntime.js';
 const defaultValue = 'no-store, max-age=0';
 function getCacheControl(pageId, pageConfigs, statusCode) {
-    // TODO/v1-release: remove
+    // TO-DO/next-major-release: remove
     if (pageConfigs.length === 0)
         return defaultValue;
     if (statusCode > 499)

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

@@ -102,7 +102,7 @@ function createHttpResponse(statusCode, contentType, headers, htmlRender, earlyH
     return {
         statusCode,
         headers,
-        // TODO/v1-release: remove
+        // TO-DO/next-major-release: remove
         get contentType() {
             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/esm/node/runtime/renderPage/createPageContextServerSide.d.ts

@@ -13,7 +13,7 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
 } | {
     isPrerendering: true;
     ssr?: undefined;
-}): Promise<{
+}): {
     _isOriginalObject: true;
     isPageContext: true;
 } & {
@@ -125,7 +125,7 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
     url: string;
 } & {
     headers: Record<string, string> | null;
-}>;
+};
 declare function createPageContextServerSideWithoutGlobalContext(pageContextInit: PageContextInit): {
     _isOriginalObject: true;
     isPageContext: true;

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

@@ -3,7 +3,7 @@ export { createPageContextServerSideWithoutGlobalContext };
 import { assert, assertUsage, assertWarning, augmentType, normalizeHeaders, objectAssign } from '../utils.js';
 import { getPageContextUrlComputed } from '../../../shared/getPageContextUrlComputed.js';
 import { createPageContextObject, createPageContextShared } from '../../../shared/createPageContextShared.js';
-async function createPageContextServerSide(pageContextInit, globalContext, { isPrerendering, ssr: { urlHandler, isClientSideNavigation } = {
+function createPageContextServerSide(pageContextInit, globalContext, { isPrerendering, ssr: { urlHandler, isClientSideNavigation } = {
     urlHandler: null,
     isClientSideNavigation: false,
 }, }) {
@@ -11,7 +11,7 @@ async function createPageContextServerSide(pageContextInit, globalContext, { isP
     const pageContextCreated = createPageContext(pageContextInit, isPrerendering);
     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,
@@ -33,7 +33,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
             assertWarning(false, 'Setting pageContextInit.headers is deprecated: set pageContextInit.headersOriginal instead, see https://vike.dev/headers', { onlyOnce: true });
         }
         else {
@@ -41,7 +41,7 @@ async function createPageContextServerSide(pageContextInit, globalContext, { isP
         }
         objectAssign(pageContextCreated, { headers });
     }
-    const pageContextAugmented = await createPageContextShared(pageContextCreated, globalContext._pageConfigGlobal, globalContext._vikeConfigPublicGlobal);
+    const pageContextAugmented = createPageContextShared(pageContextCreated, globalContext._vikeConfigPublicGlobal);
     augmentType(pageContextCreated, pageContextAugmented);
     return pageContextCreated;
 }

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

@@ -6,7 +6,7 @@ async function execHookDataAndOnBeforeRender(pageContext) {
         return;
     }
     const hooks = await 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 = {
@@ -19,7 +19,7 @@ async function execHookDataAndOnBeforeRender(pageContext) {
         }
     }
     const res = await 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;
         assertOnBeforeRenderHookReturn(hookReturn, onBeforeRenderHook.hookFilePath);

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

@@ -56,7 +56,7 @@ function getHttpResponseBodyStreamHandlers(htmlRender, renderHook) {
             const body = await getHtmlString(htmlRender);
             return body;
         },
-        // TODO/v1-release: remove
+        // TO-DO/next-major-release: remove
         async getNodeStream() {
             assertWarning(false, '`pageContext.httpResponse.getNodeStream()` is outdated, use `pageContext.httpResponse.getReadableNodeStream()` instead. ' +
                 streamDocs, { onlyOnce: true, showStackTrace: true });
@@ -66,7 +66,7 @@ function getHttpResponseBodyStreamHandlers(htmlRender, renderHook) {
             }
             return nodeStream;
         },
-        // TODO/v1-release: remove
+        // TO-DO/next-major-release: remove
         getWebStream() {
             assertWarning(false, '`pageContext.httpResponse.getWebStream(res)` is outdated, use `pageContext.httpResponse.getReadableWebStream(res)` instead. ' +
                 streamDocs, { onlyOnce: true, showStackTrace: true });
@@ -76,7 +76,7 @@ function getHttpResponseBodyStreamHandlers(htmlRender, renderHook) {
             }
             return webStream;
         },
-        // TODO/v1-release: remove
+        // TO-DO/next-major-release: remove
         pipeToWebWritable(writable) {
             assertWarning(false, '`pageContext.httpResponse.pipeToWebWritable(res)` is outdated, use `pageContext.httpResponse.pipe(res)` instead. ' +
                 streamDocs, { onlyOnce: true, showStackTrace: true });
@@ -85,7 +85,7 @@ function getHttpResponseBodyStreamHandlers(htmlRender, renderHook) {
                 assertUsage(false, getErrMsg(htmlRender, renderHook, 'pipeToWebWritable()'));
             }
         },
-        // TODO/v1-release: remove
+        // TO-DO/next-major-release: remove
         pipeToNodeWritable(writable) {
             assertWarning(false, '`pageContext.httpResponse.pipeToNodeWritable(res)` is outdated, use `pageContext.httpResponse.pipe(res)` instead. ' +
                 streamDocs, { onlyOnce: true, showStackTrace: true });

package/dist/esm/node/runtime/renderPage/getPageAssets/retrieveAssetsProd.js

@@ -9,7 +9,7 @@ function retrieveAssetsProd(clientDependencies, assetsManifest, includeAssetsImp
     clientDependencies.forEach(({ id, onlyAssets, eagerlyImported }) => {
         if (eagerlyImported)
             return; // Eagerly imported assets aren't imported with import() and therefore don't create a new Rollup entry and aren't listed in the manifest file
-        // TODO/v1-release: remove
+        // TO-DO/next-major-release: remove
         if (includeAssetsImportedByServer &&
             onlyAssets &&
             id.includes('.page.server.') &&

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 { assert, assertUsage, assertWarning, hasProp, isArrayOfStrings, objectAssign, isArray, } from '../utils.js';
+import { assertUsage, assertWarning, hasProp, objectAssign, isArrayOfStrings } from '../utils.js';
 import { getPageAssets } from './getPageAssets.js';
 import { debugPageFiles } from './debugPageFiles.js';
 import { findPageConfig } from '../../../shared/page-configs/findPageConfig.js';
@@ -18,7 +18,7 @@ async function loadPageConfigsLazyServerSideAndExecHook(pageContext) {
 async function loadPageConfigsLazyServerSide(pageContext) {
     const pageConfig = findPageConfig(pageContext._globalContext._pageConfigs, pageContext.pageId); // Make pageConfig globally available as pageContext._pageConfig ?
     const globalContext = pageContext._globalContext;
-    const [{ pageFilesLoaded, pageContextExports }] = await Promise.all([
+    const [{ pageFilesLoaded, configPublicPageLazy }] = await Promise.all([
         loadPageUserFiles(pageContext._globalContext._pageFilesAll, pageConfig, globalContext._pageConfigGlobal, pageContext.pageId, !globalContext._isProduction),
         analyzePageClientSideInit(pageContext._globalContext._pageFilesAll, pageContext.pageId, {
             sharedPageFilesAlreadyLoaded: true,
@@ -29,25 +29,22 @@ async function loadPageConfigsLazyServerSide(pageContext) {
     const passToClient = [];
     const errMsg = ' should be an array of strings.';
     if (!isV1Design) {
-        pageContextExports.exportsAll.passToClient?.forEach((e) => {
+        configPublicPageLazy.exportsAll.passToClient?.forEach((e) => {
             assertUsage(hasProp(e, 'exportValue', 'string[]'), `${e.exportSource}${errMsg}`);
             passToClient.push(...e.exportValue);
         });
     }
     else {
-        pageContextExports.configEntries.passToClient?.forEach((e) => {
-            const { configValue } = e;
-            assert(isArray(configValue));
-            const vals = configValue.flat(1);
-            // TODO: improve error message by using (upcoming) new data structure instead of configEntries
-            assertUsage(isArrayOfStrings(vals), `${e.configDefinedAt}${errMsg}`);
-            passToClient.push(...vals);
+        configPublicPageLazy.from.configsCumulative.passToClient?.values.forEach((v) => {
+            const { value, definedAt } = v;
+            assertUsage(isArrayOfStrings(value), `+passToClient value defined at ${definedAt}${errMsg}`);
+            passToClient.push(...value);
         });
     }
     const pageContextAddendum = {};
-    objectAssign(pageContextAddendum, pageContextExports);
+    objectAssign(pageContextAddendum, configPublicPageLazy);
     objectAssign(pageContextAddendum, {
-        Page: pageContextExports.exports.Page,
+        Page: configPublicPageLazy.exports.Page,
         _isHtmlOnly: isHtmlOnly,
         _passToClient: passToClient,
         _pageFilePathsLoaded: pageFilesLoaded.map((p) => p.filePath),
@@ -64,7 +61,7 @@ async function loadPageConfigsLazyServerSide(pageContext) {
             }
         },
     });
-    // TODO/v1-release: remove
+    // TO-DO/next-major-release: remove
     Object.assign(pageContextAddendum, {
         _getPageAssets: async () => {
             assertWarning(false, 'pageContext._getPageAssets() deprecated, see https://vike.dev/preloading', {
@@ -107,9 +104,9 @@ async function loadPageUserFiles(pageFilesAll, pageConfig, pageConfigGlobal, pag
     const pageFilesServerSide = getPageFilesServerSide(pageFilesAll, pageId);
     const pageConfigLoaded = !pageConfig ? null : await loadConfigValues(pageConfig, isDev);
     await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
-    const pageContextExports = resolveVikeConfigPublicPageLazy(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
+    const configPublicPageLazy = resolveVikeConfigPublicPageLazy(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
     return {
-        pageContextExports,
+        configPublicPageLazy,
         pageFilesLoaded: pageFilesServerSide,
     };
 }

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

@@ -1,7 +1,7 @@
 export { preparePageContextForPublicUsageServer };
 import { assertPropertyGetters, preparePageContextForPublicUsage, } from '../../../shared/preparePageContextForPublicUsage.js';
 function preparePageContextForPublicUsageServer(pageContext) {
-    // 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()
     assertPropertyGetters(pageContext);
     pageContext = preparePageContextForPublicUsage(pageContext);
     return pageContext;

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

@@ -10,7 +10,7 @@ type PageContextInit = Pick<PageContextInternalServer, 'urlOriginal' | 'headersO
     /** @deprecated Set `pageContextInit.urlOriginal` instead  */ url?: string;
     /** @deprecated Set pageContextInit.headersOriginal instead */ headers?: Record<string, string>;
 };
-type PageContextBegin = Awaited<ReturnType<typeof getPageContextBegin>>;
+type PageContextBegin = ReturnType<typeof getPageContextBegin>;
 declare function renderPage<PageContextUserAdded extends {}, PageContextInitUser extends PageContextInit>(pageContextInit: PageContextInitUser): Promise<PageContextInitUser & {
     httpResponse: HttpResponse;
 } & Partial<PageContextServer & PageContextUserAdded>>;
@@ -18,7 +18,7 @@ declare let asyncHookWrapper: <PageContext>(_httpRequestId: number, ret: () => P
     pageContextReturn: Awaited<PageContext>;
 }>;
 declare function renderPage_addAsyncHookwrapper(wrapper: typeof asyncHookWrapper): void;
-declare function getPageContextBegin(pageContextInit: PageContextInit, globalContext: GlobalContextServerInternal, httpRequestId: number): Promise<{
+declare function getPageContextBegin(pageContextInit: PageContextInit, globalContext: GlobalContextServerInternal, httpRequestId: number): {
     _isOriginalObject: true;
     isPageContext: true;
 } & {
@@ -132,4 +132,4 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
     headers: Record<string, string> | null;
 } & {
     _httpRequestId: number;
-}>;
+};

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

@@ -79,7 +79,7 @@ async function renderPagePrepare(pageContextInit, httpRequestId) {
         }
     }
     const { globalContext } = await getGlobalContextServerInternal();
-    const pageContextBegin = await getPageContextBegin(pageContextInit, globalContext, httpRequestId);
+    const pageContextBegin = getPageContextBegin(pageContextInit, globalContext, httpRequestId);
     // Check Base URL
     {
         const pageContextHttpResponse = await checkBaseUrl(pageContextBegin, globalContext);
@@ -308,9 +308,9 @@ async function getPageContextErrorPageInit(pageContextBegin, errNominalPage, pag
     assert(pageContext.errorWhileRendering);
     return pageContext;
 }
-async function getPageContextBegin(pageContextInit, globalContext, httpRequestId) {
+function getPageContextBegin(pageContextInit, globalContext, httpRequestId) {
     const { isClientSideNavigation, _urlHandler } = handlePageContextUrl(pageContextInit.urlOriginal);
-    const pageContextBegin = await createPageContextServerSide(pageContextInit, globalContext, {
+    const pageContextBegin = createPageContextServerSide(pageContextInit, globalContext, {
         isPrerendering: false,
         ssr: {
             urlHandler: _urlHandler,

package/dist/esm/node/vite/index.js

@@ -1,6 +1,6 @@
 export default plugin;
 export { plugin };
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 export { plugin as ssr };
 export { getVikeConfig } from './shared/resolveVikeConfigInternal.js';
 export { PROJECT_VERSION as version } from './utils.js';

package/dist/esm/node/vite/onLoad.js

@@ -10,7 +10,7 @@ function onLoad() {
     assertNodeVersion();
     // package.json#peerDependencies isn't enough as users often ignore it
     // This assertion isn't reliable: the user may still use a Vite version older than 5.1.0 — see https://github.com/vitejs/vite/pull/19355
-    // TO-DO/soon: let's also use this.meta.viteVersion https://github.com/vitejs/vite/pull/20088
+    // TO-DO/eventually: let's also use this.meta.viteVersion https://github.com/vitejs/vite/pull/20088
     assertVersion('Vite', version, '5.1.0');
     // Ensure we don't bloat the server runtime with heavy dependencies such Vite and esbuild
     assertIsNotProductionRuntime();

package/dist/esm/node/vite/plugins/pluginBuild/pluginBuildConfig.js

@@ -56,7 +56,7 @@ function pluginBuildConfig() {
 async function getEntries(config) {
     const vikeConfig = await getVikeConfigInternal();
     const { _pageConfigs: pageConfigs } = vikeConfig;
-    // TODO/v1-release: remove
+    // TO-DO/next-major-release: remove
     const pageFileEntries = await getPageFileEntries(config, resolveIncludeAssetsImportedByServer(vikeConfig.config));
     assertUsage(Object.keys(pageFileEntries).length !== 0 || pageConfigs.length !== 0, 'At least one page should be defined, see https://vike.dev/add');
     if (isViteServerBuild(config)) {

package/dist/esm/node/vite/plugins/pluginBuild/pluginBuildEntry.js

@@ -33,7 +33,7 @@ function getServerProductionEntryCode(config) {
     const importPath = getImportPath(config);
     const buildInfo = {
         versionAtBuildTime: PROJECT_VERSION,
-        usesClientRouter: isUsingClientRouter(), // TODO/v1-release: remove
+        usesClientRouter: isUsingClientRouter(), // TO-DO/next-major-release: remove
         viteConfigRuntime: getViteConfigRuntime(config),
     };
     assertBuildInfo(buildInfo);

package/dist/esm/node/vite/plugins/pluginBuild/pluginDistPackageJsonFile.js

@@ -6,7 +6,6 @@
  *   require() of dist/server/pageFiles.js from node_modules/vike/dist/esm/node/runtime/page-files/setup.js is an ES module file as it is a .js file whose nearest parent package.json contains "type": "module" which defines all .js files in that package scope as ES modules.
  * Reproduction: https://github.com/brillout/vite-plugin-ssr-server-import-syntax
  */
-// TODO/refactor: prefix all other plugins with `plugin` as well?
 export { pluginDistPackageJsonFile };
 import { rollupIsEsm } from '../../shared/rollupIsEsm.js';
 import { isViteServerBuild } from '../../shared/isViteServerBuild.js';

package/dist/esm/node/vite/plugins/pluginCommon/assertResolveAlias.js

@@ -14,7 +14,7 @@ import pc from '@brillout/picocolors';
 // - @vitejs/plugin-vue2
 //   - https://github.com/vikejs/vike/issues/1329
 function assertResolveAlias(config) {
-    // TODO: re-implement warning https://github.com/vikejs/vike/issues/1567
+    // TO-DO/eventually: re-implement warning https://github.com/vikejs/vike/issues/1567
     return;
     const aliases = getAliases(config);
     const errPrefix = config.configFile || 'Your Vite configuration';