vike 0.4.235 → 0.4.236-commit-85d361d

package/dist/cjs/node/runtime/renderPage/{createHttpResponse/getCacheControl.js → getCacheControl.js}

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.cacheControlDisable = void 0;
 exports.getCacheControl = getCacheControl;
-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
+const helpers_js_1 = require("../../../shared/page-configs/helpers.js");
+const getConfigValueRuntime_js_1 = require("../../../shared/page-configs/getConfigValueRuntime.js");
+const cacheControlDisable = 'no-store, max-age=0';
+exports.cacheControlDisable = cacheControlDisable;
+function getCacheControl(pageId, pageConfigs) {
+    // TO-DO/next-major-release: remove this line
     if (pageConfigs.length === 0)
-        return defaultValue;
-    if (statusCode > 499)
-        return defaultValue;
+        return cacheControlDisable;
     if (pageId) {
         const pageConfig = (0, helpers_js_1.getPageConfig)(pageId, pageConfigs);
         const configValue = (0, getConfigValueRuntime_js_1.getConfigValueRuntime)(pageConfig, 'cacheControl', 'string');
@@ -20,5 +20,5 @@ function getCacheControl(pageId, pageConfigs, statusCode) {
     // - Disabling caching by default is the safest strategy, because caching is problematic with authentication as described in https://github.com/vikejs/vike/issues/1275#issuecomment-1824366875
     // - Are there use cases when we don't need to disable caching?
     //   - When there isn't any <script id="vike_pageContext" type="application/json"> then we can safely have caching. (We don't implement this exception because we're lazy and it's quite a rare situation.)
-    return defaultValue;
+    return cacheControlDisable;
 }

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

@@ -11,17 +11,19 @@ const findPageConfig_js_1 = require("../../../shared/page-configs/findPageConfig
 const analyzePage_js_1 = require("./analyzePage.js");
 const loadConfigValues_js_1 = require("../../../shared/page-configs/loadConfigValues.js");
 const execHookServer_js_1 = require("./execHookServer.js");
+const getCacheControl_js_1 = require("./getCacheControl.js");
 async function loadPageConfigsLazyServerSideAndExecHook(pageContext) {
     const pageContextAddendum = await loadPageConfigsLazyServerSide(pageContext);
     (0, utils_js_1.objectAssign)(pageContext, pageContextAddendum);
     await (0, execHookServer_js_1.execHookServer)('onCreatePageContext', pageContext);
     return pageContext;
 }
+// TODO/now: define new function resolveAfterLoad() ?
 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([
-        loadPageUserFiles(pageContext._globalContext._pageFilesAll, pageConfig, globalContext._pageConfigGlobal, pageContext.pageId, !globalContext._isProduction),
+    const [{ pageFilesLoaded, configPublicPageLazy }] = await Promise.all([
+        loadPageConfigFiles(pageContext._globalContext._pageFilesAll, pageConfig, globalContext._pageConfigGlobal, pageContext.pageId, !globalContext._isProduction),
         (0, analyzePageClientSide_js_1.analyzePageClientSideInit)(pageContext._globalContext._pageFilesAll, pageContext.pageId, {
             sharedPageFilesAlreadyLoaded: true,
         }),
@@ -31,28 +33,27 @@ 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 } = v;
+            // const { definedAt } = v
+            // assertUsage(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),
+        headersResponse: resolveHeadersResponse(pageContext, pageContextAddendum),
     });
     (0, utils_js_1.objectAssign)(pageContextAddendum, {
         __getPageAssets: async () => {
@@ -66,7 +67,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', {
@@ -105,13 +106,31 @@ async function loadPageConfigsLazyServerSide(pageContext) {
     });
     return pageContextAddendum;
 }
-async function loadPageUserFiles(pageFilesAll, pageConfig, pageConfigGlobal, pageId, isDev) {
+async function loadPageConfigFiles(pageFilesAll, pageConfig, pageConfigGlobal, pageId, isDev) {
     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,
     };
 }
+function resolveHeadersResponse(pageContext, pageContextAddendum) {
+    const headersResponse = mergeHeaders(pageContextAddendum.config.headersResponse);
+    if (!headersResponse.get('Cache-Control')) {
+        const cacheControl = (0, getCacheControl_js_1.getCacheControl)(pageContext.pageId, pageContext._globalContext._pageConfigs);
+        if (cacheControl)
+            headersResponse.set('Cache-Control', cacheControl);
+    }
+    return headersResponse;
+}
+function mergeHeaders(headersList = []) {
+    const headersMerged = new Headers();
+    headersList.forEach((headers) => {
+        new Headers(headers).forEach((value, key) => {
+            headersMerged.append(key, value);
+        });
+    });
+    return headersMerged;
+}

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

@@ -19,6 +19,7 @@ const preparePageContextForPublicUsageServer_js_1 = require("./preparePageContex
 const execHookGuard_js_1 = require("../../../shared/route/execHookGuard.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const isServerSideError_js_1 = require("../../../shared/misc/isServerSideError.js");
+// TODO/now: rename?
 async function renderPageAlreadyRouted(pageContext) {
     // pageContext.pageId can either be the:
     //  - ID of the page matching the routing, or the

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);
@@ -174,9 +174,7 @@ async function renderPageOnError(errNominalPage, pageContextBegin, pageContextNo
             (0, utils_js_1.objectAssign)(pageContextErrorPageInit, { pageId: null });
             return (0, handleErrorWithoutErrorPage_js_1.handleErrorWithoutErrorPage)(pageContextErrorPageInit);
         }
-        else {
-            (0, utils_js_1.objectAssign)(pageContextErrorPageInit, { pageId: errorPageId });
-        }
+        (0, utils_js_1.objectAssign)(pageContextErrorPageInit, { pageId: errorPageId });
     }
     let pageContextErrorPage;
     try {
@@ -313,9 +311,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';

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

@@ -30,13 +30,13 @@ function pluginCommon(vikeVitePluginOptions) {
                         ? (0, prepareViteApiCall_js_1.normalizeViteRoot)(configFromUser.root)
                         : await (0, prepareViteApiCall_js_1.getViteRoot)(operation);
                     (0, utils_js_1.assert)(rootResolvedEarly);
-                    // TODO/v1-release: we can remove setVikeConfigContext() call here since with Vike's CLI it's already called at vike/node/api/prepareViteApiCall.ts
+                    // TO-DO/next-major-release: we can remove setVikeConfigContext() call here since with Vike's CLI it's already called at vike/node/api/prepareViteApiCall.ts
                     (0, resolveVikeConfigInternal_js_1.setVikeConfigContext)({ userRootDir: rootResolvedEarly, isDev, vikeVitePluginOptions });
                     const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
                     return {
                         _isDev: isDev,
                         _rootResolvedEarly: rootResolvedEarly,
-                        // TODO/v1-release: remove https://github.com/vikejs/vike/issues/2122
+                        // TO-DO/next-major-release: remove https://github.com/vikejs/vike/issues/2122
                         configVikePromise: Promise.resolve({
                             prerender: vikeConfig.prerenderContext.isPrerenderingEnabled,
                         }),
@@ -58,7 +58,11 @@ function pluginCommon(vikeVitePluginOptions) {
             configResolved: {
                 order: 'post',
                 async handler(config) {
-                    /* TODO: do this after implementing vike.config.js and new setting transformLinkedDependencies (or probably a better name like transpileLinkedDependencies/bundleLinkedDependencies or something else)
+                    /* Also externalize linked dependencies by default?
+                     * - Can this be done while the user sets ssr.external to `string[]`? I guess not?
+                     *   - If not then it's a problem: it makes the default inconsistent.
+                     * - https://vite.dev/config/ssr-options.html#ssr-external
+                     * - New setting +transpileLinkedDependencies ?
                     overrideViteDefaultSsrExternal(config)
                     //*/
                     workaroundCI(config);
@@ -162,7 +166,7 @@ function assertVikeCliOrApi(config) {
         onlyOnce: true,
     });
 }
-// TODO/v1-release: remove https://github.com/vikejs/vike/issues/2122
+// TO-DO/next-major-release: remove https://github.com/vikejs/vike/issues/2122
 function temp_supportOldInterface(config) {
     if (!('vitePluginSsr' in config))
         return;

package/dist/cjs/node/vite/plugins/pluginDev.js

@@ -25,7 +25,7 @@ function pluginDev() {
             config() {
                 return {
                     appType: 'custom',
-                    // TODO:v1-release: remove (AFAICT we only need to use config.optimizeDeps for the old design)
+                    // TO-DO/next-major-release: remove (AFAICT we only need to use config.optimizeDeps for the old design)
                     optimizeDeps: {
                         exclude: [
                             // We exclude Vike's client runtime to be able to use Vite's import.meta.glob()

package/dist/cjs/node/vite/plugins/pluginEnvVars.js

@@ -11,7 +11,7 @@ const getFilePath_js_1 = require("../shared/getFilePath.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
 const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
 const applyRegExWithMagicString_js_1 = require("../shared/applyRegExWithMagicString.js");
-// TODO/enventually:
+// TO-DO/eventually:
 // - Make import.meta.env work inside +config.js
 //   - For it to work, we'll probably need the user to define the settings (e.g. `envDir`) for loadEnv() inside vike.config.js instead of vite.config.js
 //   - Or stop using Vite's `mode` implementation and have Vike implement its own `mode` feature? (So that the only dependencies are `$ vike build --mode staging` and `$ MODE=staging vike build`.)

package/dist/cjs/node/vite/plugins/pluginFileEnv.js

@@ -124,7 +124,7 @@ function pluginFileEnv() {
         return modulePath.includes(suffixWrong);
     }
     function skip(id) {
-        // TODO/v1-release: remove
+        // TO-DO/next-major-release: remove
         if (pluginExtractAssets_js_1.extractAssetsRE.test(id) || pluginExtractExportNames_js_1.extractExportNamesRE.test(id))
             return true;
         if (!id.includes(getSuffix('client')) && !id.includes(getSuffix('server')))

package/dist/cjs/node/vite/plugins/pluginVirtualFiles.js

@@ -25,7 +25,7 @@ function pluginVirtualFiles() {
         name: 'vike:pluginVirtualFiles',
         async configResolved(config_) {
             config = config_;
-            // TODO/v1-release: remove
+            // TO-DO/next-major-release: remove
             if (!(0, resolveVikeConfigInternal_js_1.isV1Design)())
                 config.experimental.importGlobRestoreExtension = true;
         },

package/dist/cjs/node/vite/shared/addSsrMiddleware.js

@@ -21,7 +21,7 @@ function addSsrMiddleware(middlewares, config, isPreview, isPrerenderingEnabled)
         };
         Object.defineProperty(pageContextInit, 'userAgent', {
             get() {
-                // TODO/next-major-release: assertUsage() instead of assertWarning()
+                // TO-DO/next-major-release: assertUsage() instead of assertWarning()
                 (0, utils_js_1.assertWarning)(false, `${picocolors_1.default.cyan('pageContext.userAgent')} is deprecated: use ${picocolors_1.default.cyan("pageContext.headers['user-agent']")} instead.`, {
                     showStackTrace: true,
                     onlyOnce: true,

package/dist/cjs/node/vite/shared/loggerNotProd.js

@@ -1,10 +1,14 @@
 "use strict";
-// Non-production logger used for:
-//  - Development
-//  - Preview
-//  - Build
-//  - Pre-rendering
-// In other words: everywhere except in production
+// TO-DO/eventually:
+// - New hook onLog(): https://github.com/vikejs/vike/issues/1438
+// - Exact same logs between prod and dev, only difference is that some log objects have:
+//   - `isDevLog: true`
+//   - `willBeLogged: false` in production
+//   - `showTimestamp: true`
+// - Never clear screen (it's complex with little benefit)
+//   - Add shortcut to clear screen
+//   - Maybe rotate colors upon no requests within 30s?
+// - Only show a one-liner init log (instead of Vite's multi-line log)
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js

@@ -87,7 +87,7 @@ const configDefinitionsBuiltIn = {
         env: { client: true },
         eager: true,
     },
-    // TODO/v1-release: remove
+    // TO-DO/next-major-release: remove
     prefetchStaticAssets: {
         env: { client: true },
     },
@@ -212,6 +212,10 @@ const configDefinitionsBuiltIn = {
         env: { server: true },
         global: true,
     },
+    headersResponse: {
+        env: { server: true },
+        cumulative: true,
+    },
 };
 exports.configDefinitionsBuiltIn = configDefinitionsBuiltIn;
 function getConfigEnv(configValueSources, configName) {

package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/crawlPlusFiles.js

@@ -35,9 +35,7 @@ async function crawlPlusFiles(userRootDir) {
         : // Fallback to tinyglobby for users that dynamically generate plus files. (Assuming that no plus file is found because of the user's .gitignore list.)
             filesGlob;
     (0, utils_js_1.assert)(files);
-    if (debug.isActivated) {
-        (0, utils_js_1.assert)(filesGit);
-        (0, utils_js_1.assert)(filesGlob);
+    if (debug.isActivated && filesGit && filesGlob) {
         (0, utils_js_1.assertWarning)((0, utils_js_1.deepEqual)(filesGlob.slice().sort(), filesGit.slice().sort()), "Git and glob results aren't matching.", { onlyOnce: false });
     }
     // Filter build files

package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/filesystemRouting.js

@@ -36,12 +36,10 @@ function getFilesystemRouteString(locationId) {
 function getInheritanceRoot(locationId) {
     return getLogicalPath(locationId, [
         'renderer',
-        // - Enable hooks defined by vike-{react,vue,solid} such as +onBeforeRenderClient to be defined at the root directory. In other words, avoid following error:
-        //   ```bash
-        //   [11:09:43.072][/test-preview.test.ts][npm run preview][stderr] Error: [vike][Wrong Usage] /+onBeforeRenderClient.ts sets the value of the config onBeforeRenderClient which is a custom config that is defined with https://vike.dev/meta at a path that doesn't apply to / — see https://vike.dev/config#inheritance
-        //   ```
-        // - Not sure if it's a good idea? Could it make config inheritance confusing? Let's try for now and see how it goes.
-        // - TO-DO/eventually: update docs https://github.com/vikejs/vike/blob/5fcdc4d5094f1a4dcbefc0b481cdd30a205aef2d/docs/pages/filesystem-routing/%2BPage.mdx?plain=1#L98
+        // Enable hooks defined by vike-{react,vue,solid} such as +onBeforeRenderClient to be defined at the root directory. In other words, avoid following error:
+        // ```bash
+        // [11:09:43.072][/test-preview.test.ts][npm run preview][stderr] Error: [vike][Wrong Usage] /+onBeforeRenderClient.ts sets the value of the config onBeforeRenderClient which is a custom config that is defined with https://vike.dev/meta at a path that doesn't apply to / — see https://vike.dev/config#inheritance
+        // ```
         'pages',
     ]);
 }

package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/transpileAndExecuteFile.js

@@ -352,7 +352,7 @@ function isTemporaryBuildFile(filePath) {
     const fileName = node_path_1.default.posix.basename(filePath);
     return /\.build-[a-z0-9]{12}\.mjs$/.test(fileName);
 }
-// TODO/next-major: remove
+// TO-DO/next-major-release: remove
 function isHeaderFile(filePath) {
     (0, utils_js_1.assertPosixPath)(filePath);
     const fileExtensions = getFileExtensions(filePath);

package/dist/cjs/node/vite/shared/resolveVikeConfigInternal.js

@@ -44,7 +44,7 @@ let restartVite = false;
 let vikeConfigHasBuildError = null;
 let isV1Design_ = null;
 let vikeConfigPromise = null;
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 let vikeConfigSync = null;
 let vikeConfigCtx = null; // Information provided by Vite's `config` and Vike's CLI. We could, if we want or need to, completely remove the dependency on Vite.
 let prerenderContext;
@@ -56,14 +56,14 @@ function reloadVikeConfig() {
 }
 async function getVikeConfigInternal(
 // I don't remember the logic behind it — neither why we restart Vite's dev server, nor why we sometimes don't.
-// TO-DO: eventually rethink all that. Some + settings are expected to influence Vite's config (restarting Vite's dev server is needed) while some don't.
+// TO-DO/eventually: re-think all that. Some + settings are expected to influence Vite's config (restarting Vite's dev server is needed) while some don't.
 doNotRestartViteOnError = false) {
     (0, utils_js_1.assert)(vikeConfigCtx);
     const { userRootDir, isDev, vikeVitePluginOptions } = vikeConfigCtx;
     const vikeConfig = await getOrResolveVikeConfig(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError);
     return vikeConfig;
 }
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 function getVikeConfigInternalSync() {
     (0, utils_js_1.assert)(vikeConfigSync);
     return vikeConfigSync;
@@ -487,7 +487,7 @@ function sortConfigValueSources(configValueSources, locationIdPage) {
                 return sortAfterInheritanceOrderPage(source1.plusFile, source2.plusFile, locationIdPage, configName);
             }
         })
-            // TODO/next-major: remove
+            // TO-DO/next-major-release: remove
             // Interop with vike(options) in vite.config.js — make it least precedence.
             .sort((0, utils_js_1.makeLast)((source) => !source.plusFile));
     });
@@ -783,7 +783,7 @@ function assertMetaUsage(metaVal, metaConfigDefinedAt) {
             }
             configEnv = getConfigEnvValue(def.env, `${metaConfigDefinedAt} sets ${picocolors_1.default.cyan(`meta.${configName}.env`)} to`);
             // Overwrite deprecated value with valid value
-            // TODO/v1-release: remove once support for the deprecated values is removed
+            // TO-DO/next-major-release: remove once support for the deprecated values is removed
             if (typeof def.env === 'string')
                 def.env = configEnv;
         }
@@ -1029,7 +1029,7 @@ function determineIsErrorPage(routeFilesystem) {
 function getConfigEnvValue(val, errMsgIntro) {
     const errInvalidValue = `${errMsgIntro} an invalid value ${picocolors_1.default.cyan(JSON.stringify(val))}`;
     // Legacy outdated values
-    // TODO/v1-release: remove
+    // TO-DO/next-major-release: remove
     if (typeof val === 'string') {
         const valConverted = (() => {
             if (val === 'client-only')

package/dist/cjs/shared/RenderErrorPage.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RenderErrorPage = void 0;
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 var abort_js_1 = require("./route/abort.js");
 Object.defineProperty(exports, "RenderErrorPage", { enumerable: true, get: function () { return abort_js_1.RenderErrorPage; } });

package/dist/cjs/shared/abort.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.render = exports.redirect = void 0;
-// TODO/v1-release: Move all universal imports (when using Client Routing) to:
+// TO-DO/next-major-release: Move all universal imports (when using Client Routing) to:
 //   import {
 //     redirect,
 //     render,

package/dist/cjs/shared/createGlobalContextShared.js

@@ -10,10 +10,26 @@ const prepareGlobalContextForPublicUsage_js_1 = require("./prepareGlobalContextF
 const getHook_js_1 = require("./hooks/getHook.js");
 const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
 exports.getGlobalContextSyncErrMsg = getGlobalContextSyncErrMsg;
-async function createGlobalContextShared(virtualFileExports, globalObject, addGlobalContext) {
+async function createGlobalContextShared(virtualFileExports, globalObject, addGlobalContextAsync, addGlobalContextSync) {
     const globalContext = createGlobalContextBase(virtualFileExports);
-    const globalContextAddendum = await addGlobalContext?.(globalContext);
-    (0, utils_js_1.objectAssign)(globalContext, globalContextAddendum);
+    let isNewGlobalContext;
+    if (!globalObject.globalContext) {
+        globalObject.globalContext = globalContext;
+        isNewGlobalContext = false;
+    }
+    else {
+        isNewGlobalContext = true;
+    }
+    if (addGlobalContextSync &&
+        // TODO/next-major-release: remove
+        globalContext._pageConfigs.length > 0) {
+        const globalContextAddendum = addGlobalContextSync?.(globalContext);
+        (0, utils_js_1.objectAssign)(globalContext, globalContextAddendum);
+    }
+    else {
+        const globalContextAddendum = await addGlobalContextAsync?.(globalContext);
+        (0, utils_js_1.objectAssign)(globalContext, globalContextAddendum);
+    }
     const onCreateGlobalContextHooks = (0, getHook_js_1.getHookFromPageConfigGlobalCumulative)(globalContext._pageConfigGlobal, 'onCreateGlobalContext');
     let hooksCalled = false;
     if (!hooksAreEqual(globalObject.onCreateGlobalContextHooks ?? [], onCreateGlobalContextHooks)) {
@@ -21,10 +37,7 @@ async function createGlobalContextShared(virtualFileExports, globalObject, addGl
         await (0, execHook_js_1.execHookGlobal)('onCreateGlobalContext', globalContext._pageConfigGlobal, null, globalContext, prepareGlobalContextForPublicUsage_js_1.prepareGlobalContextForPublicUsage);
         hooksCalled = true;
     }
-    if (!globalObject.globalContext) {
-        globalObject.globalContext = globalContext;
-    }
-    else {
+    if (isNewGlobalContext) {
         // Singleton: ensure all `globalContext` user-land references are preserved & updated.
         if (hooksCalled) {
             (0, utils_js_1.objectReplace)(globalObject.globalContext, globalContext);

package/dist/cjs/shared/createPageContextShared.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPageContextShared = createPageContextShared;
 exports.createPageContextObject = createPageContextObject;
 const utils_js_1 = require("./utils.js");
-// TODO/now: make this and parents sync
-async function createPageContextShared(pageContextCreated, pageConfigGlobal, vikeConfigPublicGlobal) {
+function createPageContextShared(pageContextCreated, vikeConfigPublicGlobal) {
     (0, utils_js_1.objectAssign)(pageContextCreated, vikeConfigPublicGlobal);
     return pageContextCreated;
 }

package/dist/cjs/shared/determinePageIdOld.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.determinePageIdOld = determinePageIdOld;
 const utils_js_1 = require("./utils.js");
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 function determinePageIdOld(filePath) {
     const pageSuffix = '.page.';
     const pageId = (0, utils_js_1.slice)(filePath.split(pageSuffix), 0, -1).join(pageSuffix);

package/dist/cjs/shared/error-page.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getErrorPageId = getErrorPageId;
 exports.isErrorPageId = isErrorPageId;
 exports.isErrorPage = isErrorPage;
-// TODO/v1-release: consider loading this file only for Client Routing
+// TO-DO/next-major-release: consider loading this file only for Client Routing
 const utils_js_1 = require("./utils.js");
 function getErrorPageId(pageFilesAll, pageConfigs) {
     if (pageConfigs.length > 0) {
@@ -13,7 +13,7 @@ function getErrorPageId(pageFilesAll, pageConfigs) {
         (0, utils_js_1.assertUsage)(errorPageConfigs.length === 1, 'Only one error page can be defined');
         return errorPageConfigs[0].pageId;
     }
-    // TODO/v1-release: remove
+    // TO-DO/next-major-release: remove
     const errorPageIds = (0, utils_js_1.unique)(pageFilesAll.map(({ pageId }) => pageId).filter((pageId) => isErrorPageId(pageId, false)));
     (0, utils_js_1.assertUsage)(errorPageIds.length <= 1, `Only one _error.page.js is allowed, but found several: ${errorPageIds.join(' ')}`);
     if (errorPageIds.length > 0) {
@@ -23,7 +23,7 @@ function getErrorPageId(pageFilesAll, pageConfigs) {
     }
     return null;
 }
-// TODO/v1-release: remove
+// TO-DO/next-major-release: remove
 function isErrorPageId(pageId, _isV1Design) {
     (0, utils_js_1.assert)(!pageId.includes('\\'));
     return pageId.includes('/_error');