vike 0.4.230-commit-f07cc20 → 0.4.231-commit-a0ca5e4

package/dist/esm/node/runtime/{renderPage/loggerRuntime.d.ts → loggerRuntime.d.ts}

@@ -1,5 +1,5 @@
 export declare let logRuntimeError: LogError;
 export declare let logRuntimeInfo: null | LogInfo;
 export { overwriteRuntimeProductionLogger };
-import type { LogError, LogInfo } from '../../plugin/shared/loggerNotProd.js';
+import type { LogError, LogInfo } from '../vite/shared/loggerNotProd.js';
 declare function overwriteRuntimeProductionLogger(logError_: LogError, logInfo_: LogInfo | null): void;

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

@@ -2,7 +2,7 @@
 export let logRuntimeError;
 export let logRuntimeInfo = null; // logInfo is null in production
 export { overwriteRuntimeProductionLogger };
-import { logErrorProd } from './loggerProd.js';
+import { logErrorProd } from './renderPage/loggerProd.js';
 // Set production logger (which is overwritten by loggerNotProd.ts in non-production environments such as development and during pre-rendering)
 logRuntimeError =
     // @ts-expect-error

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

@@ -1,6 +1,6 @@
 export { analyzePage };
 import type { PageFile } from '../../../shared/getPageFiles/getPageFileObject.js';
-import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
+import type { PageConfigRuntime } from '../../../types/PageConfig.js';
 import { type AnalysisResult } from '../../../shared/getPageFiles/analyzePageClientSide.js';
 import type { GlobalContextServerInternal } from '../globalContext.js';
 declare function analyzePage(pageFilesAll: PageFile[], pageConfig: null | PageConfigRuntime, pageId: string, globalContext: GlobalContextServerInternal): Promise<AnalysisResult>;

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

@@ -1,7 +1,7 @@
 export { analyzePage };
 import { getVikeClientEntry } from '../../../shared/getPageFiles/analyzePageClientSide/determineClientEntry.js';
 import { analyzePageClientSide } from '../../../shared/getPageFiles/analyzePageClientSide.js';
-import { getVirtualFileIdPageConfigValuesAll } from '../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
+import { getVirtualFileIdPageConfigLazy } from '../../shared/virtualFiles/virtualFilePageConfigLazy.js';
 import { analyzeClientSide } from '../../../shared/getPageFiles/analyzeClientSide.js';
 import { getConfigValueRuntime } from '../../../shared/page-configs/getConfigValueRuntime.js';
 async function analyzePage(pageFilesAll, pageConfig, pageId, globalContext) {
@@ -15,14 +15,14 @@ async function analyzePage(pageFilesAll, pageConfig, pageId, globalContext) {
             clientEntries.push(getVikeClientEntry(isClientRouting));
         const clientDependencies = [];
         clientDependencies.push({
-            id: getVirtualFileIdPageConfigValuesAll(pageConfig.pageId, true),
+            id: getVirtualFileIdPageConfigLazy(pageConfig.pageId, true),
             onlyAssets: isClientRuntimeLoaded ? false : true,
             eagerlyImported: false
         });
         // In production we inject the import of the server virtual module with ?extractAssets inside the client virtual module
         if (!globalContext._isProduction) {
             clientDependencies.push({
-                id: getVirtualFileIdPageConfigValuesAll(pageConfig.pageId, false),
+                id: getVirtualFileIdPageConfigLazy(pageConfig.pageId, false),
                 onlyAssets: true,
                 eagerlyImported: false
             });

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

@@ -1,5 +1,5 @@
 export { getCacheControl };
-import type { PageConfigRuntime } from '../../../../shared/page-configs/PageConfig.js';
+import type { PageConfigRuntime } from '../../../../types/PageConfig.js';
 import type { HttpResponse } from '../createHttpResponse.js';
 type StatusCode = HttpResponse['statusCode'];
 declare function getCacheControl(pageId: string | null, pageConfigs: PageConfigRuntime[], statusCode: StatusCode): string;

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

@@ -8,13 +8,12 @@ export { createHttpResponseBaseIsMissing };
 export type { HttpResponse };
 import type { GetPageAssets } from './getPageAssets.js';
 import type { HtmlRender } from '../html/renderHtml.js';
-import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 import type { RenderHook } from './executeOnRenderHtmlHook.js';
 import type { RedirectStatusCode, AbortStatusCode, UrlRedirect } from '../../../shared/route/abort.js';
 import { HttpResponseBody } from './getHttpResponseBody.js';
 import { type EarlyHint } from './getEarlyHints.js';
-import type { PageFile } from '../../../shared/getPageFiles.js';
 import type { PageContextBegin } from '../renderPage.js';
+import type { GlobalContextServerInternal } from '../globalContext.js';
 type HttpResponse = {
     statusCode: 200 | 404 | 500 | RedirectStatusCode | AbortStatusCode;
     headers: [string, string][];
@@ -27,14 +26,13 @@ declare function createHttpResponsePage(htmlRender: HtmlRender, renderHook: null
     is404: null | boolean;
     errorWhileRendering: null | Error;
     __getPageAssets: GetPageAssets;
-    _pageConfigs: PageConfigRuntime[];
+    _globalContext: GlobalContextServerInternal;
     abortStatusCode?: AbortStatusCode;
 }): Promise<HttpResponse>;
 declare function createHttpResponse404(errMsg404: string): HttpResponse;
 declare function createHttpResponseBaseIsMissing(urlOriginal: string, baseServer: string): HttpResponse;
 declare function createHttpResponseError(pageContext: {
-    _pageFilesAll: PageFile[];
-    _pageConfigs: PageConfigRuntime[];
+    _globalContext: GlobalContextServerInternal;
 }): HttpResponse;
 declare function createHttpResponseErrorWithoutGlobalContext(): HttpResponse;
 declare function createHttpResponsePageContextJson(pageContextSerialized: string): Promise<HttpResponse>;

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

@@ -14,7 +14,7 @@ import { assertNoInfiniteHttpRedirect } from './createHttpResponse/assertNoInfin
 async function createHttpResponsePage(htmlRender, renderHook, pageContext) {
     let statusCode = pageContext.abortStatusCode;
     if (!statusCode) {
-        const isError = !pageContext.pageId || isErrorPage(pageContext.pageId, pageContext._pageConfigs);
+        const isError = !pageContext.pageId || isErrorPage(pageContext.pageId, pageContext._globalContext._pageConfigs);
         if (pageContext.errorWhileRendering) {
             assert(isError);
         }
@@ -29,7 +29,7 @@ async function createHttpResponsePage(htmlRender, renderHook, pageContext) {
     }
     const earlyHints = getEarlyHints(await pageContext.__getPageAssets());
     const headers = [];
-    const cacheControl = getCacheControl(pageContext.pageId, pageContext._pageConfigs, statusCode);
+    const cacheControl = getCacheControl(pageContext.pageId, pageContext._globalContext._pageConfigs, statusCode);
     if (cacheControl) {
         headers.push(['Cache-Control', cacheControl]);
     }
@@ -64,7 +64,7 @@ function createHttpResponseBaseIsMissing(urlOriginal, baseServer) {
 }
 function createHttpResponseError(pageContext) {
     const reason = (() => {
-        const errorPageId = getErrorPageId(pageContext._pageFilesAll, pageContext._pageConfigs);
+        const errorPageId = getErrorPageId(pageContext._globalContext._pageFilesAll, pageContext._globalContext._pageConfigs);
         if (errorPageId) {
             return "the error page (https://vike.dev/error-page) couldn't be rendered (for example if an error occurred while rendering the error page)";
         }

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

@@ -19,7 +19,7 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
 } & {
     isClientSide: false;
     isPrerendering: boolean;
-} & Pick<import("../../../shared/types.js").PageContextInternalServer, "urlOriginal" | "headersOriginal"> & {
+} & Pick<import("../../../types/PageContext.js").PageContextInternalServer, "urlOriginal" | "headersOriginal"> & {
     url?: string;
     headers?: Record<string, string>;
 } & {
@@ -28,19 +28,18 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
         _isOriginalObject: true;
         _virtualFileExports: unknown;
         _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
-        _pageConfigs: import("../../../__internal/index.js").PageConfig[];
-        _pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
+        _pageConfigs: import("../../../types/PageConfig.js").PageConfigRuntime[];
+        _pageConfigGlobal: import("../../../types/PageConfig.js").PageConfigGlobalRuntime;
         _allPageIds: string[];
-        _userFriendlyConfigsGlobal: import("../../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
+        _vikeConfigPublicGlobal: {
+            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/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
-                route: import("../../../shared/page-configs/Config.js").Route;
-                isErrorPage?: undefined;
-            } | {
-                route?: undefined;
-                isErrorPage: true;
-            });
+            [k: string]: import("../../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
         };
     } & ({
         _isProduction: false;
@@ -67,7 +66,7 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
         _isPrerendering: true;
         viteConfig: import("vite").ResolvedConfig;
         _isProduction: true;
-        assetsManifest: import("../../shared/ViteManifest.js").ViteManifest;
+        assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
         _viteDevServer: null;
         viteConfigRuntime: {
             root: string;
@@ -89,7 +88,7 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
         _isPrerendering: false;
         viteConfig: null;
         _isProduction: true;
-        assetsManifest: import("../../shared/ViteManifest.js").ViteManifest;
+        assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
         _viteDevServer: null;
         viteConfigRuntime: {
             root: string;
@@ -108,20 +107,19 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
         _pageRoutes: import("../../../__internal/index.js").PageRoutes;
         _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
     });
+    _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
     _baseServer: string;
     _baseAssets: string;
-    _includeAssetsImportedByServer: boolean;
-    _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
-    _pageConfigs: import("../../../__internal/index.js").PageConfig[];
-    _pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-    _allPageIds: string[];
-    _pageRoutes: import("../../../__internal/index.js").PageRoutes;
-    _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
     _pageContextInit: PageContextInit;
     _urlRewrite: null;
     _urlHandler: ((url: string) => string) | null;
     isClientSideNavigation: boolean;
-} & import("../../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & {
+} & {
+    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;
+} & {
     urlParsed: import("../utils.js").UrlPublic;
     urlPathname: string;
     url: string;
@@ -134,7 +132,7 @@ declare function createPageContextServerSideWithoutGlobalContext(pageContextInit
 } & {
     isClientSide: false;
     isPrerendering: boolean;
-} & Pick<import("../../../shared/types.js").PageContextInternalServer, "urlOriginal" | "headersOriginal"> & {
+} & Pick<import("../../../types/PageContext.js").PageContextInternalServer, "urlOriginal" | "headersOriginal"> & {
     url?: string;
     headers?: Record<string, string>;
 };

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

@@ -11,24 +11,16 @@ async function createPageContextServerSide(pageContextInit, globalContext, { isP
     const pageContextCreated = createPageContext(pageContextInit, isPrerendering);
     objectAssign(pageContextCreated, {
         _globalContext: globalContext,
-        // The following is defined on `pageContext` because we can eventually make these non-global
+        _pageFilesAll: globalContext._pageFilesAll, // TODO/v1-release: remove
+        // We use pageContext._baseServer and pageContext._baseAssets instead of pageContext._globalContext.baseServer and pageContext._globalContext.baseAssets because the Base URLs can (eventually one day if needed) be made non-global
         _baseServer: globalContext.baseServer,
         _baseAssets: globalContext.baseAssets,
-        // TODO/now: add meta.default
-        _includeAssetsImportedByServer: globalContext.config.includeAssetsImportedByServer ?? true,
-        // TODO/soon: use GloablContext instead
-        _pageFilesAll: globalContext._pageFilesAll,
-        _pageConfigs: globalContext._pageConfigs,
-        _pageConfigGlobal: globalContext._pageConfigGlobal,
-        _allPageIds: globalContext._allPageIds,
-        _pageRoutes: globalContext._pageRoutes,
-        _onBeforeRouteHook: globalContext._onBeforeRouteHook,
         _pageContextInit: pageContextInit,
         _urlRewrite: null,
         _urlHandler: urlHandler,
         isClientSideNavigation
     });
-    objectAssign(pageContextCreated, globalContext._userFriendlyConfigsGlobal);
+    objectAssign(pageContextCreated, globalContext._vikeConfigPublicGlobal);
     // pageContext.urlParsed
     const pageContextUrlComputed = getPageContextUrlComputed(pageContextCreated);
     objectAssign(pageContextCreated, pageContextUrlComputed);
@@ -49,7 +41,7 @@ async function createPageContextServerSide(pageContextInit, globalContext, { isP
         }
         objectAssign(pageContextCreated, { headers });
     }
-    const pageContextAugmented = await createPageContextShared(pageContextCreated, globalContext._pageConfigGlobal, globalContext._userFriendlyConfigsGlobal);
+    const pageContextAugmented = await createPageContextShared(pageContextCreated, globalContext._pageConfigGlobal, globalContext._vikeConfigPublicGlobal);
     augmentType(pageContextCreated, pageContextAugmented);
     return pageContextCreated;
 }

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

@@ -3,7 +3,7 @@ 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;
 };
@@ -11,8 +11,7 @@ declare function debugPageFiles({ pageContext, isHtmlOnly, isClientRouting, page
     pageContext: {
         urlOriginal: string;
         pageId: string;
-        _pageFilesAll: PageFile[];
-        _pageConfigs: PageConfigRuntime[];
+        _globalContext: GlobalContextServerInternal;
     } & PageContextDebugRouteMatches;
     isHtmlOnly: boolean;
     isClientRouting: boolean;

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

@@ -4,7 +4,7 @@ import { assert, makeFirst, createDebugger } from '../utils.js';
 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/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

@@ -6,7 +6,7 @@ import { isStream } from '../html/stream.js';
 import { assertPageContextProvidedByUser } from '../../../shared/assertPageContextProvidedByUser.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,7 +52,7 @@ 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}`
             /*

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,9 +22,9 @@ 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
+        //      virtual:vike:pageConfigLazy:client:/pages/index
         //  - This workaround was implemented to support Vitest runnung /tests/*
         //    - I don't know whether end users actually need this workaround? (I'm not sure what the bug actually is.)
         const manifestKeyEnd = 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.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';
@@ -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) => {
@@ -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) {

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

@@ -1,22 +1,18 @@
 export { loadPageConfigsLazyServerSide };
 export type { PageFiles };
 export type { PageContext_loadPageConfigsLazyServerSide };
-import { type PageFile } from '../../../shared/getPageFiles.js';
 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';
 type PageContext_loadPageConfigsLazyServerSide = PageContextGetPageAssets & PageContextDebugRouteMatches & {
     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 & {
+} & PageContext_loadPageConfigsLazyServerSide): Promise<import("../../../shared/getPageFiles.js").VikeConfigPublicPageLazy & {
     Page: unknown;
     _isHtmlOnly: boolean;
     _passToClient: string[];

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

@@ -1,6 +1,6 @@
 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 { getPageAssets } from './getPageAssets.js';
@@ -9,13 +9,15 @@ import { findPageConfig } from '../../../shared/page-configs/findPageConfig.js';
 import { analyzePage } from './analyzePage.js';
 import { loadConfigValues } from '../../../shared/page-configs/loadConfigValues.js';
 async function loadPageConfigsLazyServerSide(pageContext) {
-    const pageConfig = findPageConfig(pageContext._pageConfigs, pageContext.pageId); // Make pageConfig globally available as pageContext._pageConfig?
+    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.';
@@ -100,7 +102,7 @@ async function loadPageUserFiles(pageFilesAll, pageConfig, pageConfigGlobal, pag
     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

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

@@ -6,7 +6,7 @@ import { assert, assertUsage, assertInfo, compareString, stripAnsi, getTerminalW
 import pc from '@brillout/picocolors';
 async function log404(pageContext) {
     const { urlPathname } = pageContext;
-    const pageRoutes = pageContext._pageRoutes;
+    const pageRoutes = pageContext._globalContext._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.'

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

@@ -184,7 +184,7 @@ function collectError(err) {
     /* For reproductions using older vite-plugin-ssr versions, do one of the following.
         - If upon pre-rendering:https: //github.com/brillout/repro_node-syntax-error#error-catched-by-vite-plugin-ssr
         - Inject the logger inside `catch` in node_modules/vite-plugin-ssr/dist/esm/node/runtime/renderPage.js
-        - Inject the following inside `configResolved(config_)` at node_modules/vite-plugin-ssr/dist/cjs/node/plugin/plugins/devConfig/index.js
+        - Inject the following inside `configResolved(config_)` at node_modules/vite-plugin-ssr/dist/cjs/node/vite/plugins/pluginDev/index.js
           ```js
           config_.logger.error = (msg, options) => {
             const { error } = options;

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

@@ -1,10 +1,10 @@
 export { preparePageContextForPublicUsageServer };
 export type { PageContextForPublicUsageServer };
 import type { PageContextUrlInternal } from '../../../shared/getPageContextUrlComputed.js';
-import type { PageConfigUserFriendlyOld } from '../../../shared/page-configs/getUserFriendlyConfigs.js';
-import type { PageContextInternalServer } from '../../../shared/types.js';
+import type { VikeConfigPublicPageLazy } from '../../../shared/page-configs/resolveVikeConfigPublic.js';
+import type { PageContextInternalServer } from '../../../types/PageContext.js';
 import type { GlobalContextServerInternal } from '../globalContext.js';
-type PageContextForPublicUsageServer = PageContextInternalServer & PageConfigUserFriendlyOld & {
+type PageContextForPublicUsageServer = PageContextInternalServer & VikeConfigPublicPageLazy & {
     urlOriginal: string;
     /** @deprecated */
     url: string;