vike 0.4.238-commit-3c1a09d → 0.4.238-commit-4c6aa0d

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

@@ -30,23 +30,51 @@ type GlobalContextServer = Pick<GlobalContextServerInternal, 'assetsManifest' |
 type GlobalContextServerInternal = Awaited<ReturnType<typeof createGlobalContext>>;
 declare function getGlobalContextServerInternal(): Promise<{
     globalContext: (Record<string, unknown> & {
-        isGlobalContext: true;
-        _isOriginalObject: true;
-        _virtualFileExportsGlobalEntry: unknown;
-        _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-        _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
-        _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
-        _allPageIds: string[];
-        _vikeConfigPublicGlobal: {
+        _globalConfigPublic: {
+            pages: {
+                [k: string]: {
+                    config: import("../../types/index.js").ConfigResolved;
+                    _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                    _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                    _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+                } & ({
+                    route: import("../../types/Config.js").Route;
+                    isErrorPage?: undefined;
+                } | {
+                    route?: undefined;
+                    isErrorPage: true;
+                });
+            };
             config: import("../../types/index.js").ConfigResolved;
             _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
             _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
             _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
         };
-        config: import("../../types/index.js").ConfigResolved;
         pages: {
-            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
+            [k: string]: {
+                config: import("../../types/index.js").ConfigResolved;
+                _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+            } & ({
+                route: import("../../types/Config.js").Route;
+                isErrorPage?: undefined;
+            } | {
+                route?: undefined;
+                isErrorPage: true;
+            });
         };
+        config: import("../../types/index.js").ConfigResolved;
+        _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+        _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+        _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+        isGlobalContext: true;
+        _isOriginalObject: true;
+        _virtualFileExportsGlobalEntry: unknown;
+        _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
+        _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
+        _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
+        _allPageIds: string[];
     } & {
         _isProduction: false;
         _isPrerendering: false;
@@ -70,23 +98,51 @@ declare function getGlobalContextServerInternal(): Promise<{
             };
         };
     }) | (Record<string, unknown> & {
-        isGlobalContext: true;
-        _isOriginalObject: true;
-        _virtualFileExportsGlobalEntry: unknown;
-        _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-        _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
-        _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
-        _allPageIds: string[];
-        _vikeConfigPublicGlobal: {
+        _globalConfigPublic: {
+            pages: {
+                [k: string]: {
+                    config: import("../../types/index.js").ConfigResolved;
+                    _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                    _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                    _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+                } & ({
+                    route: import("../../types/Config.js").Route;
+                    isErrorPage?: undefined;
+                } | {
+                    route?: undefined;
+                    isErrorPage: true;
+                });
+            };
             config: import("../../types/index.js").ConfigResolved;
             _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
             _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
             _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
         };
-        config: import("../../types/index.js").ConfigResolved;
         pages: {
-            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
+            [k: string]: {
+                config: import("../../types/index.js").ConfigResolved;
+                _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+            } & ({
+                route: import("../../types/Config.js").Route;
+                isErrorPage?: undefined;
+            } | {
+                route?: undefined;
+                isErrorPage: true;
+            });
         };
+        config: import("../../types/index.js").ConfigResolved;
+        _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+        _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+        _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+        isGlobalContext: true;
+        _isOriginalObject: true;
+        _virtualFileExportsGlobalEntry: unknown;
+        _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
+        _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
+        _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
+        _allPageIds: string[];
     } & {
         _isPrerendering: true;
         viteConfig: ResolvedConfig;
@@ -111,23 +167,51 @@ declare function getGlobalContextServerInternal(): Promise<{
             };
         };
     }) | (Record<string, unknown> & {
-        isGlobalContext: true;
-        _isOriginalObject: true;
-        _virtualFileExportsGlobalEntry: unknown;
-        _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-        _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
-        _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
-        _allPageIds: string[];
-        _vikeConfigPublicGlobal: {
+        _globalConfigPublic: {
+            pages: {
+                [k: string]: {
+                    config: import("../../types/index.js").ConfigResolved;
+                    _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                    _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                    _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+                } & ({
+                    route: import("../../types/Config.js").Route;
+                    isErrorPage?: undefined;
+                } | {
+                    route?: undefined;
+                    isErrorPage: true;
+                });
+            };
             config: import("../../types/index.js").ConfigResolved;
             _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
             _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
             _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
         };
-        config: import("../../types/index.js").ConfigResolved;
         pages: {
-            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
+            [k: string]: {
+                config: import("../../types/index.js").ConfigResolved;
+                _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+            } & ({
+                route: import("../../types/Config.js").Route;
+                isErrorPage?: undefined;
+            } | {
+                route?: undefined;
+                isErrorPage: true;
+            });
         };
+        config: import("../../types/index.js").ConfigResolved;
+        _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+        _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+        _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+        isGlobalContext: true;
+        _isOriginalObject: true;
+        _virtualFileExportsGlobalEntry: unknown;
+        _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
+        _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
+        _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
+        _allPageIds: string[];
     } & {
         _isPrerendering: false;
         viteConfig: null;
@@ -191,23 +275,51 @@ declare function updateUserFiles(): Promise<{
     success: boolean;
 }>;
 declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Promise<{
-    isGlobalContext: true;
-    _isOriginalObject: true;
-    _virtualFileExportsGlobalEntry: unknown;
-    _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-    _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
-    _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
-    _allPageIds: string[];
-    _vikeConfigPublicGlobal: {
+    _globalConfigPublic: {
+        pages: {
+            [k: string]: {
+                config: import("../../types/index.js").ConfigResolved;
+                _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+            } & ({
+                route: import("../../types/Config.js").Route;
+                isErrorPage?: undefined;
+            } | {
+                route?: undefined;
+                isErrorPage: true;
+            });
+        };
         config: import("../../types/index.js").ConfigResolved;
         _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
         _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
         _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
     };
-    config: import("../../types/index.js").ConfigResolved;
     pages: {
-        [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
+        [k: string]: {
+            config: import("../../types/index.js").ConfigResolved;
+            _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+            _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+            _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+        } & ({
+            route: import("../../types/Config.js").Route;
+            isErrorPage?: undefined;
+        } | {
+            route?: undefined;
+            isErrorPage: true;
+        });
     };
+    config: import("../../types/index.js").ConfigResolved;
+    _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+    _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+    _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+    isGlobalContext: true;
+    _isOriginalObject: true;
+    _virtualFileExportsGlobalEntry: unknown;
+    _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
+    _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
+    _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
+    _allPageIds: string[];
 } & (({
     _isProduction: false;
     _isPrerendering: false;

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

@@ -1,11 +1,11 @@
 export { renderPage } from './renderPage.js';
-export { escapeInject, dangerouslySkipEscape } from './html/renderHtml.js';
-export { pipeWebStream, pipeNodeStream, pipeStream, stampPipe } from './html/stream.js';
+export { escapeInject, dangerouslySkipEscape } from './renderPage/html/renderHtml.js';
+export { pipeWebStream, pipeNodeStream, pipeStream, stampPipe } from './renderPage/html/stream.js';
 export { PROJECT_VERSION as version } from './utils.js';
 export { getGlobalContext, getGlobalContextSync, getGlobalContextAsync } from './globalContext.js';
 export { createDevMiddleware } from '../runtime-dev/index.js';
 export * from '../../types/index-dreprecated.js';
-export { injectAssets__public as _injectAssets } from './html/injectAssets/injectAssets__public.js';
+export { injectAssets__public as _injectAssets } from './renderPage/html/injectAssets/injectAssets__public.js';
 export { createPageRenderer } from '../createPageRenderer.js';
 import { RenderErrorPage as RenderErrorPage_ } from '../../shared/route/abort.js';
 /** @deprecated

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

@@ -2,15 +2,15 @@ import { isBrowser } from '../../utils/isBrowser.js';
 import { assert } from '../../utils/assert.js';
 assert(!isBrowser());
 export { renderPage } from './renderPage.js';
-export { escapeInject, dangerouslySkipEscape } from './html/renderHtml.js';
-export { pipeWebStream, pipeNodeStream, pipeStream, stampPipe } from './html/stream.js';
+export { escapeInject, dangerouslySkipEscape } from './renderPage/html/renderHtml.js';
+export { pipeWebStream, pipeNodeStream, pipeStream, stampPipe } from './renderPage/html/stream.js';
 export { PROJECT_VERSION as version } from './utils.js';
 export { getGlobalContext, getGlobalContextSync, getGlobalContextAsync } from './globalContext.js';
 export { createDevMiddleware } from '../runtime-dev/index.js';
 // TO-DO/next-major-release: remove
 // Deprecated exports
 export * from '../../types/index-dreprecated.js';
-export { injectAssets__public as _injectAssets } from './html/injectAssets/injectAssets__public.js';
+export { injectAssets__public as _injectAssets } from './renderPage/html/injectAssets/injectAssets__public.js';
 export { createPageRenderer } from '../createPageRenderer.js';
 import { assertWarning } from './utils.js';
 import pc from '@brillout/picocolors';

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

@@ -1,3 +1,5 @@
 export {};
-// TO-DO/next-major-release: remove https://github.com/vikejs/vike/issues/2122
+// TO-DO/eventually: remove
+// - This was used by some older Vike extensions made by Joël (I believe vite-plugin-vercel)
+// - See also https://github.com/vikejs/vike/issues/2122
 // This doesn't do anything anymore. (It's kept to avoid introducing a breaking change.)

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

@@ -7,7 +7,7 @@ export { createHttpResponse404 };
 export { createHttpResponseBaseIsMissing };
 export type { HttpResponse };
 import type { GetPageAssets } from './getPageAssets.js';
-import type { HtmlRender } from '../html/renderHtml.js';
+import type { HtmlRender } from './html/renderHtml.js';
 import type { RenderHook } from './execHookOnRenderHtml.js';
 import type { RedirectStatusCode, AbortStatusCode, UrlRedirect } from '../../../shared/route/abort.js';
 import { HttpResponseBody } from './getHttpResponseBody.js';

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

@@ -10,7 +10,7 @@ import { getErrorPageId, isErrorPage } from '../../../shared/error-page.js';
 import { getHttpResponseBody, getHttpResponseBodyStreamHandlers } from './getHttpResponseBody.js';
 import { getEarlyHints } from './getEarlyHints.js';
 import { assertNoInfiniteHttpRedirect } from './createHttpResponse/assertNoInfiniteHttpRedirect.js';
-import { cacheControlDisable } from './getCacheControl.js';
+import { resolveHeadersResponseFinal } from './headersResponse.js';
 async function createHttpResponsePage(htmlRender, renderHook, pageContext) {
     let statusCode = pageContext.abortStatusCode;
     if (!statusCode) {
@@ -28,14 +28,7 @@ async function createHttpResponsePage(htmlRender, renderHook, pageContext) {
         }
     }
     const earlyHints = getEarlyHints(await pageContext.__getPageAssets());
-    const headers = [];
-    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);
+    const headers = resolveHeadersResponseFinal(pageContext, statusCode);
     return createHttpResponse(statusCode, 'text/html;charset=utf-8', headers, htmlRender, earlyHints, renderHook);
 }
 function createHttpResponse404(errMsg404) {

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

@@ -24,23 +24,51 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
     headers?: Record<string, string>;
 } & {
     _globalContext: {
-        isGlobalContext: true;
-        _isOriginalObject: true;
-        _virtualFileExportsGlobalEntry: unknown;
-        _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
-        _pageConfigs: import("../../../types/PageConfig.js").PageConfigRuntime[];
-        _pageConfigGlobal: import("../../../types/PageConfig.js").PageConfigGlobalRuntime;
-        _allPageIds: string[];
-        _vikeConfigPublicGlobal: {
+        _globalConfigPublic: {
+            pages: {
+                [k: string]: {
+                    config: import("../../../types/index.js").ConfigResolved;
+                    _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                    _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                    _from: import("../../../shared/page-configs/resolveVikeConfigPublic.js").From;
+                } & ({
+                    route: import("../../../types/Config.js").Route;
+                    isErrorPage?: undefined;
+                } | {
+                    route?: undefined;
+                    isErrorPage: true;
+                });
+            };
             config: import("../../../types/index.js").ConfigResolved;
             _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
             _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
             _from: import("../../../shared/page-configs/resolveVikeConfigPublic.js").From;
         };
-        config: import("../../../types/index.js").ConfigResolved;
         pages: {
-            [k: string]: import("../../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
+            [k: string]: {
+                config: import("../../../types/index.js").ConfigResolved;
+                _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                _from: import("../../../shared/page-configs/resolveVikeConfigPublic.js").From;
+            } & ({
+                route: import("../../../types/Config.js").Route;
+                isErrorPage?: undefined;
+            } | {
+                route?: undefined;
+                isErrorPage: true;
+            });
         };
+        config: import("../../../types/index.js").ConfigResolved;
+        _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+        _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+        _from: import("../../../shared/page-configs/resolveVikeConfigPublic.js").From;
+        isGlobalContext: true;
+        _isOriginalObject: true;
+        _virtualFileExportsGlobalEntry: unknown;
+        _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
+        _pageConfigs: import("../../../types/PageConfig.js").PageConfigRuntime[];
+        _pageConfigGlobal: import("../../../types/PageConfig.js").PageConfigGlobalRuntime;
+        _allPageIds: string[];
     } & (({
         _isProduction: false;
         _isPrerendering: false;
@@ -92,6 +120,20 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
     _urlHandler: ((url: string) => string) | null;
     isClientSideNavigation: boolean;
 } & {
+    pages: {
+        [k: string]: {
+            config: import("../../../types/index.js").ConfigResolved;
+            _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+            _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+            _from: import("../../../shared/page-configs/resolveVikeConfigPublic.js").From;
+        } & ({
+            route: import("../../../types/Config.js").Route;
+            isErrorPage?: undefined;
+        } | {
+            route?: undefined;
+            isErrorPage: true;
+        });
+    };
     config: import("../../../types/index.js").ConfigResolved;
     _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
     _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;

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

@@ -17,7 +17,7 @@ function createPageContextServerSide(pageContextInit, globalContext, args) {
         _urlHandler: args.ssr?.urlHandler ?? null,
         isClientSideNavigation: args.ssr?.isClientSideNavigation ?? false,
     });
-    objectAssign(pageContextCreated, globalContext._vikeConfigPublicGlobal);
+    objectAssign(pageContextCreated, globalContext._globalConfigPublic);
     // pageContext.urlParsed
     const pageContextUrlComputed = getPageContextUrlComputed(pageContextCreated);
     objectAssign(pageContextCreated, pageContextUrlComputed);
@@ -38,7 +38,7 @@ function createPageContextServerSide(pageContextInit, globalContext, args) {
         }
         objectAssign(pageContextCreated, { headers });
     }
-    const pageContextAugmented = createPageContextShared(pageContextCreated, globalContext._vikeConfigPublicGlobal);
+    const pageContextAugmented = createPageContextShared(pageContextCreated, globalContext._globalConfigPublic);
     updateType(pageContextCreated, pageContextAugmented);
     return pageContextCreated;
 }

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

@@ -0,0 +1,12 @@
+export { resolvePageContextCspNone };
+export { inferNonceAttr };
+export { addCspResponseHeader };
+export type { PageContextCspNonce };
+import type { PageContextConfig } from '../../../shared/getPageFiles.js';
+import type { PageContextServer } from '../../../types/PageContext.js';
+declare function resolvePageContextCspNone(pageContext: PageContextConfig & Partial<PageContextCspNonce>): Promise<null | {
+    cspNonce: string | null;
+}>;
+type PageContextCspNonce = Pick<PageContextServer, 'cspNonce'>;
+declare function inferNonceAttr(pageContext: PageContextCspNonce): string;
+declare function addCspResponseHeader(pageContext: PageContextCspNonce, headersResponse: Headers): void;

package/dist/esm/node/runtime/{csp.js → renderPage/csp.js}

@@ -1,21 +1,21 @@
 export { resolvePageContextCspNone };
 export { inferNonceAttr };
-export { addCspHeader };
+export { addCspResponseHeader };
 import { import_ } from '@brillout/import';
+import { assert } from '../utils.js';
 async function resolvePageContextCspNone(pageContext) {
     if (pageContext.cspNonce)
-        return; // already set by user e.g. `renderPage({ cspNonce: '123456789' })`
+        return null; // already set by user e.g. `renderPage({ cspNonce: '123456789' })`
     const { csp } = pageContext.config;
-    if (!csp?.nonce)
-        return;
-    let cspNonce;
-    if (csp.nonce === true) {
-        cspNonce = await generateNonce();
-    }
-    else {
-        cspNonce = await csp.nonce(pageContext);
+    const pageContextAddendum = { cspNonce: null };
+    if (csp?.nonce) {
+        if (csp.nonce === true) {
+            pageContextAddendum.cspNonce = await generateNonce();
+        }
+        else {
+            pageContextAddendum.cspNonce = await csp.nonce(pageContext);
+        }
     }
-    const pageContextAddendum = { cspNonce };
     return pageContextAddendum;
 }
 // Generate a cryptographically secure nonce for Content Security Policy (CSP).
@@ -35,7 +35,8 @@ function inferNonceAttr(pageContext) {
     const nonceAttr = pageContext.cspNonce ? ` nonce="${pageContext.cspNonce}"` : '';
     return nonceAttr;
 }
-function addCspHeader(pageContext, headersResponse) {
+function addCspResponseHeader(pageContext, headersResponse) {
+    assert(pageContext.cspNonce === null || typeof pageContext.cspNonce === 'string'); // ensure resolvePageContextCspNone() is called before addCspResponseHeader()
     if (!pageContext.cspNonce)
         return;
     if (headersResponse.get('Content-Security-Policy'))

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

@@ -1,10 +1,10 @@
 export { execHookOnRenderHtml };
 export type { RenderHook };
-import { type HtmlRender } from '../html/renderHtml.js';
+import { type HtmlRender } from './html/renderHtml.js';
 import { type Hook } from '../../../shared/hooks/getHook.js';
 import type { PageAsset } from './getPageAssets.js';
 import { type PageContextForPublicUsageServer } from './preparePageContextForPublicUsageServer.js';
-import type { PageContextSerialization } from '../html/serializeContext.js';
+import type { PageContextSerialization } from './html/serializeContext.js';
 import type { GlobalContextServerInternal } from '../globalContext.js';
 type GetPageAssets = () => Promise<PageAsset[]>;
 type RenderHook = Hook & {

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

@@ -1,8 +1,8 @@
 export { execHookOnRenderHtml };
-import { isDocumentHtml, renderDocumentHtml, dangerouslySkipEscape, } from '../html/renderHtml.js';
+import { isDocumentHtml, renderDocumentHtml, dangerouslySkipEscape, } from './html/renderHtml.js';
 import { getHookFromPageContext } from '../../../shared/hooks/getHook.js';
 import { assert, assertUsage, assertWarning, isObject, objectAssign, isPromise, isCallable } from '../utils.js';
-import { isStream } from '../html/stream.js';
+import { isStream } from './html/stream.js';
 import { assertPageContextProvidedByUser } from '../../../shared/assertPageContextProvidedByUser.js';
 import { preparePageContextForPublicUsageServer, } from './preparePageContextForPublicUsageServer.js';
 import { assertHookReturnedObject } from '../../../shared/assertHookReturnedObject.js';

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

@@ -1,9 +1,9 @@
 export { execHookServer };
 export type { PageContextExecHookServer };
 import { type PageContextForPublicUsageServer } from './preparePageContextForPublicUsageServer.js';
-import type { VikeConfigPublicPageLazyLoaded } from '../../../shared/getPageFiles.js';
+import type { PageContextConfig } from '../../../shared/getPageFiles.js';
 import type { HookName } from '../../../types/Config.js';
-type PageContextExecHookServer = VikeConfigPublicPageLazyLoaded & PageContextForPublicUsageServer;
+type PageContextExecHookServer = PageContextConfig & PageContextForPublicUsageServer;
 declare function execHookServer(hookName: HookName, pageContext: PageContextExecHookServer): Promise<(import("../../../shared/hooks/getHook.js").HookLoc & {
     hookFn: (arg: import("../../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum | import("../../../shared/prepareGlobalContextForPublicUsage.js").GlobalContextPrepareMinimum) => unknown;
     hookTimeout: import("../../../shared/hooks/getHook.js").HookTimeout;

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

@@ -1,6 +1,6 @@
 export { getEarlyHints };
 import { isFontFallback } from './isFontFallback.js';
-import { inferEarlyHintLink } from '../html/injectAssets/inferHtmlTags.js';
+import { inferEarlyHintLink } from './html/injectAssets/inferHtmlTags.js';
 function getEarlyHints(assets) {
     const earlyHints = [];
     {

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

@@ -1,8 +1,8 @@
 export { getHttpResponseBody };
 export { getHttpResponseBodyStreamHandlers };
 export type { HttpResponseBody };
-import { StreamPipeNode, StreamPipeWeb, StreamReadableNode, StreamReadableWeb, StreamWritableNode, StreamWritableWeb } from '../html/stream.js';
-import { type HtmlRender } from '../html/renderHtml.js';
+import { StreamPipeNode, StreamPipeWeb, StreamReadableNode, StreamReadableWeb, StreamWritableNode, StreamWritableWeb } from './html/stream.js';
+import { type HtmlRender } from './html/renderHtml.js';
 import type { RenderHook } from './execHookOnRenderHtml.js';
 type HttpResponseBody = {
     body: string;

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

@@ -1,8 +1,8 @@
 export { getHttpResponseBody };
 export { getHttpResponseBodyStreamHandlers };
-import { isStream, getStreamName, inferStreamName, isStreamWritableWeb, isStreamWritableNode, isStreamReadableWeb, isStreamReadableNode, isStreamPipeWeb, isStreamPipeNode, getStreamReadableNode, getStreamReadableWeb, pipeToStreamWritableWeb, pipeToStreamWritableNode, } from '../html/stream.js';
+import { isStream, getStreamName, inferStreamName, isStreamWritableWeb, isStreamWritableNode, isStreamReadableWeb, isStreamReadableNode, isStreamPipeWeb, isStreamPipeNode, getStreamReadableNode, getStreamReadableWeb, pipeToStreamWritableWeb, pipeToStreamWritableNode, } from './html/stream.js';
 import { assert, assertUsage, assertWarning } from '../utils.js';
-import { getHtmlString } from '../html/renderHtml.js';
+import { getHtmlString } from './html/renderHtml.js';
 import pc from '@brillout/picocolors';
 const streamDocs = 'See https://vike.dev/streaming for more information.';
 function getHttpResponseBody(htmlRender, renderHook) {

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

@@ -0,0 +1,10 @@
+export { resolveHeadersResponseEarly };
+export { resolveHeadersResponseFinal };
+import { PageContextCspNonce } from './csp.js';
+import type { PageContextAfterPageEntryLoaded } from './loadPageConfigsLazyServerSide.js';
+declare function resolveHeadersResponseFinal(pageContext: {
+    headersResponse?: Headers;
+}, statusCode: number): [string, string][];
+declare function resolveHeadersResponseEarly(pageContext: PageContextAfterPageEntryLoaded & PageContextCspNonce): Promise<{
+    headersResponse: Headers;
+}>;

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

@@ -0,0 +1,46 @@
+export { resolveHeadersResponseEarly };
+export { resolveHeadersResponseFinal };
+import { addCspResponseHeader } from './csp.js';
+import { isCallable } from '../utils.js';
+import { cacheControlDisable, getCacheControl } from './getCacheControl.js';
+function resolveHeadersResponseFinal(pageContext, statusCode) {
+    const headersResponse = pageContext.headersResponse || new Headers();
+    // 5xx error pages are temporary and shouldn't be cached.
+    // This overrides any previously set Cache-Control value.
+    if (statusCode >= 500)
+        headersResponse.set('Cache-Control', cacheControlDisable);
+    const headers = [];
+    headersResponse.forEach((value, key) => {
+        headers.push([key, value]);
+    });
+    return headers;
+}
+async function resolveHeadersResponseEarly(pageContext) {
+    const headersResponse = await resolveHeadersResponseConfig(pageContext);
+    if (!headersResponse.get('Cache-Control')) {
+        const cacheControl = getCacheControl(pageContext.pageId, pageContext._globalContext._pageConfigs);
+        if (cacheControl)
+            headersResponse.set('Cache-Control', cacheControl);
+    }
+    addCspResponseHeader(pageContext, headersResponse);
+    const pageContextAddendum = {
+        headersResponse,
+    };
+    return pageContextAddendum;
+}
+async function resolveHeadersResponseConfig(pageContext) {
+    const headersMerged = new Headers();
+    await Promise.all((pageContext.config.headersResponse ?? []).map(async (headers) => {
+        let headersInit;
+        if (isCallable(headers)) {
+            headersInit = await headers(pageContext);
+        }
+        else {
+            headersInit = headers;
+        }
+        new Headers(headersInit).forEach((value, key) => {
+            headersMerged.append(key, value);
+        });
+    }));
+    return headersMerged;
+}