vike 0.4.233 → 0.4.235-commit-16164c3

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

@@ -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() {

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

@@ -165,9 +165,26 @@ async function getHtmlTags(pageContext, streamFromReactStreamingPackage, injectF
 }
 function mergeScriptEntries(pageAssets, viteDevScript) {
     const scriptEntries = pageAssets.filter((pageAsset) => pageAsset.isEntry && pageAsset.assetType === 'script');
-    const scriptTagsHtml = `${viteDevScript}${scriptEntries.map((asset) => (0, inferHtmlTags_js_1.inferAssetTag)(asset)).join('')}`;
-    const scriptTag = (0, mergeScriptTags_js_1.mergeScriptTags)(scriptTagsHtml);
-    return scriptTag;
+    let scriptEntry = `${viteDevScript}${scriptEntries.map((asset) => (0, inferHtmlTags_js_1.inferAssetTag)(asset)).join('')}`;
+    // We merge scripts to avoid the infamous HMR preamble error.
+    // - Infamous HMR preamble error:
+    //   ```browser-console
+    //   usePageContext.tsx:10 Uncaught (in promise) Error: @vitejs/plugin-react can't detect preamble. Something is wrong.
+    //       at usePageContext.tsx:10:10
+    //   ```
+    // - Note the following race condition. Maybe making the second script non-async ensures execution order?
+    //   ```html
+    //   <script type="module">console.log("I can be printed *after* the other log")</script>
+    //   <script src="entry.js" type="module" async></script>
+    //   ```
+    //   ```js
+    //   // entry.js
+    //   console.log("I can be printed *before* the other log")
+    //   ```
+    // - Maybe an alternative would be to make Vike's client runtime entry <script> tag non-async. Would that work? Would it be a performance issue?
+    //   - The entry <script> shouldn't be `<script defer>` upon HTML streaming, otherwise progressive hydration while SSR streaming won't work.
+    scriptEntry = (0, mergeScriptTags_js_1.mergeScriptTags)(scriptEntry);
+    return scriptEntry;
 }
 function getPageContextJsonScriptTag(pageContext) {
     const pageContextClientSerialized = (0, sanitizeJson_js_1.sanitizeJson)((0, serializeContext_js_1.getPageContextClientSerialized)(pageContext));

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/mergeScriptTags.js

@@ -21,7 +21,13 @@ function mergeScriptTags(scriptTagsHtml) {
                 const hasInnerHtml = !!innerHtml.trim();
                 if (src) {
                     (0, utils_js_1.assert)(!hasInnerHtml);
-                    contents.push(`import ${JSON.stringify(src)};`);
+                    // - We don't use a static import because static imports are hoisted => React's HMR preamble can be executed after user land code => triggering this error:
+                    //   ```
+                    //   [22:28:57.885][/test-dev.test.ts][pnpm run dev][Browser Error] Error: @vitejs/plugin-react-swc can't detect preamble. Something is wrong.
+                    //       at http://localhost:3000/@fs/home/rom/code/docpress/src/renderer/usePageContext.tsx:9:11
+                    //   ```
+                    // - We don't use `await` the dynamic import() to avoid waterfall
+                    contents.push(`import(${JSON.stringify(src)});`);
                 }
                 else if (hasInnerHtml) {
                     innerHtml = innerHtml.split('\n').filter(Boolean).join('\n');

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

@@ -144,7 +144,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)}]`),

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/getCacheControl.js

@@ -5,7 +5,7 @@ const helpers_js_1 = require("../../../../shared/page-configs/helpers.js");
 const getConfigValueRuntime_js_1 = require("../../../../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/cjs/node/runtime/renderPage/createHttpResponse.js

@@ -104,7 +104,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);

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

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

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

@@ -11,7 +11,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/cjs/node/runtime/renderPage/loadPageConfigsLazyServerSide.js

@@ -20,7 +20,7 @@ async function loadPageConfigsLazyServerSideAndExecHook(pageContext) {
 async function loadPageConfigsLazyServerSide(pageContext) {
     const pageConfig = (0, findPageConfig_js_1.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),
         (0, analyzePageClientSide_js_1.analyzePageClientSideInit)(pageContext._globalContext._pageFilesAll, pageContext.pageId, {
             sharedPageFilesAlreadyLoaded: true,
@@ -31,25 +31,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) => {
             (0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(e, 'exportValue', 'string[]'), `${e.exportSource}${errMsg}`);
             passToClient.push(...e.exportValue);
         });
     }
     else {
-        pageContextExports.configEntries.passToClient?.forEach((e) => {
-            const { configValue } = e;
-            (0, utils_js_1.assert)((0, utils_js_1.isArray)(configValue));
-            const vals = configValue.flat(1);
-            // TODO: improve error message by using (upcoming) new data structure instead of configEntries
-            (0, utils_js_1.assertUsage)((0, utils_js_1.isArrayOfStrings)(vals), `${e.configDefinedAt}${errMsg}`);
-            passToClient.push(...vals);
+        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}`);
+            passToClient.push(...value);
         });
     }
     const pageContextAddendum = {};
-    (0, utils_js_1.objectAssign)(pageContextAddendum, pageContextExports);
+    (0, utils_js_1.objectAssign)(pageContextAddendum, configPublicPageLazy);
     (0, utils_js_1.objectAssign)(pageContextAddendum, {
-        Page: pageContextExports.exports.Page,
+        Page: configPublicPageLazy.exports.Page,
         _isHtmlOnly: isHtmlOnly,
         _passToClient: passToClient,
         _pageFilePathsLoaded: pageFilesLoaded.map((p) => p.filePath),
@@ -66,7 +63,7 @@ async function loadPageConfigsLazyServerSide(pageContext) {
             }
         },
     });
-    // TODO/v1-release: remove
+    // TO-DO/next-major-release: remove
     Object.assign(pageContextAddendum, {
         _getPageAssets: async () => {
             (0, utils_js_1.assertWarning)(false, 'pageContext._getPageAssets() deprecated, see https://vike.dev/preloading', {
@@ -109,9 +106,9 @@ async function loadPageUserFiles(pageFilesAll, pageConfig, pageConfigGlobal, pag
     const pageFilesServerSide = (0, getPageFiles_js_1.getPageFilesServerSide)(pageFilesAll, pageId);
     const pageConfigLoaded = !pageConfig ? null : await (0, loadConfigValues_js_1.loadConfigValues)(pageConfig, isDev);
     await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
-    const pageContextExports = (0, resolveVikeConfigPublic_js_1.resolveVikeConfigPublicPageLazy)(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
+    const configPublicPageLazy = (0, resolveVikeConfigPublic_js_1.resolveVikeConfigPublicPageLazy)(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
     return {
-        pageContextExports,
+        configPublicPageLazy,
         pageFilesLoaded: pageFilesServerSide,
     };
 }

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.preparePageContextForPublicUsageServer = preparePageContextForPublicUsageServer;
 const preparePageContextForPublicUsage_js_1 = require("../../../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()
     (0, preparePageContextForPublicUsage_js_1.assertPropertyGetters)(pageContext);
     pageContext = (0, preparePageContextForPublicUsage_js_1.preparePageContextForPublicUsage)(pageContext);
     return pageContext;

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

@@ -84,7 +84,7 @@ async function renderPagePrepare(pageContextInit, httpRequestId) {
         }
     }
     const { globalContext } = await (0, globalContext_js_1.getGlobalContextServerInternal)();
-    const pageContextBegin = await getPageContextBegin(pageContextInit, globalContext, httpRequestId);
+    const pageContextBegin = getPageContextBegin(pageContextInit, globalContext, httpRequestId);
     // Check Base URL
     {
         const pageContextHttpResponse = await checkBaseUrl(pageContextBegin, globalContext);
@@ -313,9 +313,9 @@ async function getPageContextErrorPageInit(pageContextBegin, errNominalPage, pag
     (0, utils_js_1.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 (0, createPageContextServerSide_js_1.createPageContextServerSide)(pageContextInit, globalContext, {
+    const pageContextBegin = (0, createPageContextServerSide_js_1.createPageContextServerSide)(pageContextInit, globalContext, {
         isPrerendering: false,
         ssr: {
             urlHandler: _urlHandler,

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

@@ -12,7 +12,7 @@ function onLoad() {
     (0, assertNodeVersion_js_1.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
     (0, assertVersion_js_1.assertVersion)('Vite', vite_1.version, '5.1.0');
     // Ensure we don't bloat the server runtime with heavy dependencies such Vite and esbuild
     (0, assertSetup_js_1.assertIsNotProductionRuntime)();

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

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

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

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

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

@@ -19,7 +19,7 @@ const picocolors_1 = __importDefault(require("@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';