vike 0.4.252 → 0.4.253-commit-1658209

package/dist/node/vite/shared/loggerVite.js

@@ -17,7 +17,7 @@ const globalObject = getGlobalObject('vite/shared/loggerDev.ts', {
     processStartupLog_hasViteLoggedStartup: null,
     processStartupLog_hasViteLoggedHelpShortcut: null,
     swallowViteLogForceOptimization_enabled: false,
-    swallowViteLogConnected_originalConsoleLog: null,
+    swallowViteLogConnected_originalConsoleLog: undefined,
 });
 function interceptViteLogs(config) {
     if (isDebugError())
@@ -123,22 +123,29 @@ function swallowViteLogForceOptimization_enable() {
 function swallowViteLogForceOptimization_disable() {
     globalObject.swallowViteLogForceOptimization_enabled = false;
 }
-// Suppress "[vite] connected." message. (It doesn't go through Vite's logger thus we must monkey patch the console.log() function.)
+// Swallow message `[vite] connected.`
 function swallowViteLogConnected() {
     if (isDebugError())
         return;
     if (globalObject.swallowViteLogConnected_originalConsoleLog)
         return;
     globalObject.swallowViteLogConnected_originalConsoleLog = console.log;
+    // The message `[vite] connected.` doesn't go through Vite's logger thus we must monkey patch console.log()
     console.log = swallowViteLogConnected_logPatch;
     setTimeout(swallowViteLogConnected_clean, 3000);
 }
 // Remove console.log() monkey patch
 function swallowViteLogConnected_clean() {
-    // Don't remove console.log() patches from other libraries (e.g. instrumentation)
-    if (console.log === swallowViteLogConnected_logPatch)
+    if (isDebugError()) {
+        assert(globalObject.swallowViteLogConnected_originalConsoleLog === undefined);
         return;
+    }
+    if (globalObject.swallowViteLogConnected_originalConsoleLog === null)
+        return; // already cleaned
     assert(globalObject.swallowViteLogConnected_originalConsoleLog);
+    // Don't remove console.log() patches from other libraries (e.g. instrumentation)
+    if (console.log !== swallowViteLogConnected_logPatch)
+        return;
     console.log = globalObject.swallowViteLogConnected_originalConsoleLog;
     globalObject.swallowViteLogConnected_originalConsoleLog = null;
 }

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

@@ -35,7 +35,7 @@ const configDefinitionsBuiltIn = {
         cumulative: true,
     },
     onHookCall: {
-        env: { server: true, client: true },
+        env: { server: true },
         global: true,
         cumulative: true,
     },
@@ -219,7 +219,12 @@ const configDefinitionsBuiltIn = {
     keepScrollPosition: {
         env: { client: true },
     },
-    middleware: { env: { server: true }, cumulative: true, eager: true, global: true },
+    middleware: {
+        env: { server: true },
+        cumulative: true,
+        eager: true,
+        global: true,
+    },
     cli: {
         env: { config: true },
         global: true,
@@ -229,7 +234,6 @@ const configDefinitionsBuiltIn = {
         eager: true,
         global: true,
     },
-    // TODO: align all meta configs
     prerender: {
         env: { config: true },
         global: (value, { isGlobalLocation }) => typeof value === 'object' || isGlobalLocation,

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

@@ -9,7 +9,7 @@ import path from 'node:path';
 import crypto from 'node:crypto';
 import pc from '@brillout/picocolors';
 import { import_ } from '@brillout/import';
-import { assert, assertWarning, assertUsage } from '../../../../utils/assert.js';
+import { assert, assertWarning } from '../../../../utils/assert.js';
 import { assertIsNotProductionRuntime } from '../../../../utils/assertSetup.js';
 import { createDebug } from '../../../../utils/debug.js';
 import { genPromise } from '../../../../utils/genPromise.js';
@@ -39,7 +39,12 @@ async function transpileAndExecuteFile(filePath, userRootDir, isExtensionConfig,
     }
     const { promise, resolve } = genPromise();
     esbuildCache.transpileCache[filePathAbsoluteFilesystem] = promise;
-    assertUsage(isPlainScriptFile(filePathAbsoluteFilesystem), `${filePathToShowToUserResolved} has file extension .${fileExtension} but a config file can only be a JavaScript/TypeScript file`);
+    /* We tolerate .tsx so that a file can be both a runtime and config file (`meta.env.config === true && meta.env.server === true`), e.g. https://github.com/brillout/docpress/issues/86
+    assertUsage(
+      isPlainScriptFile(filePathAbsoluteFilesystem),
+      `${filePathToShowToUserResolved} has file extension .${fileExtension} but a config file can only be a JavaScript/TypeScript file`,
+    )
+    */
     const isHeader = isHeaderFile(filePathAbsoluteFilesystem);
     if (isHeader) {
         assertWarning(false, `${pc.cyan('.h.js')} files are deprecated: simply renaming ${filePathToShowToUserResolved} to ${removeHeaderFileExtension(filePathToShowToUserResolved)} is usually enough, although you may occasionally need to use ${pc.cyan("with { type: 'pointer' }")} as explained at https://vike.dev/config#pointer-imports`, { onlyOnce: true });

package/dist/server/runtime/globalContext.d.ts

@@ -26,7 +26,7 @@ import type { ResolvedConfig, ViteDevServer } from 'vite';
 import { type PageRoutes } from '../../shared-server-client/route/loadPageRoutes.js';
 import type { ViteConfigRuntime } from '../../node/vite/shared/getViteConfigRuntime.js';
 import type { GlobalContext } from '../../types/GlobalContext.js';
-import type { Hook } from '../../shared-server-client/hooks/getHook.js';
+import type { HookInternal } from '../../shared-server-client/hooks/getHook.js';
 import type { PrerenderContext } from '../../types/index.js';
 declare const vikeConfigErrorRecoverMsg: "Vike config loaded";
 type GlobalContextServerInternal = Awaited<ReturnType<typeof createGlobalContext>>;
@@ -85,7 +85,7 @@ declare function getGlobalContextServerInternal(): Promise<{
         viteConfig: ResolvedConfig | undefined;
         isClientSide: false;
         _pageRoutes: PageRoutes;
-        _onBeforeRouteHook: Hook | null;
+        _onBeforeRouteHook: HookInternal | null;
     } & {
         baseServer: string;
         baseAssets: string;
@@ -156,7 +156,7 @@ declare function getGlobalContextServerInternal(): Promise<{
         _usesClientRouter: boolean;
         isClientSide: false;
         _pageRoutes: PageRoutes;
-        _onBeforeRouteHook: Hook | null;
+        _onBeforeRouteHook: HookInternal | null;
     } & {
         baseServer: string;
         baseAssets: string;
@@ -227,7 +227,7 @@ declare function getGlobalContextServerInternal(): Promise<{
         _usesClientRouter: boolean;
         isClientSide: false;
         _pageRoutes: PageRoutes;
-        _onBeforeRouteHook: Hook | null;
+        _onBeforeRouteHook: HookInternal | null;
     } & {
         baseServer: string;
         baseAssets: string;
@@ -299,7 +299,7 @@ declare function getGlobalContextServerInternalOptional(): (Record<string, unkno
     viteConfig: ResolvedConfig | undefined;
     isClientSide: false;
     _pageRoutes: PageRoutes;
-    _onBeforeRouteHook: Hook | null;
+    _onBeforeRouteHook: HookInternal | null;
 } | {
     _isPrerendering: true;
     viteConfig: ResolvedConfig;
@@ -309,7 +309,7 @@ declare function getGlobalContextServerInternalOptional(): (Record<string, unkno
     _usesClientRouter: boolean;
     isClientSide: false;
     _pageRoutes: PageRoutes;
-    _onBeforeRouteHook: Hook | null;
+    _onBeforeRouteHook: HookInternal | null;
 } | {
     _isPrerendering: false;
     viteConfig: null;
@@ -319,7 +319,7 @@ declare function getGlobalContextServerInternalOptional(): (Record<string, unkno
     _usesClientRouter: boolean;
     isClientSide: false;
     _pageRoutes: PageRoutes;
-    _onBeforeRouteHook: Hook | null;
+    _onBeforeRouteHook: HookInternal | null;
 }) & {
     baseServer: string;
     baseAssets: string;
@@ -428,7 +428,7 @@ declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Pr
     viteConfig: ResolvedConfig | undefined;
     isClientSide: false;
     _pageRoutes: PageRoutes;
-    _onBeforeRouteHook: Hook | null;
+    _onBeforeRouteHook: HookInternal | null;
 } | {
     _isPrerendering: true;
     viteConfig: ResolvedConfig;
@@ -438,7 +438,7 @@ declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Pr
     _usesClientRouter: boolean;
     isClientSide: false;
     _pageRoutes: PageRoutes;
-    _onBeforeRouteHook: Hook | null;
+    _onBeforeRouteHook: HookInternal | null;
 } | {
     _isPrerendering: false;
     viteConfig: null;
@@ -448,7 +448,7 @@ declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Pr
     _usesClientRouter: boolean;
     isClientSide: false;
     _pageRoutes: PageRoutes;
-    _onBeforeRouteHook: Hook | null;
+    _onBeforeRouteHook: HookInternal | null;
 }) & {
     baseServer: string;
     baseAssets: string;

package/dist/server/runtime/renderPageServer/addErrorHint.js

@@ -91,7 +91,8 @@ function addErrorHint(error) {
     const hint = getErrorHint(error);
     if (!hint)
         return error;
-    const append = `\n${pc.bold(formatHintLog(hint))}`;
+    const color = hint === hintDefault ? pc.gray : pc.bold;
+    const append = `\n${color(formatHintLog(hint))}`;
     return getBetterError(error, { message: { append } });
 }
 function getErrorHint(error) {

package/dist/server/runtime/renderPageServer/createPageContextServer.d.ts

@@ -6,7 +6,9 @@ export type { PageContextCreatedServerWithoutGlobalContext };
 import type { GlobalContextServerInternal } from '../globalContext.js';
 import type { PageContextInit } from '../renderPageServer.js';
 type PageContextCreatedServer = Awaited<ReturnType<typeof createPageContextServer>>;
-declare function createPageContextServer(pageContextInit: PageContextInit, globalContext: GlobalContextServerInternal, args: {
+declare function createPageContextServer(pageContextInit: PageContextInit & {
+    headers?: Record<string, unknown>;
+}, globalContext: GlobalContextServerInternal, args: {
     requestId: number;
 } & ({
     isPrerendering: true;
@@ -76,7 +78,7 @@ declare function createPageContextServer(pageContextInit: PageContextInit, globa
         viteConfig: import("vite").ResolvedConfig | undefined;
         isClientSide: false;
         _pageRoutes: import("../../__internal/index.js").PageRoutes;
-        _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+        _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
     } | {
         _isPrerendering: true;
         viteConfig: import("vite").ResolvedConfig;
@@ -86,7 +88,7 @@ declare function createPageContextServer(pageContextInit: PageContextInit, globa
         _usesClientRouter: boolean;
         isClientSide: false;
         _pageRoutes: import("../../__internal/index.js").PageRoutes;
-        _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+        _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
     } | {
         _isPrerendering: false;
         viteConfig: null;
@@ -96,7 +98,7 @@ declare function createPageContextServer(pageContextInit: PageContextInit, globa
         _usesClientRouter: boolean;
         isClientSide: false;
         _pageRoutes: import("../../__internal/index.js").PageRoutes;
-        _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+        _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
     }) & {
         baseServer: string;
         baseAssets: string;
@@ -116,7 +118,9 @@ declare function createPageContextServer(pageContextInit: PageContextInit, globa
     _pageFilesAll: import("../../__internal/index.js").PageFile[];
     _baseServer: string;
     _baseAssets: string;
-    _pageContextInit: PageContextInit;
+    _pageContextInit: PageContextInit & {
+        headers?: Record<string, unknown>;
+    };
     _urlHandler: ((url: string) => string) | null;
     isClientSideNavigation: boolean;
 } & {

package/dist/server/runtime/renderPageServer/execHookOnRenderHtml.d.ts

@@ -2,14 +2,14 @@ import '../../assertEnvServer.js';
 export { execHookOnRenderHtml };
 export type { RenderHook };
 import { type HtmlRender } from './html/renderHtml.js';
-import { type Hook } from '../../../shared-server-client/hooks/getHook.js';
+import { type HookInternal } from '../../../shared-server-client/hooks/getHook.js';
 import type { PageAsset } from './getPageAssets.js';
 import type { PageContextSerialization } from './html/serializeContext.js';
 import { type PageContextExecHook } from '../../../shared-server-client/hooks/execHook.js';
 import type { PageContextConfig } from '../../../shared-server-client/getPageFiles.js';
 import type { PageContextInternalServer } from '../../../types/PageContext.js';
 type GetPageAssets = () => Promise<PageAsset[]>;
-type RenderHook = Hook & {
+type RenderHook = HookInternal & {
     hookName: HookName;
 };
 type HookName = 'onRenderHtml' | 'render';

package/dist/server/runtime/renderPageServer/handlePageContextRequestUrl.js

@@ -8,6 +8,7 @@ import { assert } from '../../../utils/assert.js';
 import { hasProp } from '../../../utils/hasProp.js';
 import { isObject } from '../../../utils/isObject.js';
 import { parseUrl } from '../../../utils/parseUrl.js';
+const pageContextJsonFileExtensionUrl = `/index${pageContextJsonFileExtension}`;
 // See also shared/getPageContextRequestUrl.ts
 function handlePageContextRequestUrl(url) {
     const urlParsed = parseUrl(url, baseServer);
@@ -33,16 +34,15 @@ function handlePageContextRequestUrl(url) {
 }
 function isMatch(urlParsed) {
     const { pathnameOriginal, pathname } = urlParsed;
-    assert(pathname.endsWith(pageContextJsonFileExtension) === pathnameOriginal.endsWith(pageContextJsonFileExtension));
-    return pathname.endsWith(pageContextJsonFileExtension);
+    assert(pathname.endsWith(pageContextJsonFileExtensionUrl) === pathnameOriginal.endsWith(pageContextJsonFileExtensionUrl));
+    return pathname.endsWith(pageContextJsonFileExtensionUrl);
 }
 function processUrl(urlParsed, url) {
     // We cannot use `urlParsed.pathname` because it would break the `urlParsed.pathnameOriginal` value of subsequent `parseUrl()` calls.
     const { pathnameOriginal, search } = urlParsed;
     assert(doNotCreateExtraDirectory === false);
-    const urlSuffix = `/index${pageContextJsonFileExtension}`;
-    assert(pathnameOriginal.endsWith(urlSuffix), { url });
-    let pathnameModified = slice(pathnameOriginal, 0, -1 * urlSuffix.length);
+    assert(pathnameOriginal.endsWith(pageContextJsonFileExtensionUrl), { url });
+    let pathnameModified = slice(pathnameOriginal, 0, -1 * pageContextJsonFileExtensionUrl.length);
     if (pathnameModified === '')
         pathnameModified = '/';
     const searchVikeArgs = search?._vike;

package/dist/server/runtime/renderPageServer/loadPageConfigsLazyServerSide.d.ts

@@ -77,7 +77,7 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
         viteConfig: import("vite").ResolvedConfig | undefined;
         isClientSide: false;
         _pageRoutes: import("../../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+        _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
     } | {
         _isPrerendering: true;
         viteConfig: import("vite").ResolvedConfig;
@@ -87,7 +87,7 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
         _usesClientRouter: boolean;
         isClientSide: false;
         _pageRoutes: import("../../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+        _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
     } | {
         _isPrerendering: false;
         viteConfig: null;
@@ -97,7 +97,7 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
         _usesClientRouter: boolean;
         isClientSide: false;
         _pageRoutes: import("../../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+        _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
     }) & {
         baseServer: string;
         baseAssets: string;
@@ -117,7 +117,9 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
     _pageFilesAll: import("../../../shared-server-client/getPageFiles.js").PageFile[];
     _baseServer: string;
     _baseAssets: string;
-    _pageContextInit: import("../renderPageServer.js").PageContextInit;
+    _pageContextInit: import("../renderPageServer.js").PageContextInit & {
+        headers?: Record<string, unknown>;
+    };
     _urlHandler: ((url: string) => string) | null;
     isClientSideNavigation: boolean;
 } & {

package/dist/server/runtime/renderPageServer/renderPageServerAfterRoute.d.ts

@@ -85,7 +85,7 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
             viteConfig: import("vite").ResolvedConfig | undefined;
             isClientSide: false;
             _pageRoutes: import("../../__internal/index.js").PageRoutes;
-            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
         } | {
             _isPrerendering: true;
             viteConfig: import("vite").ResolvedConfig;
@@ -95,7 +95,7 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
             _usesClientRouter: boolean;
             isClientSide: false;
             _pageRoutes: import("../../__internal/index.js").PageRoutes;
-            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
         } | {
             _isPrerendering: false;
             viteConfig: null;
@@ -105,7 +105,7 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
             _usesClientRouter: boolean;
             isClientSide: false;
             _pageRoutes: import("../../__internal/index.js").PageRoutes;
-            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
         }) & {
             baseServer: string;
             baseAssets: string;
@@ -125,7 +125,9 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
         _pageFilesAll: import("../../__internal/index.js").PageFile[];
         _baseServer: string;
         _baseAssets: string;
-        _pageContextInit: import("../renderPageServer.js").PageContextInit;
+        _pageContextInit: import("../renderPageServer.js").PageContextInit & {
+            headers?: Record<string, unknown>;
+        };
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
     } & {
@@ -246,7 +248,7 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
             viteConfig: import("vite").ResolvedConfig | undefined;
             isClientSide: false;
             _pageRoutes: import("../../__internal/index.js").PageRoutes;
-            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
         } | {
             _isPrerendering: true;
             viteConfig: import("vite").ResolvedConfig;
@@ -256,7 +258,7 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
             _usesClientRouter: boolean;
             isClientSide: false;
             _pageRoutes: import("../../__internal/index.js").PageRoutes;
-            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
         } | {
             _isPrerendering: false;
             viteConfig: null;
@@ -266,7 +268,7 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
             _usesClientRouter: boolean;
             isClientSide: false;
             _pageRoutes: import("../../__internal/index.js").PageRoutes;
-            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
         }) & {
             baseServer: string;
             baseAssets: string;
@@ -286,7 +288,9 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
         _pageFilesAll: import("../../__internal/index.js").PageFile[];
         _baseServer: string;
         _baseAssets: string;
-        _pageContextInit: import("../renderPageServer.js").PageContextInit;
+        _pageContextInit: import("../renderPageServer.js").PageContextInit & {
+            headers?: Record<string, unknown>;
+        };
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
     } & {
@@ -415,7 +419,7 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
             viteConfig: import("vite").ResolvedConfig | undefined;
             isClientSide: false;
             _pageRoutes: import("../../__internal/index.js").PageRoutes;
-            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
         } | {
             _isPrerendering: true;
             viteConfig: import("vite").ResolvedConfig;
@@ -425,7 +429,7 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
             _usesClientRouter: boolean;
             isClientSide: false;
             _pageRoutes: import("../../__internal/index.js").PageRoutes;
-            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
         } | {
             _isPrerendering: false;
             viteConfig: null;
@@ -435,7 +439,7 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
             _usesClientRouter: boolean;
             isClientSide: false;
             _pageRoutes: import("../../__internal/index.js").PageRoutes;
-            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
         }) & {
             baseServer: string;
             baseAssets: string;
@@ -455,7 +459,9 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
         _pageFilesAll: import("../../__internal/index.js").PageFile[];
         _baseServer: string;
         _baseAssets: string;
-        _pageContextInit: import("../renderPageServer.js").PageContextInit;
+        _pageContextInit: import("../renderPageServer.js").PageContextInit & {
+            headers?: Record<string, unknown>;
+        };
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
     } & {
@@ -576,7 +582,7 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
             viteConfig: import("vite").ResolvedConfig | undefined;
             isClientSide: false;
             _pageRoutes: import("../../__internal/index.js").PageRoutes;
-            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
         } | {
             _isPrerendering: true;
             viteConfig: import("vite").ResolvedConfig;
@@ -586,7 +592,7 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
             _usesClientRouter: boolean;
             isClientSide: false;
             _pageRoutes: import("../../__internal/index.js").PageRoutes;
-            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
         } | {
             _isPrerendering: false;
             viteConfig: null;
@@ -596,7 +602,7 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
             _usesClientRouter: boolean;
             isClientSide: false;
             _pageRoutes: import("../../__internal/index.js").PageRoutes;
-            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
         }) & {
             baseServer: string;
             baseAssets: string;
@@ -616,7 +622,9 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
         _pageFilesAll: import("../../__internal/index.js").PageFile[];
         _baseServer: string;
         _baseAssets: string;
-        _pageContextInit: import("../renderPageServer.js").PageContextInit;
+        _pageContextInit: import("../renderPageServer.js").PageContextInit & {
+            headers?: Record<string, unknown>;
+        };
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
     } & {

package/dist/server/runtime/renderPageServer.d.ts

@@ -76,7 +76,7 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
         viteConfig: import("vite").ResolvedConfig | undefined;
         isClientSide: false;
         _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
+        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
     } | {
         _isPrerendering: true;
         viteConfig: import("vite").ResolvedConfig;
@@ -86,7 +86,7 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
         _usesClientRouter: boolean;
         isClientSide: false;
         _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
+        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
     } | {
         _isPrerendering: false;
         viteConfig: null;
@@ -96,7 +96,7 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
         _usesClientRouter: boolean;
         isClientSide: false;
         _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
+        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
     }) & {
         baseServer: string;
         baseAssets: string;
@@ -116,7 +116,9 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
     _pageFilesAll: import("../__internal/index.js").PageFile[];
     _baseServer: string;
     _baseAssets: string;
-    _pageContextInit: PageContextInit;
+    _pageContextInit: PageContextInit & {
+        headers?: Record<string, unknown>;
+    };
     _urlHandler: ((url: string) => string) | null;
     isClientSideNavigation: boolean;
 } & {

package/dist/shared-server-client/assertVirtualFileExports.js

@@ -1,7 +1,9 @@
+// TO-DO/eventually: remove
 export { assertVirtualFileExports };
 import { assert } from '../utils/assert.js';
 function assertVirtualFileExports(moduleExports, test, moduleId) {
-    if (!moduleExports || !test(moduleExports)) {
+    assert(moduleExports, typeof moduleExports);
+    if (!test(moduleExports)) {
         /* https://github.com/vikejs/vike/issues/2903#issuecomment-3642285811
         throw getProjectError('@cloudflare/vite-plugin error https://github.com/vikejs/vike/issues/2903#issuecomment-3642285811')
         /*/
@@ -10,7 +12,5 @@ function assertVirtualFileExports(moduleExports, test, moduleId) {
     }
 }
 function getKeys(obj) {
-    if (obj === undefined)
-        return null;
     return [...Object.getOwnPropertyNames(obj), ...Object.getOwnPropertySymbols(obj), ...Object.keys(obj)];
 }

package/dist/shared-server-client/createGlobalContextShared.d.ts

@@ -8,11 +8,11 @@ import type { PageConfigRuntime } from '../types/PageConfig.js';
 import { type GlobalContextPublicMinimum } from './getGlobalContextPublicShared.js';
 import type { GlobalContextServerInternal } from '../server/runtime/globalContext.js';
 import type { GlobalContextClientInternal } from '../client/runtime-client-routing/getGlobalContextClientInternal.js';
-import { type Hook } from './hooks/getHook.js';
+import { type HookInternal } from './hooks/getHook.js';
 declare const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
 declare function createGlobalContextShared<GlobalContextAdded extends {}, GlobalContextAddedAsync extends {}>(virtualFileExportsGlobalEntry: unknown, globalObject: {
     globalContext?: {};
-    onCreateGlobalContextHooks?: Hook<GlobalContextPublicMinimum>[];
+    onCreateGlobalContextHooks?: HookInternal<GlobalContextPublicMinimum>[];
     previousCreateGlobalContextPromise?: Promise<void>;
 }, addGlobalContext?: (globalContext: GlobalContextBase) => GlobalContextAdded, addGlobalContextTmp?: (globalContext: GlobalContextBase) => Promise<GlobalContextAdded>, addGlobalContextAsync?: (globalContext: GlobalContextBase) => Promise<GlobalContextAddedAsync>): Promise<{
     _globalConfigPublic: {

package/dist/shared-server-client/hooks/execHook.d.ts

@@ -9,28 +9,34 @@ export { getPageContext_sync };
 export { providePageContext };
 export { isUserHookError };
 export type { PageContextExecHook };
+export type { HookPublic };
 import type { PageContextClient, PageContextServer } from '../../types/PageContext.js';
-import type { Hook, HookLoc } from './getHook.js';
+import type { HookInternal, HookLoc } from './getHook.js';
 import type { PageContextConfig } from '../getPageFiles.js';
 import type { HookName, HookNameGlobal } from '../../types/Config.js';
 import { type PageContextPublicMinimum } from '../getPageContextPublicShared.js';
 import type { GlobalContextPublicMinimum } from '../getGlobalContextPublicShared.js';
-type HookWithResult = Hook & {
+type HookWithResult = HookInternal & {
     hookReturn: unknown;
 };
 type PageContextExecHook = PageContextPublicMinimum;
 declare function execHook<PageContext extends PageContextExecHook & PageContextConfig>(hookName: HookName, pageContext: PageContext, getPageContextPublic: (pageContext: PageContext) => PageContext): Promise<HookWithResult[]>;
 declare function execHookGlobal(hookName: HookNameGlobal, globalContext: GlobalContextPublicMinimum, getGlobalContextPublic: (globalContext: GlobalContextPublicMinimum) => GlobalContextPublicMinimum): Promise<void>;
-declare function execHookList<PageContext extends PageContextExecHook>(hooks: Hook[], pageContext: PageContext, getPageContextPublic: (pageContext: PageContext) => PageContext): Promise<HookWithResult[]>;
-declare function execHookSingle<PageContext extends PageContextExecHook>(hook: Hook, pageContext: PageContext, getPageContextPublic: (pageContext: PageContext) => PageContext): Promise<void>;
-declare function execHookSingleWithReturn<PageContext extends PageContextExecHook>(hook: Hook, pageContext: PageContext, getPageContextPublic: (pageContext: PageContext) => PageContext): Promise<{
+declare function execHookList<PageContext extends PageContextExecHook>(hooks: HookInternal[], pageContext: PageContext, getPageContextPublic: (pageContext: PageContext) => PageContext): Promise<HookWithResult[]>;
+declare function execHookSingle<PageContext extends PageContextExecHook>(hook: HookInternal, pageContext: PageContext, getPageContextPublic: (pageContext: PageContext) => PageContext): Promise<void>;
+declare function execHookSingleWithReturn<PageContext extends PageContextExecHook>(hook: HookInternal, pageContext: PageContext, getPageContextPublic: (pageContext: PageContext) => PageContext): Promise<{
     hookReturn: unknown;
 }>;
 declare function isUserHookError(err: unknown): false | HookLoc;
-declare function execHookSingleWithoutPageContext<HookReturn>(hook: Omit<Hook, 'hookFn'>, globalContext: GlobalContextPublicMinimum, hookFnCaller: () => HookReturn): Promise<HookReturn>;
-declare function execHookSingleSync<PageContext extends PageContextExecHook>(hook: Omit<Hook<PageContext>, 'hookTimeout'>, globalContext: GlobalContextPublicMinimum, pageContext: PageContext | null, getPageContextPublic: (pageContext: PageContext) => PageContext, hookFnCaller?: () => unknown): {
+declare function execHookSingleWithoutPageContext<HookReturn>(hook: Omit<HookInternal, 'hookFn'>, globalContext: GlobalContextPublicMinimum, hookFnCaller: () => HookReturn): Promise<HookReturn>;
+declare function execHookSingleSync<PageContext extends PageContextExecHook>(hook: Omit<HookInternal<PageContext>, 'hookTimeout'>, globalContext: GlobalContextPublicMinimum, pageContext: PageContext | null, getPageContextPublic: (pageContext: PageContext) => PageContext, hookFnCaller?: () => unknown): {
     hookReturn: unknown;
 };
+type HookPublic = {
+    name: HookName;
+    filePath: string;
+    call: () => void | Promise<void>;
+};
 declare function getPageContext_sync<PageContext = PageContextClient | PageContextServer>(): null | PageContext;
 /**
  * Provide `pageContext` for universal hooks.

package/dist/shared-server-client/hooks/execHook.js

@@ -136,6 +136,7 @@ function execHookBase(hookFnCaller, hook, globalContext, pageContext) {
         return originalReturn;
     };
     for (const onHookCall of configValue.value) {
+        // @ts-expect-error
         const hookPublic = { name: hookName, filePath: hookFilePath, call };
         // Recursively wrap callOriginal() so +onHookCall can use async hooks. (E.g. vike-react-sentry integrates Sentry's `Tracer.startActiveSpan()`.)
         call = () => {