vike 0.4.231 → 0.4.232-commit-ec54a7e

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

@@ -3,16 +3,15 @@ export type { PageContextDebugRouteMatches };
 import type { RouteMatches } from '../../../shared/route/index.js';
 import type { ClientDependency } from '../../../shared/getPageFiles/analyzePageClientSide/ClientDependency.js';
 import type { PageFile } from '../../../shared/getPageFiles.js';
-import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
+import type { GlobalContextServerInternal } from '../globalContext.js';
 type PageContextDebugRouteMatches = {
     _debugRouteMatches: 'ROUTING_ERROR' | RouteMatches;
 };
-declare function debugPageFiles({ pageContext, isHtmlOnly, isClientRouting, pageFilesLoaded, pageFilesServerSide, pageFilesClientSide, clientEntries, clientDependencies }: {
+declare function debugPageFiles({ pageContext, isHtmlOnly, isClientRouting, pageFilesLoaded, pageFilesServerSide, pageFilesClientSide, clientEntries, clientDependencies, }: {
     pageContext: {
         urlOriginal: string;
         pageId: string;
-        _pageFilesAll: PageFile[];
-        _pageConfigs: PageConfigRuntime[];
+        _globalContext: GlobalContextServerInternal;
     } & PageContextDebugRouteMatches;
     isHtmlOnly: boolean;
     isClientRouting: boolean;

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

@@ -1,10 +1,10 @@
 export { debugPageFiles };
 import pc from '@brillout/picocolors';
 import { assert, makeFirst, createDebugger } from '../utils.js';
-function debugPageFiles({ pageContext, isHtmlOnly, isClientRouting, pageFilesLoaded, pageFilesServerSide, pageFilesClientSide, clientEntries, clientDependencies }) {
+function debugPageFiles({ pageContext, isHtmlOnly, isClientRouting, pageFilesLoaded, pageFilesServerSide, pageFilesClientSide, clientEntries, clientDependencies, }) {
     const debug = createDebugger('vike:pageFiles', { serialization: { emptyArray: 'None' } });
     const padding = '   - ';
-    debug('All page files:', printPageFiles(pageContext._pageFilesAll, true)); // TODO
+    debug('All page files:', printPageFiles(pageContext._globalContext._pageFilesAll, true));
     debug(`URL:`, pageContext.urlOriginal);
     debug.options({ serialization: { emptyArray: 'No match' } })(`Routing:`, printRouteMatches(pageContext._debugRouteMatches));
     debug(`pageId:`, pageContext.pageId);

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

@@ -1,9 +1,9 @@
 export { execHookServer };
 export type { PageContextExecuteHookServer };
 import { type PageContextForPublicUsageServer } from './preparePageContextForPublicUsageServer.js';
-import type { PageConfigUserFriendlyOld } from '../../../shared/getPageFiles.js';
-import type { HookName } from '../../../shared/page-configs/Config.js';
-type PageContextExecuteHookServer = PageConfigUserFriendlyOld & PageContextForPublicUsageServer;
+import type { VikeConfigPublicPageLazy } from '../../../shared/getPageFiles.js';
+import type { HookName } from '../../../types/Config.js';
+type PageContextExecuteHookServer = VikeConfigPublicPageLazy & PageContextForPublicUsageServer;
 declare function execHookServer(hookName: HookName, pageContext: PageContextExecuteHookServer): 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/execHookServer.js

@@ -1,9 +1,6 @@
 export { execHookServer };
 import { execHook } from '../../../shared/hooks/execHook.js';
-import { preparePageContextForPublicUsageServer } from './preparePageContextForPublicUsageServer.js';
+import { preparePageContextForPublicUsageServer, } from './preparePageContextForPublicUsageServer.js';
 async function execHookServer(hookName, pageContext) {
-    return await execHook(hookName, pageContext, (p) => {
-        preparePageContextForPublicUsageServer(p);
-        return p;
-    });
+    return await execHook(hookName, pageContext, preparePageContextForPublicUsageServer);
 }

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

@@ -10,7 +10,7 @@ async function executeOnBeforeRenderAndDataHooks(pageContext) {
     if (dataHook) {
         // Note: hookReturn can be anything (e.g. an object) and is to be assigned to pageContext.data
         const pageContextFromHook = {
-            data: dataHook.hookReturn
+            data: dataHook.hookReturn,
         };
         Object.assign(pageContext, pageContextFromHook);
         // Execute +onData

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

@@ -4,7 +4,6 @@ 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 { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 import type { PageContextSerialization } from '../html/serializeContext.js';
 import type { GlobalContextServerInternal } from '../globalContext.js';
 type GetPageAssets = () => Promise<PageAsset[]>;
@@ -15,7 +14,6 @@ type HookName = 'onRenderHtml' | 'render';
 declare function executeOnRenderHtmlHook(pageContext: PageContextForPublicUsageServer & PageContextSerialization & {
     pageId: string;
     _globalContext: GlobalContextServerInternal;
-    _pageConfigs: PageConfigRuntime[];
     __getPageAssets: GetPageAssets;
     _isHtmlOnly: boolean;
     _baseServer: string;

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

@@ -1,12 +1,12 @@
 export { executeOnRenderHtmlHook };
-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 { assertPageContextProvidedByUser } from '../../../shared/assertPageContextProvidedByUser.js';
-import { preparePageContextForPublicUsageServer } from './preparePageContextForPublicUsageServer.js';
+import { preparePageContextForPublicUsageServer, } from './preparePageContextForPublicUsageServer.js';
 import { assertHookReturnedObject } from '../../../shared/assertHookReturnedObject.js';
-import { logRuntimeError } from './loggerRuntime.js';
+import { logRuntimeError } from '../loggerRuntime.js';
 import pc from '@brillout/picocolors';
 import { execHookSingleWithReturn } from '../../../shared/hooks/execHook.js';
 async function executeOnRenderHtmlHook(pageContext) {
@@ -52,9 +52,9 @@ function getRenderHook(pageContext) {
         }
     }
     if (!hookFound) {
-        const hookName = pageContext._pageConfigs.length > 0 ? 'onRenderHtml' : 'render';
+        const hookName = pageContext._globalContext._pageConfigs.length > 0 ? 'onRenderHtml' : 'render';
         assertUsage(false, [
-            `No ${hookName}() hook found, see https://vike.dev/${hookName}`
+            `No ${hookName}() hook found, see https://vike.dev/${hookName}`,
             /*
             'See https://vike.dev/render-modes for more information.',
             [
@@ -82,7 +82,7 @@ function processHookReturnValue(hookReturnValue, renderHook) {
         assertWarning(false, [
             errPrefix,
             `returned a plain JavaScript string which is ${pc.red(pc.bold('dangerous'))}: it should instead return`,
-            errSuffix
+            errSuffix,
         ].join(' '), { onlyOnce: true });
         hookReturnValue = dangerouslySkipEscape(hookReturnValue);
     }
@@ -101,7 +101,7 @@ function processHookReturnValue(hookReturnValue, renderHook) {
             assertWarning(false, [
                 errBegin,
                 `is a plain JavaScript string which is ${pc.bold(pc.red('dangerous'))}: ${pc.cyan('documentHtml')} should be`,
-                errSuffix
+                errSuffix,
             ].join(' '), { onlyOnce: true });
             val = dangerouslySkipEscape(val);
         }

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

@@ -10,7 +10,7 @@ function getEarlyHints(assets) {
                 return;
             earlyHints.push({
                 ...asset,
-                earlyHintLink: inferEarlyHintLink(asset)
+                earlyHintLink: inferEarlyHintLink(asset),
             });
         });
     }

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

@@ -1,6 +1,6 @@
 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 pc from '@brillout/picocolors';
@@ -93,7 +93,7 @@ function getHttpResponseBodyStreamHandlers(htmlRender, renderHook) {
             if (!success) {
                 assertUsage(false, getErrMsg(htmlRender, renderHook, 'pipeToNodeWritable()'));
             }
-        }
+        },
     };
     function getFixMsg(kind, type) {
         const streamName = getStreamName(kind, type);

package/dist/esm/node/runtime/renderPage/getPageAssets/getManifestEntry.d.ts

@@ -1,5 +1,5 @@
 export { getManifestEntry };
-import type { ViteManifest, ViteManifestEntry } from '../../../shared/ViteManifest.js';
+import type { ViteManifest, ViteManifestEntry } from '../../../../types/ViteManifest.js';
 declare function getManifestEntry(id: string, assetsManifest: ViteManifest): {
     manifestKey: string;
     manifestEntry: ViteManifestEntry;

package/dist/esm/node/runtime/renderPage/getPageAssets/getManifestEntry.js

@@ -1,6 +1,6 @@
 export { getManifestEntry };
 import { assert, slice, assertIsImportPathNpmPackage } from '../../utils.js';
-import { isVirtualFileIdPageConfigValuesAll } from '../../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
+import { isVirtualFileIdPageConfigLazy } from '../../../shared/virtualFiles/virtualFilePageConfigLazy.js';
 import { prependEntriesDir } from '../../../shared/prependEntriesDir.js';
 function getManifestEntry(id, assetsManifest) {
     const debugInfo = getDebugInfo(id, assetsManifest);
@@ -12,7 +12,7 @@ function getManifestEntry(id, assetsManifest) {
         return { manifestEntry, manifestKey };
     }
     // Page code importer
-    if (isVirtualFileIdPageConfigValuesAll(id)) {
+    if (isVirtualFileIdPageConfigLazy(id)) {
         {
             const manifestKey = id;
             const manifestEntry = assetsManifest[manifestKey];
@@ -22,10 +22,10 @@ function getManifestEntry(id, assetsManifest) {
         }
         // Workaround for what seems to be a Vite bug when process.cwd() !== config.root
         //  - Manifest key is:
-        //       ../../virtual:vike:pageConfigValuesAll:client:/pages/index
+        //       ../../virtual:vike:pageConfigLazy:client:/pages/index
         //    But it should be this instead:
-        //      virtual:vike:pageConfigValuesAll:client:/pages/index
-        //  - This workaround was implemented to support Vitest runnung /tests/*
+        //      virtual:vike:pageConfigLazy:client:/pages/index
+        //  - This workaround was implemented to support Vitest running /tests/*
         //    - I don't know whether end users actually need this workaround? (I'm not sure what the bug actually is.)
         const manifestKeyEnd = id;
         const { manifestKey, manifestEntry } = getEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id);

package/dist/esm/node/runtime/renderPage/getPageAssets/retrieveAssetsProd.d.ts

@@ -1,4 +1,4 @@
 export { retrieveAssetsProd };
-import type { ViteManifest } from '../../../shared/ViteManifest.js';
+import type { ViteManifest } from '../../../../types/ViteManifest.js';
 import type { ClientDependency } from '../../../../shared/getPageFiles/analyzePageClientSide/ClientDependency.js';
 declare function retrieveAssetsProd(clientDependencies: ClientDependency[], assetsManifest: ViteManifest, includeAssetsImportedByServer: boolean): string[];

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

@@ -16,7 +16,7 @@ function retrieveAssetsProd(clientDependencies, assetsManifest, includeAssetsImp
             // We assume that all npm packages have already built their files: bundlers (Rollup, esbuild, tsup, ...) extract the CSS out of JavaScript => we can assume JavaScript to not import any CSS/assets.
             !isImportPathNpmPackage(id, {
                 // I presume Vite already resolves path aliases when Vite sets the module's id
-                cannotBePathAlias: true
+                cannotBePathAlias: true,
             })) {
             id = extractAssetsAddQuery(id);
         }

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

@@ -1,12 +1,14 @@
 export { getPageAssets };
 export { setResolveClientEntriesDev };
+export { resolveIncludeAssetsImportedByServer };
 export type { PageAsset };
 export type { GetPageAssets };
 export type { PageContextGetPageAssets };
 import { type MediaType } from './inferMediaType.js';
 import type { ClientDependency } from '../../../shared/getPageFiles/analyzePageClientSide/ClientDependency.js';
 import type { GlobalContextServerInternal } from '../globalContext.js';
-import type { ResolveClientEntriesDev } from '../../plugin/shared/resolveClientEntriesDev.js';
+import type { ResolveClientEntriesDev } from '../../vite/shared/resolveClientEntriesDev.js';
+import type { ConfigResolved } from '../../../types/index.js';
 type PageAsset = {
     src: string;
     assetType: null | NonNullable<MediaType>['assetType'];
@@ -17,8 +19,8 @@ type GetPageAssets = () => Promise<PageAsset[]>;
 type PageContextGetPageAssets = {
     _baseServer: string;
     _baseAssets: string | null;
-    _includeAssetsImportedByServer: boolean;
     _globalContext: GlobalContextServerInternal;
 };
 declare function getPageAssets(pageContext: PageContextGetPageAssets, clientDependencies: ClientDependency[], clientEntries: string[]): Promise<PageAsset[]>;
 declare function setResolveClientEntriesDev(resolveClientEntriesDev: ResolveClientEntriesDev): void;
+declare function resolveIncludeAssetsImportedByServer(config: ConfigResolved): boolean;

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

@@ -1,5 +1,6 @@
 export { getPageAssets };
 export { setResolveClientEntriesDev };
+export { resolveIncludeAssetsImportedByServer };
 import { assert, prependBase, toPosixPath, unique, getGlobalObject } from '../utils.js';
 import { retrieveAssetsDev } from './getPageAssets/retrieveAssetsDev.js';
 import { retrieveAssetsProd } from './getPageAssets/retrieveAssetsProd.js';
@@ -7,7 +8,7 @@ import { inferMediaType } from './inferMediaType.js';
 import { getManifestEntry } from './getPageAssets/getManifestEntry.js';
 import { sortPageAssetsForEarlyHintsHeader } from './getPageAssets/sortPageAssetsForEarlyHintsHeader.js';
 const globalObject = getGlobalObject('renderPage/getPageAssets.ts', {
-    resolveClientEntriesDev: null
+    resolveClientEntriesDev: null,
 });
 async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     const globalContext = pageContext._globalContext;
@@ -23,7 +24,7 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     else {
         const { assetsManifest } = globalContext;
         clientEntriesSrc = clientEntries.map((clientEntry) => resolveClientEntriesProd(clientEntry, assetsManifest));
-        assetUrls = retrieveAssetsProd(clientDependencies, assetsManifest, pageContext._includeAssetsImportedByServer);
+        assetUrls = retrieveAssetsProd(clientDependencies, assetsManifest, resolveIncludeAssetsImportedByServer(pageContext._globalContext.config));
     }
     let pageAssets = [];
     unique([...clientEntriesSrc, ...assetUrls]).forEach((src) => {
@@ -44,7 +45,7 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
             src,
             assetType,
             mediaType,
-            isEntry
+            isEntry,
         });
     });
     pageAssets.forEach(({ src }) => {
@@ -68,3 +69,6 @@ function resolveClientEntriesProd(clientEntry, assetsManifest) {
 function setResolveClientEntriesDev(resolveClientEntriesDev) {
     globalObject.resolveClientEntriesDev = resolveClientEntriesDev;
 }
+function resolveIncludeAssetsImportedByServer(config) {
+    return config.includeAssetsImportedByServer ?? true;
+}

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

@@ -1,15 +1,11 @@
 export { handleErrorWithoutErrorPage };
 import type { GlobalContextServerInternal } from '../globalContext.js';
 import type { PageContextAfterRender } from './renderPageAlreadyRouted.js';
-import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
-import type { PageFile } from '../../../shared/getPageFiles.js';
 declare function handleErrorWithoutErrorPage<PageContext extends {
     isClientSideNavigation: boolean;
     errorWhileRendering: null | Error;
     is404: null | boolean;
     pageId: null;
-    _pageFilesAll: PageFile[];
-    _pageConfigs: PageConfigRuntime[];
     _globalContext: GlobalContextServerInternal;
     urlOriginal: string;
 }>(pageContext: PageContext): Promise<PageContext & PageContextAfterRender>;

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

@@ -8,7 +8,7 @@ async function handleErrorWithoutErrorPage(pageContext) {
     assert(pageContext.pageId === null);
     assert(pageContext.errorWhileRendering || pageContext.is404);
     {
-        const isV1 = pageContext._pageConfigs.length > 0;
+        const isV1 = pageContext._globalContext._pageConfigs.length > 0;
         await warnMissingErrorPage(isV1, pageContext._globalContext._isProduction);
     }
     if (!pageContext.isClientSideNavigation) {
@@ -29,7 +29,7 @@ async function warnMissingErrorPage(isV1, isProduction) {
         const msg = [
             `No ${isV1 ? 'error page' : pc.cyan('_error.page.js')} found,`,
             'we recommend defining one',
-            'https://vike.dev/error-page'
+            'https://vike.dev/error-page',
         ].join(' ');
         assertWarning(false, msg, { onlyOnce: true });
     }

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

@@ -11,7 +11,7 @@ function handlePageContextRequestUrl(url) {
 function hasSuffix(url) {
     const { pathnameOriginal, pathname } = parseUrl(url, baseServer);
     assert(pathnameOriginal.endsWith(pageContextJsonFileExtension) === pathname.endsWith(pageContextJsonFileExtension), {
-        url
+        url,
     });
     return pathnameOriginal.endsWith(pageContextJsonFileExtension);
 }

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

@@ -4,12 +4,12 @@ function isFontFallback(asset, pageAssets) {
     if (asset.assetType !== 'font') {
         return false;
     }
-    const fontUrlBase = removeFileExtentionAndHash(asset.src);
+    const fontUrlBase = removeFileExtensionAndHash(asset.src);
     return pageAssets.some((assetOther) => {
-        return assetOther.assetType === 'font' && removeFileExtentionAndHash(assetOther.src) === fontUrlBase;
+        return assetOther.assetType === 'font' && removeFileExtensionAndHash(assetOther.src) === fontUrlBase;
     });
 }
-function removeFileExtentionAndHash(assetUrl) {
+function removeFileExtensionAndHash(assetUrl) {
     assert(!assetUrl.includes('\\'));
     // The logic below doesn't work for '/assets/chunk-0e184ced.js'
     assert(!assetUrl.endsWith('.js'));

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

@@ -1,4 +1,6 @@
 export { isNewError };
 export { setAlreadyLogged };
+export { hasAlreadyLogged };
 declare function isNewError(errErrorPage: unknown, errNominalPage: unknown): boolean;
+declare function hasAlreadyLogged(err: unknown): boolean;
 declare function setAlreadyLogged(err: unknown): void;

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

@@ -1,8 +1,9 @@
 export { isNewError };
 export { setAlreadyLogged };
+export { hasAlreadyLogged };
 import { getGlobalObject, isObject, isSameErrorMessage, warnIfErrorIsNotObject } from '../utils.js';
 const globalObject = getGlobalObject('renderPage/isNewError.ts', {
-    wasAlreadyLogged: new WeakSet()
+    wasAlreadyLogged: new WeakSet(),
 });
 function isNewError(errErrorPage, errNominalPage) {
     warnIfErrorIsNotObject(errErrorPage);

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

@@ -1,22 +1,27 @@
 export { loadPageConfigsLazyServerSide };
-export type { PageFiles };
 export type { PageContext_loadPageConfigsLazyServerSide };
-import { type PageFile } from '../../../shared/getPageFiles.js';
+export type { PageConfigsLazy };
 import { PromiseType } from '../utils.js';
 import { PageContextGetPageAssets, type PageAsset } from './getPageAssets.js';
 import { type PageContextDebugRouteMatches } from './debugPageFiles.js';
-import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 import type { GlobalContextServerInternal } from '../globalContext.js';
+import { type PageContextExecuteHookServer } from './execHookServer.js';
+type PageContextExecute = Omit<PageContextExecuteHookServer, keyof Awaited<ReturnType<typeof loadPageConfigsLazy>>>;
 type PageContext_loadPageConfigsLazyServerSide = PageContextGetPageAssets & PageContextDebugRouteMatches & {
+    pageId: string;
     urlOriginal: string;
-    _pageFilesAll: PageFile[];
-    _pageConfigs: PageConfigRuntime[];
     _globalContext: GlobalContextServerInternal;
 };
-type PageFiles = PromiseType<ReturnType<typeof loadPageConfigsLazyServerSide>>;
-declare function loadPageConfigsLazyServerSide(pageContext: {
-    pageId: string;
-} & PageContext_loadPageConfigsLazyServerSide): Promise<import("../../../shared/getPageFiles.js").PageConfigUserFriendlyOld & {
+type PageConfigsLazy = PromiseType<ReturnType<typeof loadPageConfigsLazy>>;
+declare function loadPageConfigsLazyServerSide<PageContext extends PageContext_loadPageConfigsLazyServerSide & PageContextExecute>(pageContext: PageContext): Promise<PageContext & import("../../../shared/getPageFiles.js").VikeConfigPublicPageLazy & {
+    Page: unknown;
+    _isHtmlOnly: boolean;
+    _passToClient: string[];
+    _pageFilePathsLoaded: string[];
+} & {
+    __getPageAssets: () => Promise<PageAsset[]>;
+}>;
+declare function loadPageConfigsLazy(pageContext: PageContext_loadPageConfigsLazyServerSide): Promise<import("../../../shared/getPageFiles.js").VikeConfigPublicPageLazy & {
     Page: unknown;
     _isHtmlOnly: boolean;
     _passToClient: string[];

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

@@ -1,21 +1,30 @@
 export { loadPageConfigsLazyServerSide };
 import { getPageFilesServerSide } from '../../../shared/getPageFiles.js';
-import { getUserFriendlyConfigsPageLazy } from '../../../shared/page-configs/getUserFriendlyConfigs.js';
+import { resolveVikeConfigPublicPageLazy } from '../../../shared/page-configs/resolveVikeConfigPublic.js';
 import { analyzePageClientSideInit } from '../../../shared/getPageFiles/analyzePageClientSide.js';
-import { assert, assertUsage, assertWarning, hasProp, isArrayOfStrings, objectAssign, isArray } from '../utils.js';
+import { assert, assertUsage, assertWarning, hasProp, isArrayOfStrings, objectAssign, isArray, } from '../utils.js';
 import { getPageAssets } from './getPageAssets.js';
 import { debugPageFiles } from './debugPageFiles.js';
 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';
 async function loadPageConfigsLazyServerSide(pageContext) {
-    const pageConfig = findPageConfig(pageContext._pageConfigs, pageContext.pageId); // Make pageConfig globally available as pageContext._pageConfig?
+    const pageContextAddendum = await loadPageConfigsLazy(pageContext);
+    objectAssign(pageContext, pageContextAddendum);
+    await execHookServer('onCreatePageContext', pageContext);
+    return pageContext;
+}
+async function loadPageConfigsLazy(pageContext) {
+    const pageConfig = findPageConfig(pageContext._globalContext._pageConfigs, pageContext.pageId); // Make pageConfig globally available as pageContext._pageConfig ?
     const globalContext = pageContext._globalContext;
     const [{ pageFilesLoaded, pageContextExports }] = await Promise.all([
-        loadPageUserFiles(pageContext._pageFilesAll, pageConfig, globalContext._pageConfigGlobal, pageContext.pageId, !globalContext._isProduction),
-        analyzePageClientSideInit(pageContext._pageFilesAll, pageContext.pageId, { sharedPageFilesAlreadyLoaded: true })
+        loadPageUserFiles(pageContext._globalContext._pageFilesAll, pageConfig, globalContext._pageConfigGlobal, pageContext.pageId, !globalContext._isProduction),
+        analyzePageClientSideInit(pageContext._globalContext._pageFilesAll, pageContext.pageId, {
+            sharedPageFilesAlreadyLoaded: true,
+        }),
     ]);
-    const { isHtmlOnly, isClientRouting, clientEntries, clientDependencies, pageFilesClientSide, pageFilesServerSide } = await analyzePage(pageContext._pageFilesAll, pageConfig, pageContext.pageId, globalContext);
+    const { isHtmlOnly, isClientRouting, clientEntries, clientDependencies, pageFilesClientSide, pageFilesServerSide } = await analyzePage(pageContext._globalContext._pageFilesAll, pageConfig, pageContext.pageId, globalContext);
     const isV1Design = !!pageConfig;
     const passToClient = [];
     const errMsg = ' should be an array of strings.';
@@ -41,7 +50,7 @@ async function loadPageConfigsLazyServerSide(pageContext) {
         Page: pageContextExports.exports.Page,
         _isHtmlOnly: isHtmlOnly,
         _passToClient: passToClient,
-        _pageFilePathsLoaded: pageFilesLoaded.map((p) => p.filePath)
+        _pageFilePathsLoaded: pageFilesLoaded.map((p) => p.filePath),
     });
     objectAssign(pageContextAddendum, {
         __getPageAssets: async () => {
@@ -53,14 +62,14 @@ async function loadPageConfigsLazyServerSide(pageContext) {
                 objectAssign(pageContext, { _pageAssets: pageAssets });
                 return pageContext._pageAssets;
             }
-        }
+        },
     });
     // TODO/v1-release: remove
     Object.assign(pageContextAddendum, {
         _getPageAssets: async () => {
             assertWarning(false, 'pageContext._getPageAssets() deprecated, see https://vike.dev/preloading', {
                 onlyOnce: true,
-                showStackTrace: true
+                showStackTrace: true,
             });
             const pageAssetsOldFormat = [];
             (await pageContextAddendum.__getPageAssets()).forEach((p) => {
@@ -69,40 +78,38 @@ async function loadPageConfigsLazyServerSide(pageContext) {
                         src: p.src,
                         preloadType: null,
                         assetType: 'script',
-                        mediaType: p.mediaType
+                        mediaType: p.mediaType,
                     });
                 }
                 pageAssetsOldFormat.push({
                     src: p.src,
                     preloadType: p.assetType,
                     assetType: p.assetType === 'style' ? 'style' : 'preload',
-                    mediaType: p.mediaType
+                    mediaType: p.mediaType,
                 });
             });
             return pageAssetsOldFormat;
-        }
+        },
+    });
+    debugPageFiles({
+        pageContext,
+        isHtmlOnly,
+        isClientRouting,
+        pageFilesLoaded,
+        pageFilesClientSide,
+        pageFilesServerSide,
+        clientEntries,
+        clientDependencies,
     });
-    {
-        debugPageFiles({
-            pageContext,
-            isHtmlOnly,
-            isClientRouting,
-            pageFilesLoaded,
-            pageFilesClientSide,
-            pageFilesServerSide,
-            clientEntries,
-            clientDependencies
-        });
-    }
     return pageContextAddendum;
 }
 async function loadPageUserFiles(pageFilesAll, pageConfig, pageConfigGlobal, pageId, isDev) {
     const pageFilesServerSide = getPageFilesServerSide(pageFilesAll, pageId);
     const pageConfigLoaded = !pageConfig ? null : await loadConfigValues(pageConfig, isDev);
     await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
-    const pageContextExports = getUserFriendlyConfigsPageLazy(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
+    const pageContextExports = resolveVikeConfigPublicPageLazy(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
     return {
         pageContextExports,
-        pageFilesLoaded: pageFilesServerSide
+        pageFilesLoaded: pageFilesServerSide,
     };
 }

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

@@ -6,7 +6,6 @@ declare function log404(pageContext: {
     urlPathname: string;
     errorWhileRendering: null | Error;
     isClientSideNavigation: boolean;
-    _pageRoutes: PageRoutes;
     _globalContext: GlobalContextServerInternal;
 }): Promise<void>;
 declare function getRoutesInfo(pageRoutes: PageRoutes): string | null;

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

@@ -2,16 +2,12 @@ export { log404 };
 // Exported for ./index.spec.ts
 export { getRoutesInfo };
 import { noRouteMatch } from '../../../../shared/route/noRouteMatch.js';
-import { assert, assertUsage, assertInfo, compareString, stripAnsi, getTerminalWidth, truncateString } from '../../utils.js';
+import { assert, assertUsage, assertInfo, compareString, stripAnsi, getTerminalWidth, truncateString, } from '../../utils.js';
 import pc from '@brillout/picocolors';
 async function log404(pageContext) {
     const { urlPathname } = pageContext;
-    const pageRoutes = pageContext._pageRoutes;
-    assertUsage(pageRoutes.length > 0, 'No page found.'
-    /* TODO/v1-release: use this
-    'No page found. Create at least one /pages/some-page/+Page.js file.'
-    */
-    );
+    const pageRoutes = pageContext._globalContext._pageRoutes;
+    assertUsage(pageRoutes.length > 0, 'No page found.');
     const globalContext = pageContext._globalContext;
     if (!globalContext._isProduction && !isFileRequest(urlPathname) && !pageContext.isClientSideNavigation) {
         const routesInfo = getRoutesInfo(pageRoutes);
@@ -68,9 +64,9 @@ function getRoutesInfo(pageRoutes) {
         {
             routeStr: 'ROUTE',
             routeTypeSrc: 'TYPE',
-            routeDefinedBy: 'DEFINED BY'
+            routeDefinedBy: 'DEFINED BY',
         },
-        ...entries
+        ...entries,
     ];
     const terminalWidth = getTerminalWidth() || 134;
     let width2 = Math.max(...linesContent.map(({ routeTypeSrc }) => stripAnsi(routeTypeSrc).length));
@@ -116,7 +112,7 @@ function getRoutesInfo(pageRoutes) {
         lines[0],
         pc.dim(`├${'─'.repeat(width1)}┼${'─'.repeat(width2)}┼${'─'.repeat(width3)}┤`),
         ...lines.slice(1),
-        pc.dim(`└${'─'.repeat(width1)}┴${'─'.repeat(width2)}┴${'─'.repeat(width3)}┘`)
+        pc.dim(`└${'─'.repeat(width1)}┴${'─'.repeat(width2)}┴${'─'.repeat(width3)}┘`),
     ];
     lines.forEach((line) => {
         assert(stripAnsi(line).length <= terminalWidth);

package/dist/esm/node/runtime/renderPage/logErrorHint/errors.d.ts

@@ -1 +1 @@
-export declare const errror_cannot_use_import_outside_of_module = "\nimport{useRunner as e}from\"react-runner\";export*from\"react-runner\";import t,{useState as r,useEffect as n,Fragment as a,useCallback as l,useRef as o,useMemo as c,createContext as s,useContext as i}from\"react\";import p from\"react-simple-code-editor\";import m,{Prism as u}from\"prism-react-renderer\";function g(){return g=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var r=arguments[t];for(var n in r)Object.prototype.hasOwnProperty.call(r,n)&&(e[n]=r[n])}return e},g.apply(this,arguments)}function y(e,t){if(null==e)return{};var r,n,a={},l=Object.keys(e);for(n=0;n<l.length;n++)t.indexOf(r=l[n])>=0||(a[r]=e[r]);return a}const d=[\"initialCode\",\"transformCode\"],h=t=>{let{initialCode:a=\"\",transformCode:l}=t,o=y(t,d);const[c,s]=r(a),{element:i,error:p}=e(g({code:l?l(c):c},o));return n(()=>{s(a)},[a]),{element:i,error:p,code:c,onChange:s}},f={plain:{color:\"#ffffff\",backgroundColor:\"#282c34\"},styles:[{types:[\"comment\",\"block-comment\",\"prolog\",\"doctype\",\"cdata\"],style:{color:\"#b2b2b2\"}},{types:[\"property\",\"number\",\"function-name\",\"constant\",\"symbol\",\"deleted\"],style:{color:\"#5a9bcf\"}},{types:[\"boolean\"],style:{color:\"#ff8b50\"}},{types:[\"tag\"],style:{color:\"#fc929e\"}},{types:[\"string\",\"attr-value\"],style:{color:\"#8dc891\"}},{types:[\"punctuation\"],style:{color:\"#88c6Be\"}},{types:[\"selector\",\"char\",\"builtin\",\"inserted\"],style:{color:\"#d8dee9\"}},{types:[\"function\"],style:{color:\"#79b6f2\"}},{types:[\"operator\",\"entity\",\"url\",\"variable\"],style:{color:\"#d7deea\"}},{types:[\"keyword\"],style:{color:\"#c5a5c5\"}},{types:[\"atrule\",\"class-name\"],style:{color:\"#fac863\"}},{types:[\"important\"],style:{fontWeight:\"400\"}},{types:[\"bold\"],style:{fontWeight:\"700\"}},{types:[\"italic\"],style:{fontStyle:\"italic\"}},{types:[\"entity\"],style:{cursor:\"help\"}},{types:[\"namespace\"],style:{opacity:.7}}]},b=[\"children\",\"language\",\"theme\",\"Prism\",\"padding\",\"noWrapper\",\"noWrap\",\"className\",\"style\"],C=e=>{let{children:r,language:n=\"jsx\",theme:l=f,Prism:o=u,padding:c=10,noWrapper:s,noWrap:i,className:p,style:d}=e,h=y(e,b);/*#__PURE__*/return t.createElement(m,{code:r||\"\",language:n,Prism:o,theme:l},({className:e,style:r,tokens:n,getLineProps:l,getTokenProps:o})=>{const m=n.map((e,r)=>/*#__PURE__*/t.createElement(a,{key:r},/*#__PURE__*/t.createElement(\"span\",l({line:e}),e.map((e,r)=>/*#__PURE__*/t.createElement(\"span\",o({token:e,key:r})))),\"\\n\"));return s?m:/*#__PURE__*/t.createElement(\"pre\",g({className:p?:e,style:g({},r,{margin:0,padding:c,whiteSpace:i?\"pre\":\"pre-wrap\"},d)},h),m)})},v=[\"defaultValue\",\"value\",\"language\",\"theme\",\"Prism\",\"highlight\",\"padding\",\"onChange\"],E=e=>{let{defaultValue:n,value:a,language:s=\"jsx\",theme:i=f,Prism:m,highlight:u,padding:d=10,onChange:h}=e,b=y(e,v);const[E,P]=r(n||\"\"),k=void 0!==a,W=l(e=>/*#__PURE__*/t.createElement(C,{language:s,theme:i,Prism:m,noWrapper:!0},e),[s,i,m]),j=o(h);j.current=h;const x=l(e=>{k||P(e),null==j.current||j.current(e)},[k]),O=c(()=>g({},i.plain,b.style),[i.plain,b.style]);/*#__PURE__*/return t.createElement(p,g({},b,{highlight:u||W,padding:d,value:k?a:E,onValueChange:x,style:O}))},P=s({}),k=()=>i(P),W=[\"children\",\"code\",\"language\",\"theme\"],j=e=>{let{children:r,code:n=\"\",language:a=\"jsx\",theme:l=f}=e,o=y(e,W);const{element:c,error:s,code:i,onChange:p}=h(g({initialCode:n},o));/*#__PURE__*/return t.createElement(P.Provider,{value:{element:c,error:s,code:i,onChange:p,language:a,theme:l}},r)},x=e=>{const{code:r,language:n,theme:a,onChange:l}=k();/*#__PURE__*/return t.createElement(E,g({value:r,language:n,theme:a,onChange:l},e))},O=[\"Component\"],w=e=>{let{Component:r=\"div\"}=e,n=y(e,O);const{element:a}=k();/*#__PURE__*/return t.createElement(r,n,a)},N=e=>{const{error:r}=k();return r?/*#__PURE__*/t.createElement(\"pre\",e,r):/*#__PURE__*/t.createElement(t.Fragment,null)};export{C as CodeBlock,E as CodeEditor,P as LiveContext,x as LiveEditor,N as LiveError,w as LivePreview,j as LiveProvider,f as defaultTheme,k as useLiveContext,h as useLiveRunner};\n^^^^^^\n\n    SyntaxError: Cannot use import statement outside a module\n        at Object.compileFunction (node:vm:360:18)\n        at wrapSafe (node:internal/modules/cjs/loader:1084:15)\n        at Module._compile (node:internal/modules/cjs/loader:1119:27)\n        at Object.Module._extensions..js (node:internal/modules/cjs/loader:1209:10)\n        at Module.load (node:internal/modules/cjs/loader:1033:32)\n        at Function.Module._load (node:internal/modules/cjs/loader:868:12)\n        at ModuleWrap.<anonymous> (node:internal/modules/esm/translators:169:29)\n        at ModuleJob.run (node:internal/modules/esm/module_job:193:25)\n        at processTicksAndRejections (node:internal/process/task_queues:96:5)\n        at async Promise.all (index 0)\n";
+export declare const error_cannot_use_import_outside_of_module = "\nimport{useRunner as e}from\"react-runner\";export*from\"react-runner\";import t,{useState as r,useEffect as n,Fragment as a,useCallback as l,useRef as o,useMemo as c,createContext as s,useContext as i}from\"react\";import p from\"react-simple-code-editor\";import m,{Prism as u}from\"prism-react-renderer\";function g(){return g=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var r=arguments[t];for(var n in r)Object.prototype.hasOwnProperty.call(r,n)&&(e[n]=r[n])}return e},g.apply(this,arguments)}function y(e,t){if(null==e)return{};var r,n,a={},l=Object.keys(e);for(n=0;n<l.length;n++)t.indexOf(r=l[n])>=0||(a[r]=e[r]);return a}const d=[\"initialCode\",\"transformCode\"],h=t=>{let{initialCode:a=\"\",transformCode:l}=t,o=y(t,d);const[c,s]=r(a),{element:i,error:p}=e(g({code:l?l(c):c},o));return n(()=>{s(a)},[a]),{element:i,error:p,code:c,onChange:s}},f={plain:{color:\"#ffffff\",backgroundColor:\"#282c34\"},styles:[{types:[\"comment\",\"block-comment\",\"prolog\",\"doctype\",\"cdata\"],style:{color:\"#b2b2b2\"}},{types:[\"property\",\"number\",\"function-name\",\"constant\",\"symbol\",\"deleted\"],style:{color:\"#5a9bcf\"}},{types:[\"boolean\"],style:{color:\"#ff8b50\"}},{types:[\"tag\"],style:{color:\"#fc929e\"}},{types:[\"string\",\"attr-value\"],style:{color:\"#8dc891\"}},{types:[\"punctuation\"],style:{color:\"#88c6Be\"}},{types:[\"selector\",\"char\",\"builtin\",\"inserted\"],style:{color:\"#d8dee9\"}},{types:[\"function\"],style:{color:\"#79b6f2\"}},{types:[\"operator\",\"entity\",\"url\",\"variable\"],style:{color:\"#d7deea\"}},{types:[\"keyword\"],style:{color:\"#c5a5c5\"}},{types:[\"atrule\",\"class-name\"],style:{color:\"#fac863\"}},{types:[\"important\"],style:{fontWeight:\"400\"}},{types:[\"bold\"],style:{fontWeight:\"700\"}},{types:[\"italic\"],style:{fontStyle:\"italic\"}},{types:[\"entity\"],style:{cursor:\"help\"}},{types:[\"namespace\"],style:{opacity:.7}}]},b=[\"children\",\"language\",\"theme\",\"Prism\",\"padding\",\"noWrapper\",\"noWrap\",\"className\",\"style\"],C=e=>{let{children:r,language:n=\"jsx\",theme:l=f,Prism:o=u,padding:c=10,noWrapper:s,noWrap:i,className:p,style:d}=e,h=y(e,b);/*#__PURE__*/return t.createElement(m,{code:r||\"\",language:n,Prism:o,theme:l},({className:e,style:r,tokens:n,getLineProps:l,getTokenProps:o})=>{const m=n.map((e,r)=>/*#__PURE__*/t.createElement(a,{key:r},/*#__PURE__*/t.createElement(\"span\",l({line:e}),e.map((e,r)=>/*#__PURE__*/t.createElement(\"span\",o({token:e,key:r})))),\"\\n\"));return s?m:/*#__PURE__*/t.createElement(\"pre\",g({className:p?:e,style:g({},r,{margin:0,padding:c,whiteSpace:i?\"pre\":\"pre-wrap\"},d)},h),m)})},v=[\"defaultValue\",\"value\",\"language\",\"theme\",\"Prism\",\"highlight\",\"padding\",\"onChange\"],E=e=>{let{defaultValue:n,value:a,language:s=\"jsx\",theme:i=f,Prism:m,highlight:u,padding:d=10,onChange:h}=e,b=y(e,v);const[E,P]=r(n||\"\"),k=void 0!==a,W=l(e=>/*#__PURE__*/t.createElement(C,{language:s,theme:i,Prism:m,noWrapper:!0},e),[s,i,m]),j=o(h);j.current=h;const x=l(e=>{k||P(e),null==j.current||j.current(e)},[k]),O=c(()=>g({},i.plain,b.style),[i.plain,b.style]);/*#__PURE__*/return t.createElement(p,g({},b,{highlight:u||W,padding:d,value:k?a:E,onValueChange:x,style:O}))},P=s({}),k=()=>i(P),W=[\"children\",\"code\",\"language\",\"theme\"],j=e=>{let{children:r,code:n=\"\",language:a=\"jsx\",theme:l=f}=e,o=y(e,W);const{element:c,error:s,code:i,onChange:p}=h(g({initialCode:n},o));/*#__PURE__*/return t.createElement(P.Provider,{value:{element:c,error:s,code:i,onChange:p,language:a,theme:l}},r)},x=e=>{const{code:r,language:n,theme:a,onChange:l}=k();/*#__PURE__*/return t.createElement(E,g({value:r,language:n,theme:a,onChange:l},e))},O=[\"Component\"],w=e=>{let{Component:r=\"div\"}=e,n=y(e,O);const{element:a}=k();/*#__PURE__*/return t.createElement(r,n,a)},N=e=>{const{error:r}=k();return r?/*#__PURE__*/t.createElement(\"pre\",e,r):/*#__PURE__*/t.createElement(t.Fragment,null)};export{C as CodeBlock,E as CodeEditor,P as LiveContext,x as LiveEditor,N as LiveError,w as LivePreview,j as LiveProvider,f as defaultTheme,k as useLiveContext,h as useLiveRunner};\n^^^^^^\n\n    SyntaxError: Cannot use import statement outside a module\n        at Object.compileFunction (node:vm:360:18)\n        at wrapSafe (node:internal/modules/cjs/loader:1084:15)\n        at Module._compile (node:internal/modules/cjs/loader:1119:27)\n        at Object.Module._extensions..js (node:internal/modules/cjs/loader:1209:10)\n        at Module.load (node:internal/modules/cjs/loader:1033:32)\n        at Function.Module._load (node:internal/modules/cjs/loader:868:12)\n        at ModuleWrap.<anonymous> (node:internal/modules/esm/translators:169:29)\n        at ModuleJob.run (node:internal/modules/esm/module_job:193:25)\n        at processTicksAndRejections (node:internal/process/task_queues:96:5)\n        at async Promise.all (index 0)\n";