vike 0.4.235-commit-8f42b16 → 0.4.235-commit-9b9289b

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

@@ -42,7 +42,7 @@ const loggerRuntime_js_1 = require("./loggerRuntime.js");
 const getVikeConfigError_js_1 = require("../shared/getVikeConfigError.js");
 const isNewError_js_1 = require("./renderPage/isNewError.js");
 const debug = (0, utils_js_1.createDebugger)('vike:globalContext');
-const globalObject = (0, utils_js_1.getGlobalObject)('runtime/globalContext.ts', getInitialGlobalContext());
+const globalObject = (0, utils_js_1.getGlobalObject)('runtime/globalContext.ts', getInitialGlobalObject());
 // Trick to break down TypeScript circular dependency
 // https://chat.deepseek.com/a/chat/s/d7e9f90a-c7f3-4108-9cd5-4ad6caed3539
 const globalObjectTyped = globalObject;
@@ -236,6 +236,7 @@ function assertViteManifest(manifest) {
 async function loadBuildEntry(outDir) {
     debug('loadBuildEntry()');
     if (globalObject.globalContext) {
+        debug('loadBuildEntry() - already done');
         return;
     }
     if (!globalObject.buildEntry) {
@@ -261,6 +262,8 @@ async function loadBuildEntry(outDir) {
     globalObject.buildInfo = buildEntry.buildInfo;
     await setGlobalContext(buildEntry.virtualFileExports);
 }
+// This is the production entry, see:
+// https://github.com/vikejs/vike/blob/798e5465dc3e3e6723b38b601a50350c0a006fb8/packages/vike/node/vite/plugins/pluginBuild/pluginBuildEntry.ts#L47
 async function setGlobalContext_buildEntry(buildEntry) {
     debug('setGlobalContext_buildEntry()');
     setIsProduction(true);
@@ -270,6 +273,7 @@ async function setGlobalContext_buildEntry(buildEntry) {
     (0, utils_js_1.assert)(globalObject.buildEntry); // ensure no infinite loop
     await loadBuildEntry();
     assertGlobalContextIsDefined();
+    debug('setGlobalContext_buildEntry() - done');
 }
 function assertBuildEntry(buildEntry) {
     (0, utils_js_1.assert)((0, utils_js_1.isObject)(buildEntry));
@@ -366,8 +370,9 @@ async function updateUserFiles() {
     return onSuccess();
 }
 async function setGlobalContext(virtualFileExports) {
+    debug('setGlobalContext()');
     (0, utils_js_1.assert)(!(0, getVikeConfigError_js_1.getVikeConfigErrorBuild)());
-    const globalContext = await (0, createGlobalContextShared_js_1.createGlobalContextShared)(virtualFileExports, globalObject, addGlobalContext);
+    const globalContext = await (0, createGlobalContextShared_js_1.createGlobalContextShared)(virtualFileExports, globalObject, addGlobalContextAsync, addGlobalContextSync);
     (0, assertV1Design_js_1.assertV1Design)(
     // pageConfigs is PageConfigRuntime[] but assertV1Design() requires PageConfigBuildTime[]
     globalContext._pageConfigs.length > 0, globalContext._pageFilesAll);
@@ -376,8 +381,15 @@ async function setGlobalContext(virtualFileExports) {
     // Never actually used, only used for TypeScript `ReturnType<typeof setGlobalContext>`
     return globalContext;
 }
-async function addGlobalContext(globalContext) {
+async function addGlobalContextAsync(globalContext) {
     const { pageRoutes, onBeforeRouteHook } = await (0, loadPageRoutes_js_1.loadPageRoutes)(globalContext._pageFilesAll, globalContext._pageConfigs, globalContext._pageConfigGlobal, globalContext._allPageIds);
+    return addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook);
+}
+function addGlobalContextSync(globalContext) {
+    const { pageRoutes, onBeforeRouteHook } = (0, loadPageRoutes_js_1.loadPageRoutesSync)(globalContext._pageFilesAll, globalContext._pageConfigs, globalContext._pageConfigGlobal, globalContext._allPageIds);
+    return addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook);
+}
+function addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook) {
     const globalContextBase = {
         isClientSide: false,
         _pageRoutes: pageRoutes,
@@ -436,10 +448,10 @@ async function addGlobalContext(globalContext) {
 }
 function clearGlobalContext() {
     debug('clearGlobalContext()');
-    (0, utils_js_1.objectReplace)(globalObject, getInitialGlobalContext(), ['buildEntryPrevious']);
+    (0, utils_js_1.objectReplace)(globalObject, getInitialGlobalObject(), ['buildEntryPrevious']);
 }
-function getInitialGlobalContext() {
-    debug('getInitialGlobalContext()');
+function getInitialGlobalObject() {
+    debug('getInitialGlobalObject()');
     const { promise: viteDevServerPromise, resolve: viteDevServerPromiseResolve } = (0, utils_js_1.genPromise)();
     return {
         viteDevServerPromise,

package/dist/cjs/node/runtime/renderPage/createHttpResponse/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) {
-    // TO-DO/next-major-release: remove
+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/createHttpResponse.js

@@ -11,8 +11,8 @@ const utils_js_1 = require("../utils.js");
 const error_page_js_1 = require("../../../shared/error-page.js");
 const getHttpResponseBody_js_1 = require("./getHttpResponseBody.js");
 const getEarlyHints_js_1 = require("./getEarlyHints.js");
-const getCacheControl_js_1 = require("./createHttpResponse/getCacheControl.js");
 const assertNoInfiniteHttpRedirect_js_1 = require("./createHttpResponse/assertNoInfiniteHttpRedirect.js");
+const getCacheControl_js_1 = require("./createHttpResponse/getCacheControl.js");
 async function createHttpResponsePage(htmlRender, renderHook, pageContext) {
     let statusCode = pageContext.abortStatusCode;
     if (!statusCode) {
@@ -31,10 +31,13 @@ async function createHttpResponsePage(htmlRender, renderHook, pageContext) {
     }
     const earlyHints = (0, getEarlyHints_js_1.getEarlyHints)(await pageContext.__getPageAssets());
     const headers = [];
-    const cacheControl = (0, getCacheControl_js_1.getCacheControl)(pageContext.pageId, pageContext._globalContext._pageConfigs, statusCode);
-    if (cacheControl) {
-        headers.push(['Cache-Control', cacheControl]);
-    }
+    const headersResponse = pageContext.headersResponse || new Headers();
+    headersResponse.forEach((value, key) => {
+        headers.push([key, value]);
+    });
+    // An 5xx error page shouldn't be cached (it should be temporary)
+    if (statusCode >= 500)
+        headersResponse.set('Cache-Control', getCacheControl_js_1.cacheControlDisable);
     return createHttpResponse(statusCode, 'text/html;charset=utf-8', headers, htmlRender, earlyHints, renderHook);
 }
 function createHttpResponse404(errMsg404) {

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

@@ -11,12 +11,15 @@ 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("./createHttpResponse/getCacheControl.js");
+// TODO/now: rename?
 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: rename?
 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;
@@ -50,6 +53,7 @@ async function loadPageConfigsLazyServerSide(pageContext) {
         _isHtmlOnly: isHtmlOnly,
         _passToClient: passToClient,
         _pageFilePathsLoaded: pageFilesLoaded.map((p) => p.filePath),
+        headersResponse: resolveHeadersResponse(pageContext, pageContextAddendum),
     });
     (0, utils_js_1.objectAssign)(pageContextAddendum, {
         __getPageAssets: async () => {
@@ -102,6 +106,7 @@ async function loadPageConfigsLazyServerSide(pageContext) {
     });
     return pageContextAddendum;
 }
+// TODO/now: rename?
 async function loadPageUserFiles(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);
@@ -112,3 +117,23 @@ async function loadPageUserFiles(pageFilesAll, pageConfig, pageConfigGlobal, pag
         pageFilesLoaded: pageFilesServerSide,
     };
 }
+function resolveHeadersResponse(
+// TODO/now: merge pageContextAddendum with pageContext
+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/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

@@ -175,6 +175,7 @@ async function renderPageOnError(errNominalPage, pageContextBegin, pageContextNo
             return (0, handleErrorWithoutErrorPage_js_1.handleErrorWithoutErrorPage)(pageContextErrorPageInit);
         }
         else {
+            // TODO/now: minor refactor
             (0, utils_js_1.objectAssign)(pageContextErrorPageInit, { pageId: errorPageId });
         }
     }

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

@@ -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/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/shared/createGlobalContextShared.js

@@ -10,10 +10,24 @@ 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 && 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 +35,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/route/loadPageRoutes.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadPageRoutes = loadPageRoutes;
+exports.loadPageRoutesSync = loadPageRoutesSync;
 const error_page_js_1 = require("../error-page.js");
 const utils_js_1 = require("./utils.js");
 const deduceRouteStringFromFilesystemPath_js_1 = require("./deduceRouteStringFromFilesystemPath.js");
@@ -12,8 +13,13 @@ const getHook_js_1 = require("../hooks/getHook.js");
 async function loadPageRoutes(
 // Remove all arguments and use GlobalContextServerInternal instead?
 pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds) {
-    // TO-DO/next-major-release: remove & make this function sync
+    // TO-DO/next-major-release: remove this line, remove this function, rename loadPageRoutesSync() to loadPageRoutes()
     await Promise.all(pageFilesAll.filter((p) => p.fileType === '.page.route').map((p) => p.loadFile?.()));
+    return loadPageRoutesSync(pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds);
+}
+function loadPageRoutesSync(
+// Remove all arguments and use GlobalContextServerInternal instead?
+pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds) {
     const { onBeforeRouteHook, filesystemRoots } = getGlobalHooks(pageFilesAll, pageConfigs, pageConfigGlobal);
     const pageRoutes = getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds);
     return { pageRoutes, onBeforeRouteHook };

package/dist/cjs/utils/PROJECT_VERSION.js

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

package/dist/esm/client/runtime-client-routing/getPageContextFromHooks.d.ts

@@ -85,6 +85,7 @@ declare function getPageContextFromHooks_isHydration(pageContext: PageContextSer
         urlOriginal: string;
         headers: Record<string, string> | null;
         headersOriginal?: unknown;
+        headersResponse: Headers;
         is404: boolean | null;
         isClientSideNavigation: boolean;
         abortReason?: unknown;
@@ -109,6 +110,7 @@ declare function getPageContextFromHooks_isHydration(pageContext: PageContextSer
         urlOriginal: string;
         headers: Record<string, string> | null;
         headersOriginal?: unknown;
+        headersResponse: Headers;
         is404: boolean | null;
         isClientSideNavigation: boolean;
         abortReason?: unknown;
@@ -156,6 +158,7 @@ declare function getPageContextFromHooks_isHydration(pageContext: PageContextSer
     urlOriginal: string;
     headers: Record<string, string> | null;
     headersOriginal?: unknown;
+    headersResponse: Headers;
     is404: boolean | null;
     isClientSideNavigation: boolean;
     abortReason?: unknown;
@@ -180,6 +183,7 @@ declare function getPageContextFromHooks_isHydration(pageContext: PageContextSer
     urlOriginal: string;
     headers: Record<string, string> | null;
     headersOriginal?: unknown;
+    headersResponse: Headers;
     is404: boolean | null;
     isClientSideNavigation: boolean;
     abortReason?: unknown;
@@ -295,6 +299,7 @@ declare function getPageContextFromClientHooks(pageContext: {
         urlOriginal: string;
         headers: Record<string, string> | null;
         headersOriginal?: unknown;
+        headersResponse: Headers;
         is404: boolean | null;
         isClientSideNavigation: boolean;
         abortReason?: unknown;
@@ -319,6 +324,7 @@ declare function getPageContextFromClientHooks(pageContext: {
         urlOriginal: string;
         headers: Record<string, string> | null;
         headersOriginal?: unknown;
+        headersResponse: Headers;
         is404: boolean | null;
         isClientSideNavigation: boolean;
         abortReason?: unknown;
@@ -364,6 +370,7 @@ declare function getPageContextFromClientHooks(pageContext: {
     urlOriginal: string;
     headers: Record<string, string> | null;
     headersOriginal?: unknown;
+    headersResponse: Headers;
     is404: boolean | null;
     isClientSideNavigation: boolean;
     abortReason?: unknown;
@@ -388,6 +395,7 @@ declare function getPageContextFromClientHooks(pageContext: {
     urlOriginal: string;
     headers: Record<string, string> | null;
     headersOriginal?: unknown;
+    headersResponse: Headers;
     is404: boolean | null;
     isClientSideNavigation: boolean;
     abortReason?: unknown;

package/dist/esm/client/runtime-client-routing/renderPageClientSide.d.ts

@@ -95,6 +95,7 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
         urlOriginal: string;
         headers: Record<string, string> | null;
         headersOriginal?: unknown;
+        headersResponse: Headers;
         is404: boolean | null;
         isClientSideNavigation: boolean;
         abortReason?: unknown;
@@ -119,6 +120,7 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
         urlOriginal: string;
         headers: Record<string, string> | null;
         headersOriginal?: unknown;
+        headersResponse: Headers;
         is404: boolean | null;
         isClientSideNavigation: boolean;
         abortReason?: unknown;

package/dist/esm/client/shared/createGetGlobalContextClient.d.ts

@@ -23,14 +23,14 @@ declare function createGetGlobalContextClient<GlobalContextAddendum extends obje
     pages: {
         [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
     };
-} & Awaited<{
+} & {
     /**
      * Whether the environment is client-side or server-side / pre-rendering.
      *
      * We recommend using `import.meta.env.SSR` instead, see https://vike.dev/globalContext
      */
     isClientSide: true;
-} & Awaited<GlobalContextAddendum>>>;
+} & Awaited<GlobalContextAddendum>>;
 type NeverExported = never;
 declare function getGlobalContext(): Promise<NeverExported>;
 declare function getGlobalContextSync(): NeverExported;

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

@@ -561,6 +561,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
     _isHtmlOnly: boolean;
     _passToClient: string[];
     _pageFilePathsLoaded: string[];
+    headersResponse: Headers;
 } & {
     __getPageAssets: () => Promise<import("../runtime/renderPage/getPageAssets.js").PageAsset[]>;
 })) & {

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

@@ -21,8 +21,10 @@ export type { GlobalContextServerInternal as GlobalContextServerInternal };
 export type { GlobalContextServer };
 import type { ViteManifest } from '../../types/ViteManifest.js';
 import type { ResolvedConfig, ViteDevServer } from 'vite';
+import { type PageRoutes } from '../../shared/route/loadPageRoutes.js';
 import type { ViteConfigRuntime } from '../vite/shared/getViteConfigRuntime.js';
 import type { GlobalContext } from '../../types/PageContext.js';
+import type { Hook } from '../../shared/hooks/getHook.js';
 declare const vikeConfigErrorRecoverMsg: "Vike config loaded";
 type GlobalContextServer = Pick<GlobalContextServerInternal, 'assetsManifest' | 'config' | 'viteConfig' | 'viteConfigRuntime' | 'pages' | 'baseServer' | 'baseAssets' | 'isClientSide'> & Vike.GlobalContext & Vike.GlobalContextServer;
 type GlobalContextServerInternal = Awaited<ReturnType<typeof setGlobalContext>>;
@@ -64,8 +66,8 @@ declare function getGlobalContextServerInternal(): Promise<{
         baseServer: string;
         baseAssets: string;
         isClientSide: false;
-        _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
+        _pageRoutes: PageRoutes;
+        _onBeforeRouteHook: Hook | null;
     }) | (Record<string, unknown> & {
         isGlobalContext: true;
         _isOriginalObject: true;
@@ -104,8 +106,8 @@ declare function getGlobalContextServerInternal(): Promise<{
         baseServer: string;
         baseAssets: string;
         isClientSide: false;
-        _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
+        _pageRoutes: PageRoutes;
+        _onBeforeRouteHook: Hook | null;
     }) | (Record<string, unknown> & {
         isGlobalContext: true;
         _isOriginalObject: true;
@@ -144,8 +146,8 @@ declare function getGlobalContextServerInternal(): Promise<{
         baseServer: string;
         baseAssets: string;
         isClientSide: false;
-        _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
+        _pageRoutes: PageRoutes;
+        _onBeforeRouteHook: Hook | null;
     });
 }>;
 /**
@@ -222,8 +224,8 @@ declare function setGlobalContext(virtualFileExports: unknown): Promise<{
     baseServer: string;
     baseAssets: string;
     isClientSide: false;
-    _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
-    _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
+    _pageRoutes: PageRoutes;
+    _onBeforeRouteHook: Hook | null;
 } | {
     _isPrerendering: true;
     viteConfig: ResolvedConfig;
@@ -244,8 +246,8 @@ declare function setGlobalContext(virtualFileExports: unknown): Promise<{
     baseServer: string;
     baseAssets: string;
     isClientSide: false;
-    _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
-    _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
+    _pageRoutes: PageRoutes;
+    _onBeforeRouteHook: Hook | null;
 } | {
     _isPrerendering: false;
     viteConfig: null;
@@ -266,7 +268,7 @@ declare function setGlobalContext(virtualFileExports: unknown): Promise<{
     baseServer: string;
     baseAssets: string;
     isClientSide: false;
-    _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
-    _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
+    _pageRoutes: PageRoutes;
+    _onBeforeRouteHook: Hook | null;
 })>;
 declare function clearGlobalContext(): void;

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

@@ -13,7 +13,7 @@ export { setGlobalContext_viteDevServer };
 export { setGlobalContext_viteConfig };
 export { setGlobalContext_isPrerendering };
 export { setGlobalContext_isProduction };
-export { setGlobalContext_buildEntry };
+export { setGlobalContext_buildEntry }; // production entry
 export { clearGlobalContext };
 export { assertBuildInfo };
 export { updateUserFiles };
@@ -30,7 +30,7 @@ import { assert, onSetupRuntime, assertUsage, assertWarning, isPlainObject, obje
 import { importServerProductionEntry } from '@brillout/vite-plugin-server-entry/runtime';
 import { virtualFileIdEntryServer } from '../shared/virtualFiles/virtualFileEntry.js';
 import pc from '@brillout/picocolors';
-import { loadPageRoutes } from '../../shared/route/loadPageRoutes.js';
+import { loadPageRoutes, loadPageRoutesSync } from '../../shared/route/loadPageRoutes.js';
 import { assertV1Design } from '../shared/assertV1Design.js';
 import { resolveBase } from '../shared/resolveBase.js';
 import { createGlobalContextShared, getGlobalContextSyncErrMsg, } from '../../shared/createGlobalContextShared.js';
@@ -39,7 +39,7 @@ import { logRuntimeError, logRuntimeInfo } from './loggerRuntime.js';
 import { getVikeConfigErrorBuild, setVikeConfigError } from '../shared/getVikeConfigError.js';
 import { hasAlreadyLogged } from './renderPage/isNewError.js';
 const debug = createDebugger('vike:globalContext');
-const globalObject = getGlobalObject('runtime/globalContext.ts', getInitialGlobalContext());
+const globalObject = getGlobalObject('runtime/globalContext.ts', getInitialGlobalObject());
 // Trick to break down TypeScript circular dependency
 // https://chat.deepseek.com/a/chat/s/d7e9f90a-c7f3-4108-9cd5-4ad6caed3539
 const globalObjectTyped = globalObject;
@@ -232,6 +232,7 @@ function assertViteManifest(manifest) {
 async function loadBuildEntry(outDir) {
     debug('loadBuildEntry()');
     if (globalObject.globalContext) {
+        debug('loadBuildEntry() - already done');
         return;
     }
     if (!globalObject.buildEntry) {
@@ -257,6 +258,8 @@ async function loadBuildEntry(outDir) {
     globalObject.buildInfo = buildEntry.buildInfo;
     await setGlobalContext(buildEntry.virtualFileExports);
 }
+// This is the production entry, see:
+// https://github.com/vikejs/vike/blob/798e5465dc3e3e6723b38b601a50350c0a006fb8/packages/vike/node/vite/plugins/pluginBuild/pluginBuildEntry.ts#L47
 async function setGlobalContext_buildEntry(buildEntry) {
     debug('setGlobalContext_buildEntry()');
     setIsProduction(true);
@@ -266,6 +269,7 @@ async function setGlobalContext_buildEntry(buildEntry) {
     assert(globalObject.buildEntry); // ensure no infinite loop
     await loadBuildEntry();
     assertGlobalContextIsDefined();
+    debug('setGlobalContext_buildEntry() - done');
 }
 function assertBuildEntry(buildEntry) {
     assert(isObject(buildEntry));
@@ -362,8 +366,9 @@ async function updateUserFiles() {
     return onSuccess();
 }
 async function setGlobalContext(virtualFileExports) {
+    debug('setGlobalContext()');
     assert(!getVikeConfigErrorBuild());
-    const globalContext = await createGlobalContextShared(virtualFileExports, globalObject, addGlobalContext);
+    const globalContext = await createGlobalContextShared(virtualFileExports, globalObject, addGlobalContextAsync, addGlobalContextSync);
     assertV1Design(
     // pageConfigs is PageConfigRuntime[] but assertV1Design() requires PageConfigBuildTime[]
     globalContext._pageConfigs.length > 0, globalContext._pageFilesAll);
@@ -372,8 +377,15 @@ async function setGlobalContext(virtualFileExports) {
     // Never actually used, only used for TypeScript `ReturnType<typeof setGlobalContext>`
     return globalContext;
 }
-async function addGlobalContext(globalContext) {
+async function addGlobalContextAsync(globalContext) {
     const { pageRoutes, onBeforeRouteHook } = await loadPageRoutes(globalContext._pageFilesAll, globalContext._pageConfigs, globalContext._pageConfigGlobal, globalContext._allPageIds);
+    return addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook);
+}
+function addGlobalContextSync(globalContext) {
+    const { pageRoutes, onBeforeRouteHook } = loadPageRoutesSync(globalContext._pageFilesAll, globalContext._pageConfigs, globalContext._pageConfigGlobal, globalContext._allPageIds);
+    return addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook);
+}
+function addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook) {
     const globalContextBase = {
         isClientSide: false,
         _pageRoutes: pageRoutes,
@@ -432,10 +444,10 @@ async function addGlobalContext(globalContext) {
 }
 function clearGlobalContext() {
     debug('clearGlobalContext()');
-    objectReplace(globalObject, getInitialGlobalContext(), ['buildEntryPrevious']);
+    objectReplace(globalObject, getInitialGlobalObject(), ['buildEntryPrevious']);
 }
-function getInitialGlobalContext() {
-    debug('getInitialGlobalContext()');
+function getInitialGlobalObject() {
+    debug('getInitialGlobalObject()');
     const { promise: viteDevServerPromise, resolve: viteDevServerPromiseResolve } = genPromise();
     return {
         viteDevServerPromise,

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

@@ -1,5 +1,5 @@
 export { getCacheControl };
+export { cacheControlDisable };
 import type { PageConfigRuntime } from '../../../../types/PageConfig.js';
-import type { HttpResponse } from '../createHttpResponse.js';
-type StatusCode = HttpResponse['statusCode'];
-declare function getCacheControl(pageId: string | null, pageConfigs: PageConfigRuntime[], statusCode: StatusCode): string;
+declare const cacheControlDisable = "no-store, max-age=0";
+declare function getCacheControl(pageId: string | null, pageConfigs: PageConfigRuntime[]): string;

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

@@ -1,13 +1,13 @@
+// TODO/now: move
 export { getCacheControl };
+export { cacheControlDisable };
 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) {
-    // TO-DO/next-major-release: remove
+const cacheControlDisable = 'no-store, max-age=0';
+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 = getPageConfig(pageId, pageConfigs);
         const configValue = getConfigValueRuntime(pageConfig, 'cacheControl', 'string');
@@ -18,5 +18,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/esm/node/runtime/renderPage/createHttpResponse.d.ts

@@ -28,6 +28,7 @@ declare function createHttpResponsePage(htmlRender: HtmlRender, renderHook: null
     __getPageAssets: GetPageAssets;
     _globalContext: GlobalContextServerInternal;
     abortStatusCode?: AbortStatusCode;
+    headersResponse?: Headers;
 }): Promise<HttpResponse>;
 declare function createHttpResponse404(errMsg404: string): HttpResponse;
 declare function createHttpResponseBaseIsMissing(urlOriginal: string, baseServer: string): HttpResponse;

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

@@ -9,8 +9,8 @@ import { assert, assertWarning, escapeHtml } from '../utils.js';
 import { getErrorPageId, isErrorPage } from '../../../shared/error-page.js';
 import { getHttpResponseBody, getHttpResponseBodyStreamHandlers } from './getHttpResponseBody.js';
 import { getEarlyHints } from './getEarlyHints.js';
-import { getCacheControl } from './createHttpResponse/getCacheControl.js';
 import { assertNoInfiniteHttpRedirect } from './createHttpResponse/assertNoInfiniteHttpRedirect.js';
+import { cacheControlDisable } from './createHttpResponse/getCacheControl.js';
 async function createHttpResponsePage(htmlRender, renderHook, pageContext) {
     let statusCode = pageContext.abortStatusCode;
     if (!statusCode) {
@@ -29,10 +29,13 @@ async function createHttpResponsePage(htmlRender, renderHook, pageContext) {
     }
     const earlyHints = getEarlyHints(await pageContext.__getPageAssets());
     const headers = [];
-    const cacheControl = getCacheControl(pageContext.pageId, pageContext._globalContext._pageConfigs, statusCode);
-    if (cacheControl) {
-        headers.push(['Cache-Control', cacheControl]);
-    }
+    const headersResponse = pageContext.headersResponse || new Headers();
+    headersResponse.forEach((value, key) => {
+        headers.push([key, value]);
+    });
+    // An 5xx error page shouldn't be cached (it should be temporary)
+    if (statusCode >= 500)
+        headersResponse.set('Cache-Control', cacheControlDisable);
     return createHttpResponse(statusCode, 'text/html;charset=utf-8', headers, htmlRender, earlyHints, renderHook);
 }
 function createHttpResponse404(errMsg404) {

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

@@ -1,6 +1,7 @@
 export { loadPageConfigsLazyServerSideAndExecHook };
 export type { PageContext_loadPageConfigsLazyServerSide };
 export type { PageConfigsLazy };
+import { type VikeConfigPublicPageLazy } from '../../../shared/getPageFiles.js';
 import { PromiseType } from '../utils.js';
 import { PageContextGetPageAssets, type PageAsset } from './getPageAssets.js';
 import { type PageContextDebugRouteMatches } from './debugPageFiles.js';
@@ -13,19 +14,21 @@ type PageContext_loadPageConfigsLazyServerSide = PageContextGetPageAssets & Page
     _globalContext: GlobalContextServerInternal;
 };
 type PageConfigsLazy = PromiseType<ReturnType<typeof loadPageConfigsLazyServerSide>>;
-declare function loadPageConfigsLazyServerSideAndExecHook<PageContext extends PageContext_loadPageConfigsLazyServerSide & PageContextExecuteHook>(pageContext: PageContext): Promise<PageContext & import("../../../shared/getPageFiles.js").VikeConfigPublicPageLazy & {
+declare function loadPageConfigsLazyServerSideAndExecHook<PageContext extends PageContext_loadPageConfigsLazyServerSide & PageContextExecuteHook>(pageContext: PageContext): Promise<PageContext & VikeConfigPublicPageLazy & {
     Page: unknown;
     _isHtmlOnly: boolean;
     _passToClient: string[];
     _pageFilePathsLoaded: string[];
+    headersResponse: Headers;
 } & {
     __getPageAssets: () => Promise<PageAsset[]>;
 }>;
-declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPageConfigsLazyServerSide): Promise<import("../../../shared/getPageFiles.js").VikeConfigPublicPageLazy & {
+declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPageConfigsLazyServerSide): Promise<VikeConfigPublicPageLazy & {
     Page: unknown;
     _isHtmlOnly: boolean;
     _passToClient: string[];
     _pageFilePathsLoaded: string[];
+    headersResponse: Headers;
 } & {
     __getPageAssets: () => Promise<PageAsset[]>;
 }>;

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

@@ -9,12 +9,15 @@ import { findPageConfig } from '../../../shared/page-configs/findPageConfig.js';
 import { analyzePage } from './analyzePage.js';
 import { loadConfigValues } from '../../../shared/page-configs/loadConfigValues.js';
 import { execHookServer } from './execHookServer.js';
+import { getCacheControl } from './createHttpResponse/getCacheControl.js';
+// TODO/now: rename?
 async function loadPageConfigsLazyServerSideAndExecHook(pageContext) {
     const pageContextAddendum = await loadPageConfigsLazyServerSide(pageContext);
     objectAssign(pageContext, pageContextAddendum);
     await execHookServer('onCreatePageContext', pageContext);
     return pageContext;
 }
+// TODO/now: rename?
 async function loadPageConfigsLazyServerSide(pageContext) {
     const pageConfig = findPageConfig(pageContext._globalContext._pageConfigs, pageContext.pageId); // Make pageConfig globally available as pageContext._pageConfig ?
     const globalContext = pageContext._globalContext;
@@ -48,6 +51,7 @@ async function loadPageConfigsLazyServerSide(pageContext) {
         _isHtmlOnly: isHtmlOnly,
         _passToClient: passToClient,
         _pageFilePathsLoaded: pageFilesLoaded.map((p) => p.filePath),
+        headersResponse: resolveHeadersResponse(pageContext, pageContextAddendum),
     });
     objectAssign(pageContextAddendum, {
         __getPageAssets: async () => {
@@ -100,6 +104,7 @@ async function loadPageConfigsLazyServerSide(pageContext) {
     });
     return pageContextAddendum;
 }
+// TODO/now: rename?
 async function loadPageUserFiles(pageFilesAll, pageConfig, pageConfigGlobal, pageId, isDev) {
     const pageFilesServerSide = getPageFilesServerSide(pageFilesAll, pageId);
     const pageConfigLoaded = !pageConfig ? null : await loadConfigValues(pageConfig, isDev);
@@ -110,3 +115,23 @@ async function loadPageUserFiles(pageFilesAll, pageConfig, pageConfigGlobal, pag
         pageFilesLoaded: pageFilesServerSide,
     };
 }
+function resolveHeadersResponse(
+// TODO/now: merge pageContextAddendum with pageContext
+pageContext, pageContextAddendum) {
+    const headersResponse = mergeHeaders(pageContextAddendum.config.headersResponse);
+    if (!headersResponse.get('Cache-Control')) {
+        const cacheControl = 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/esm/node/runtime/renderPage/renderPageAlreadyRouted.d.ts

@@ -145,6 +145,7 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
         _isHtmlOnly: boolean;
         _passToClient: string[];
         _pageFilePathsLoaded: string[];
+        headersResponse: Headers;
     } & {
         __getPageAssets: () => Promise<import("./getPageAssets.js").PageAsset[]>;
     } & {
@@ -279,6 +280,7 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
         _isHtmlOnly: boolean;
         _passToClient: string[];
         _pageFilePathsLoaded: string[];
+        headersResponse: Headers;
     } & {
         __getPageAssets: () => Promise<import("./getPageAssets.js").PageAsset[]>;
     } & {

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

@@ -14,6 +14,7 @@ import { preparePageContextForPublicUsageServer } from './preparePageContextForP
 import { execHookGuard } from '../../../shared/route/execHookGuard.js';
 import pc from '@brillout/picocolors';
 import { isServerSideError } from '../../../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/esm/node/runtime/renderPage.js

@@ -170,6 +170,7 @@ async function renderPageOnError(errNominalPage, pageContextBegin, pageContextNo
             return handleErrorWithoutErrorPage(pageContextErrorPageInit);
         }
         else {
+            // TODO/now: minor refactor
             objectAssign(pageContextErrorPageInit, { pageId: errorPageId });
         }
     }

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

@@ -210,6 +210,10 @@ const configDefinitionsBuiltIn = {
         env: { server: true },
         global: true,
     },
+    headersResponse: {
+        env: { server: true },
+        cumulative: true,
+    },
 };
 function getConfigEnv(configValueSources, configName) {
     const configValueSource = getConfigValueSource(configValueSources, configName);

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

@@ -32,12 +32,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/esm/shared/createGlobalContextShared.d.ts

@@ -9,10 +9,10 @@ import type { GlobalContextServerInternal } from '../node/runtime/globalContext.
 import type { GlobalContextClientInternal } from '../client/runtime-client-routing/globalContext.js';
 import { type Hook } from './hooks/getHook.js';
 declare const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
-declare function createGlobalContextShared<GlobalContextAddendum extends object>(virtualFileExports: unknown, globalObject: {
+declare function createGlobalContextShared<GlobalContextAddendum extends Record<string, any>>(virtualFileExports: unknown, globalObject: {
     globalContext?: Record<string, unknown>;
     onCreateGlobalContextHooks?: Hook[];
-}, addGlobalContext?: (globalContext: GlobalContextBase) => Promise<GlobalContextAddendum>): Promise<{
+}, addGlobalContextAsync?: (globalContext: GlobalContextBase) => Promise<GlobalContextAddendum>, addGlobalContextSync?: (globalContext: GlobalContextBase) => GlobalContextAddendum): Promise<{
     /**
      * Useful for distinguishing `globalContext` from other objects and narrowing down TypeScript unions.
      *
@@ -35,7 +35,7 @@ declare function createGlobalContextShared<GlobalContextAddendum extends object>
     pages: {
         [k: string]: import("./page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
     };
-} & Awaited<GlobalContextAddendum>>;
+} & GlobalContextAddendum>;
 type GlobalContextBasePublic = Pick<GlobalContextBase, 'config' | 'pages' | 'isGlobalContext'>;
 type GlobalContextBase = ReturnType<typeof createGlobalContextBase>;
 declare function createGlobalContextBase(virtualFileExports: unknown): {

package/dist/esm/shared/createGlobalContextShared.js

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

package/dist/esm/shared/route/loadPageRoutes.d.ts

@@ -1,4 +1,5 @@
 export { loadPageRoutes };
+export { loadPageRoutesSync };
 export type { PageRoutes };
 export type { RouteType };
 import type { PageFile } from '../getPageFiles.js';
@@ -28,3 +29,7 @@ declare function loadPageRoutes(pageFilesAll: PageFile[], pageConfigs: PageConfi
     pageRoutes: PageRoutes;
     onBeforeRouteHook: null | Hook;
 }>;
+declare function loadPageRoutesSync(pageFilesAll: PageFile[], pageConfigs: PageConfigRuntime[], pageConfigGlobal: PageConfigGlobalRuntime, allPageIds: string[]): {
+    pageRoutes: PageRoutes;
+    onBeforeRouteHook: null | Hook;
+};

package/dist/esm/shared/route/loadPageRoutes.js

@@ -1,4 +1,5 @@
 export { loadPageRoutes };
+export { loadPageRoutesSync };
 import { isErrorPageId } from '../error-page.js';
 import { assert, assertUsage, hasProp, slice } from './utils.js';
 import { deduceRouteStringFromFilesystemPath } from './deduceRouteStringFromFilesystemPath.js';
@@ -10,8 +11,13 @@ import { getHookFromPageConfigGlobal, getHookTimeoutDefault } from '../hooks/get
 async function loadPageRoutes(
 // Remove all arguments and use GlobalContextServerInternal instead?
 pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds) {
-    // TO-DO/next-major-release: remove & make this function sync
+    // TO-DO/next-major-release: remove this line, remove this function, rename loadPageRoutesSync() to loadPageRoutes()
     await Promise.all(pageFilesAll.filter((p) => p.fileType === '.page.route').map((p) => p.loadFile?.()));
+    return loadPageRoutesSync(pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds);
+}
+function loadPageRoutesSync(
+// Remove all arguments and use GlobalContextServerInternal instead?
+pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds) {
     const { onBeforeRouteHook, filesystemRoots } = getGlobalHooks(pageFilesAll, pageConfigs, pageConfigGlobal);
     const pageRoutes = getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds);
     return { pageRoutes, onBeforeRouteHook };

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

@@ -508,6 +508,12 @@ type ConfigBuiltIn = {
      * https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cache-Control
      */
     cacheControl?: string;
+    /**
+     * Add HTTP headers to the HTTP response.
+     *
+     * https://vike.dev/headers#response
+     */
+    headersResponse?: HeadersInit;
     /**
      * Make development/preview server available over LAN and public addresses.
      *
@@ -561,6 +567,7 @@ type ConfigBuiltInResolved = {
     redirects?: Record<string, string>[];
     prerender?: Exclude<Config['prerender'], ImportString | undefined>[];
     middleware?: Function[];
+    headersResponse?: HeadersInit[];
 };
 type ConfigMeta = Record<string, ConfigDefinition>;
 type ImportString = `import:${string}`;

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

@@ -81,7 +81,7 @@ type PageContextBuiltInCommon<Data> = {
      */
     urlOriginal: string;
     /**
-     * The HTTP Headers of the incoming HTTP Request.
+     * The HTTP request headers.
      *
      * As a string object normalized by Vike.
      *
@@ -90,7 +90,7 @@ type PageContextBuiltInCommon<Data> = {
      */
     headers: Record<string, string> | null;
     /**
-     * The HTTP Headers of the incoming HTTP Request.
+     * The HTTP request headers.
      *
      * The original object provided by the server.
      *
@@ -98,6 +98,12 @@ type PageContextBuiltInCommon<Data> = {
      * https://vike.dev/pageContext#headersOriginal
      */
     headersOriginal?: unknown;
+    /**
+     * The HTTP response headers.
+     *
+     * https://vike.dev/headers#response
+     */
+    headersResponse: Headers;
     /** If an error occurs, whether the error is a `404 Page Not Found`.
      *
      * https://vike.dev/error-page

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

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

package/dist/esm/utils/PROJECT_VERSION.js

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

package/package.json

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