vike 0.4.142 → 0.4.143-commit-dc6fea0

package/dist/esm/node/prerender/runPrerender.js

@@ -17,7 +17,7 @@ import { getPageFilesServerSide } from '../../shared/getPageFiles.js';
 import { getPageContextRequestUrl } from '../../shared/getPageContextRequestUrl.js';
 import { getUrlFromRouteString } from '../../shared/route/resolveRouteString.js';
 import { getConfigDefinedAtInfo, getConfigValue } from '../../shared/page-configs/utils.js';
-import { loadPageCode } from '../../shared/page-configs/loadPageCode.js';
+import { loadConfigValues } from '../../shared/page-configs/loadConfigValues.js';
 import { isErrorPage } from '../../shared/error-page.js';
 import { addUrlComputedProps } from '../../shared/addUrlComputedProps.js';
 import { assertPathIsFilesystemAbsolute } from '../../utils/assertPathIsFilesystemAbsolute.js';
@@ -143,7 +143,7 @@ async function callOnBeforePrerenderStartHooks(prerenderContext, renderContext,
     // V1 design
     await Promise.all(renderContext.pageConfigs.map((pageConfig) => concurrencyLimit(async () => {
         const hookName = 'onBeforePrerenderStart';
-        const pageConfigLoaded = await loadPageCode(pageConfig, false);
+        const pageConfigLoaded = await loadConfigValues(pageConfig, false);
         const configValue = getConfigValue(pageConfigLoaded, hookName);
         if (!configValue)
             return;
@@ -281,20 +281,17 @@ async function callOnPrerenderStartHook(prerenderContext, renderContext) {
     let onPrerenderStartHook;
     // V1 design
     if (renderContext.pageConfigs.length > 0) {
-        const configValueSource = renderContext.pageConfigGlobal.onPrerenderStart;
-        if (configValueSource) {
-            const hookFn = configValueSource.value;
-            assert(!configValueSource.isComputed);
-            const hookFilePath = configValueSource.definedAtInfo.filePath;
-            assert(hookFn);
-            assert(hookFilePath);
-            if (hookFn) {
-                onPrerenderStartHook = {
-                    hookFn,
-                    hookName: 'onPrerenderStart',
-                    hookFilePath
-                };
-            }
+        const { pageConfigGlobal } = renderContext;
+        if (pageConfigGlobal.configValues.onPrerenderStart?.value) {
+            const { value: hookFn, definedAtInfo } = pageConfigGlobal.configValues.onPrerenderStart;
+            // config.onPrerenderStart isn't a computed nor a cumulative config => definedAtInfo should always be defined
+            assert(definedAtInfo);
+            const hookFilePath = definedAtInfo.filePath;
+            onPrerenderStartHook = {
+                hookFn,
+                hookName: 'onPrerenderStart',
+                hookFilePath
+            };
         }
     }
     // Old design

package/dist/esm/node/runtime/html/injectAssets/getHtmlTags.js

@@ -106,7 +106,7 @@ async function getHtmlTags(pageContext, injectToStream, injectFilter) {
     if (!isHtmlOnly) {
         // Don't allow the user to manipulate with injectFilter(): injecting <script type="application/json"> before the stream can break the app when:
         //  - using https://vike.dev/stream#initial-data-after-stream-end
-        //  - `pageContext` is modified during the stream, e.g. /examples/vue-pinia which uses https://vuejs.org/api/composition-api-lifecycle.html#onserverprefetch
+        //  - `pageContext` is modified during the stream, e.g. https://github.com/brillout/vike-with-pinia which uses https://vuejs.org/api/composition-api-lifecycle.html#onserverprefetch
         // The <script> tags are handled separately by vike down below.
         htmlTags.push({
             // Needs to be called after `resolvePageContextPromise()`

package/dist/esm/node/runtime/html/injectAssets.d.ts

@@ -6,7 +6,7 @@ import type { PageAsset } from '../renderPage/getPageAssets.js';
 import type { HtmlPart } from './renderHtml.js';
 import { type PreloadFilter } from './injectAssets/getHtmlTags.js';
 import type { InjectToStream } from './stream/react-streaming.js';
-import type { PageConfig } from '../../../shared/page-configs/PageConfig.js';
+import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 import type { PageContextSerialization } from './serializePageContextClientSide.js';
 type PageContextInjectAssets = {
     urlPathname: string;
@@ -19,7 +19,7 @@ type PageContextInjectAssets = {
         hookName: 'onRenderHtml' | 'render';
     };
     _baseServer: string;
-    _pageConfigs: PageConfig[];
+    _pageConfigs: PageConfigRuntime[];
     is404: null | boolean;
 } & PageContextSerialization;
 declare function injectHtmlTagsToString(htmlParts: HtmlPart[], pageContext: PageContextInjectAssets & {

package/dist/esm/node/runtime/html/serializePageContextClientSide.d.ts

@@ -1,12 +1,12 @@
 export { serializePageContextClientSide };
 export { serializePageContextAbort };
 export type { PageContextSerialization };
-import type { PageConfig } from '../../../shared/page-configs/PageConfig.js';
+import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 import type { UrlRedirect } from '../../../shared/route/abort.js';
 type PageContextSerialization = {
     _pageId: string;
     _passToClient: string[];
-    _pageConfigs: PageConfig[];
+    _pageConfigs: PageConfigRuntime[];
     is404: null | boolean;
     pageProps?: Record<string, unknown>;
     _isError?: true;

package/dist/esm/node/runtime/html/stream.js

@@ -628,7 +628,10 @@ function isStreamPipeWeb(thing) {
 const __streamPipeNode = '__streamPipeNode';
 /** @deprecated */
 function pipeNodeStream(pipe) {
-    assertWarning(false, 'pipeNodeStream() is outdated, use stampPipe() instead. See https://vike.dev/stream', { onlyOnce: true, showStackTrace: true });
+    assertWarning(false, 'pipeNodeStream() is outdated, use stampPipe() instead. See https://vike.dev/stream', {
+        onlyOnce: true,
+        showStackTrace: true
+    });
     return { [__streamPipeNode]: pipe };
 }
 function getStreamPipeNode(thing) {

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

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

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

@@ -26,14 +26,14 @@ function analyzePage(pageFilesAll, pageConfig, pageId) {
         }
         /* Remove?
         Object.values(pageConfig.configElements).forEach((configElement) => {
-          if (configElement.importFilePath) {
+          if (configElement.importPath) {
             const { env } = configElement
             assert(env)
             const onlyAssets = env === 'server-only'
             const eagerlyImported = env === '_routing-eager'
             if (onlyAssets || eagerlyImported) {
               clientDependencies.push({
-                id: configElement.importFilePath,
+                id: configElement.importPath,
                 onlyAssets,
                 eagerlyImported
               })

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

@@ -4,7 +4,7 @@ export { createHttpResponseObjectRedirect };
 export type { HttpResponse };
 import type { GetPageAssets } from './getPageAssets.js';
 import type { HtmlRender } from '../html/renderHtml.js';
-import type { PageConfig } from '../../../shared/page-configs/PageConfig.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';
@@ -21,7 +21,7 @@ declare function createHttpResponseObject(htmlRender: null | HtmlRender, renderH
     is404: null | boolean;
     errorWhileRendering: null | Error;
     __getPageAssets: GetPageAssets;
-    _pageConfigs: PageConfig[];
+    _pageConfigs: PageConfigRuntime[];
     abortStatusCode?: AbortStatusCode;
 }): Promise<HttpResponse | null>;
 declare function createHttpResponsePageContextJson(pageContextSerialized: string): Promise<HttpResponse>;

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

@@ -3,7 +3,7 @@ export type { PageContextDebug };
 import { RouteMatches } from '../../../shared/route/index.js';
 import type { ClientDependency } from '../../../shared/getPageFiles/analyzePageClientSide/ClientDependency.js';
 import type { PageFile } from '../../../shared/getPageFiles.js';
-import type { PageConfig } from '../../../shared/page-configs/PageConfig.js';
+import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 type PageContextDebug = {
     _routeMatches: 'ROUTE_ERROR' | RouteMatches;
 };
@@ -12,7 +12,7 @@ declare function debugPageFiles({ pageContext, isHtmlOnly, isClientRouting, page
         urlOriginal: string;
         _pageId: string;
         _pageFilesAll: PageFile[];
-        _pageConfigs: PageConfig[];
+        _pageConfigs: PageConfigRuntime[];
     } & PageContextDebug;
     isHtmlOnly: boolean;
     isClientRouting: boolean;

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

@@ -3,7 +3,7 @@ export type { RenderHook };
 import { type HtmlRender } from '../html/renderHtml.js';
 import type { PageAsset } from './getPageAssets.js';
 import { type PageContextForUserConsumptionServerSide } from './preparePageContextForUserConsumptionServerSide.js';
-import type { PageConfig } from '../../../shared/page-configs/PageConfig.js';
+import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 import type { PageContextSerialization } from '../html/serializePageContextClientSide.js';
 type GetPageAssets = () => Promise<PageAsset[]>;
 type RenderHook = {
@@ -13,7 +13,7 @@ type RenderHook = {
 type HookName = 'onRenderHtml' | 'render';
 declare function executeOnRenderHtmlHook(pageContext: PageContextForUserConsumptionServerSide & PageContextSerialization & {
     _pageId: string;
-    _pageConfigs: PageConfig[];
+    _pageConfigs: PageConfigRuntime[];
     __getPageAssets: GetPageAssets;
     _isHtmlOnly: boolean;
     _baseServer: string;

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

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

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

@@ -5,11 +5,11 @@ import { type PageFile } from '../../../shared/getPageFiles.js';
 import { PromiseType } from '../utils.js';
 import { PageContextGetPageAssets, type PageAsset } from './getPageAssets.js';
 import { type PageContextDebug } from './debugPageFiles.js';
-import type { PageConfig } from '../../../shared/page-configs/PageConfig.js';
+import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 type PageContext_loadPageFilesServerSide = PageContextGetPageAssets & PageContextDebug & {
     urlOriginal: string;
     _pageFilesAll: PageFile[];
-    _pageConfigs: PageConfig[];
+    _pageConfigs: PageConfigRuntime[];
 };
 type PageFiles = PromiseType<ReturnType<typeof loadPageFilesServerSide>>;
 declare function loadPageFilesServerSide(pageContext: {

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

@@ -7,7 +7,7 @@ import { debugPageFiles } from './debugPageFiles.js';
 import { findPageConfig } from '../../../shared/page-configs/findPageConfig.js';
 import { analyzePage } from './analyzePage.js';
 import { getGlobalContext } from '../globalContext.js';
-import { loadPageCode } from '../../../shared/page-configs/loadPageCode.js';
+import { loadConfigValues } from '../../../shared/page-configs/loadConfigValues.js';
 async function loadPageFilesServerSide(pageContext) {
     const pageConfig = findPageConfig(pageContext._pageConfigs, pageContext._pageId); // Make pageConfig globally available as pageContext._pageConfig?
     const [{ config, configEntries, exports, exportsAll, pageExports, pageFilesLoaded, pageConfigLoaded }] = await Promise.all([
@@ -82,7 +82,7 @@ async function loadPageFilesServerSide(pageContext) {
 }
 async function loadPageFiles(pageFilesAll, pageConfig, pageId, isDev) {
     const pageFilesServerSide = getPageFilesServerSide(pageFilesAll, pageId);
-    const pageConfigLoaded = !pageConfig ? null : await loadPageCode(pageConfig, isDev);
+    const pageConfigLoaded = !pageConfig ? null : await loadConfigValues(pageConfig, isDev);
     await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
     const { config, configEntries, exports, exportsAll, pageExports } = getExports(pageFilesServerSide, pageConfigLoaded);
     return {

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

@@ -67,8 +67,8 @@ function getPagesAndRoutesInfo(pageRoutes) {
         ...entries
     ];
     const terminalWidth = getTerminalWidth() || 134;
-    let width2 = Math.max(...linesContent.map(({ routeTypeSrc }) => routeTypeSrc.length));
-    let width3 = Math.max(...linesContent.map(({ routeDefinedBy }) => routeDefinedBy.length));
+    let width2 = Math.max(...linesContent.map(({ routeTypeSrc }) => stripAnsi(routeTypeSrc).length));
+    let width3 = Math.max(...linesContent.map(({ routeDefinedBy }) => stripAnsi(routeDefinedBy).length));
     let width1 = terminalWidth - width3 - width2 - 10;
     linesContent.forEach((lineContent) => {
         let { routeStr } = lineContent;
@@ -83,9 +83,9 @@ function getPagesAndRoutesInfo(pageRoutes) {
     });
     width1 = Math.max(...linesContent.map(({ routeStr }) => stripAnsi(routeStr).length));
     let lines = linesContent.map(({ routeStr, routeTypeSrc, routeDefinedBy }, i) => {
-        let cell1 = routeStr.padEnd(width1 + (routeStr.length - stripAnsi(routeStr).length), ' ');
-        let cell2 = routeTypeSrc.padEnd(width2, ' ');
-        let cell3 = routeDefinedBy.padEnd(width3, ' ');
+        let cell1 = padEnd(routeStr, width1 + (stripAnsi(routeStr).length - stripAnsi(routeStr).length));
+        let cell2 = padEnd(routeTypeSrc, width2);
+        let cell3 = padEnd(routeDefinedBy, width3);
         const isHeader = i === 0;
         if (isHeader) {
             cell1 = pc.dim(cell1);
@@ -119,6 +119,11 @@ function truncateRouteFunction(routeStr, lenMax) {
     routeStr = truncateString(routeStr, lenMax, (s) => pc.dim(s));
     return routeStr;
 }
+/** Same as String.prototype.padEnd but with stripAnsi() */
+function padEnd(str, width) {
+    const padWidth = Math.max(0, width - stripAnsi(str).length);
+    return str + ''.padEnd(padWidth, ' ');
+}
 function removeNonAscii(str) {
     // https://stackoverflow.com/questions/20856197/remove-non-ascii-character-in-string/20856346#20856346
     return str.replace(/[^\x00-\x7F]/g, '');

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

@@ -1,7 +1,7 @@
 export { preparePageContextForUserConsumptionServerSide };
 export type { PageContextForUserConsumptionServerSide };
 import { PageContextUrlComputedPropsInternal } from '../../../shared/addUrlComputedProps.js';
-import type { PageConfig } from '../../../shared/page-configs/PageConfig.js';
+import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 import type { ConfigEntries, ExportsAll } from '../../../shared/getPageFiles/getExports.js';
 import { PageContextBuiltInServerInternal } from '../../../shared/types.js';
 type PageContextForUserConsumptionServerSide = PageContextBuiltInServerInternal & {
@@ -18,7 +18,7 @@ type PageContextForUserConsumptionServerSide = PageContextBuiltInServerInternal
     exports: Record<string, unknown>;
     exportsAll: ExportsAll;
     _pageId: string;
-    _pageConfigs: PageConfig[];
+    _pageConfigs: PageConfigRuntime[];
     is404: null | boolean;
     isClientSideNavigation: boolean;
     pageProps?: Record<string, unknown>;

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

@@ -10,7 +10,7 @@ import { type PageFile } from '../../../shared/getPageFiles.js';
 import { type PageContextUrlComputedPropsInternal } from '../../../shared/addUrlComputedProps.js';
 import { HttpResponse } from './createHttpResponseObject.js';
 import { PageContext_loadPageFilesServerSide, type PageFiles } from './loadPageFilesServerSide.js';
-import type { PageConfig, PageConfigGlobal } from '../../../shared/page-configs/PageConfig.js';
+import type { PageConfigRuntime, PageConfigGlobalRuntime } from '../../../shared/page-configs/PageConfig.js';
 import { type PageRoutes } from '../../../shared/route/loadPageRoutes.js';
 import type { OnBeforeRouteHook } from '../../../shared/route/executeOnBeforeRouteHook.js';
 type PageContextAfterRender = {
@@ -42,8 +42,8 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _baseAssets: string | null;
         _includeAssetsImportedByServer: boolean;
         _pageFilesAll: PageFile[];
-        _pageConfigs: PageConfig[];
-        _pageConfigGlobal: PageConfigGlobal;
+        _pageConfigs: PageConfigRuntime[];
+        _pageConfigGlobal: PageConfigGlobalRuntime;
         _allPageIds: string[];
         _pageRoutes: PageRoutes;
         _onBeforeRouteHook: OnBeforeRouteHook | null;
@@ -89,8 +89,8 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _baseAssets: string | null;
         _includeAssetsImportedByServer: boolean;
         _pageFilesAll: PageFile[];
-        _pageConfigs: PageConfig[];
-        _pageConfigGlobal: PageConfigGlobal;
+        _pageConfigs: PageConfigRuntime[];
+        _pageConfigGlobal: PageConfigGlobalRuntime;
         _allPageIds: string[];
         _pageRoutes: PageRoutes;
         _onBeforeRouteHook: OnBeforeRouteHook | null;
@@ -137,8 +137,8 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
         _baseAssets: string | null;
         _includeAssetsImportedByServer: boolean;
         _pageFilesAll: PageFile[];
-        _pageConfigs: PageConfig[];
-        _pageConfigGlobal: PageConfigGlobal;
+        _pageConfigs: PageConfigRuntime[];
+        _pageConfigGlobal: PageConfigGlobalRuntime;
         _allPageIds: string[];
         _pageRoutes: PageRoutes;
         _onBeforeRouteHook: OnBeforeRouteHook | null;
@@ -184,8 +184,8 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
         _baseAssets: string | null;
         _includeAssetsImportedByServer: boolean;
         _pageFilesAll: PageFile[];
-        _pageConfigs: PageConfig[];
-        _pageConfigGlobal: PageConfigGlobal;
+        _pageConfigs: PageConfigRuntime[];
+        _pageConfigGlobal: PageConfigGlobalRuntime;
         _allPageIds: string[];
         _pageRoutes: PageRoutes;
         _onBeforeRouteHook: OnBeforeRouteHook | null;
@@ -239,8 +239,8 @@ declare function getPageContextInitEnhanced(pageContextInit: {
     _baseAssets: string | null;
     _includeAssetsImportedByServer: boolean;
     _pageFilesAll: PageFile[];
-    _pageConfigs: PageConfig[];
-    _pageConfigGlobal: PageConfigGlobal;
+    _pageConfigs: PageConfigRuntime[];
+    _pageConfigGlobal: PageConfigGlobalRuntime;
     _allPageIds: string[];
     _pageRoutes: PageRoutes;
     _onBeforeRouteHook: OnBeforeRouteHook | null;
@@ -256,8 +256,8 @@ declare function getPageContextInitEnhanced(pageContextInit: {
 };
 type RenderContext = {
     pageFilesAll: PageFile[];
-    pageConfigs: PageConfig[];
-    pageConfigGlobal: PageConfigGlobal;
+    pageConfigs: PageConfigRuntime[];
+    pageConfigGlobal: PageConfigGlobalRuntime;
     allPageIds: string[];
     pageRoutes: PageRoutes;
     onBeforeRouteHook: OnBeforeRouteHook | null;

package/dist/esm/node/shared/getClientEntryFilePath.d.ts

@@ -1,3 +1,3 @@
 export { getClientEntryFilePath };
-import type { PageConfig, PageConfigBuildTime } from '../../shared/page-configs/PageConfig.js';
-declare function getClientEntryFilePath(pageConfig: PageConfig | PageConfigBuildTime): null | string;
+import type { PageConfigRuntime, PageConfigBuildTime } from '../../shared/page-configs/PageConfig.js';
+declare function getClientEntryFilePath(pageConfig: PageConfigRuntime | PageConfigBuildTime): null | string;

package/dist/esm/node/shared/virtual-files/virtualFilePageConfigValuesAll.js

@@ -6,7 +6,7 @@ const idBase = 'virtual:vike:pageConfigValuesAll:';
 const idBaseClient = `${idBase}client:`;
 const idBaseServer = `${idBase}server:`;
 function getVirtualFileIdPageConfigValuesAll(pageId, isForClientSide) {
-    const id = `${(isForClientSide ? idBaseClient : idBaseServer)}${pageId}`;
+    const id = `${isForClientSide ? idBaseClient : idBaseServer}${pageId}`;
     return id;
 }
 function isVirtualFileIdPageConfigValuesAll(id) {

package/dist/esm/shared/addIs404ToPageProps.d.ts

@@ -1,7 +1,7 @@
 export { addIs404ToPageProps };
-import type { PageConfig } from './page-configs/PageConfig.js';
+import type { PageConfigRuntime } from './page-configs/PageConfig.js';
 declare function addIs404ToPageProps(pageContext: Record<string, unknown> & PageContextAssertIs404): void;
 type PageContextAssertIs404 = {
     _pageId: string;
-    _pageConfigs: PageConfig[];
+    _pageConfigs: PageConfigRuntime[];
 };

package/dist/esm/shared/addUrlComputedProps.d.ts

@@ -4,7 +4,8 @@ export type { PageContextUrlComputedPropsInternal };
 export type { PageContextUrlComputedPropsClient };
 export type { PageContextUrlComputedPropsServer };
 export type { PageContextUrlSources };
-type UrlParsed = {
+export type { Url };
+type Url = {
     /** The URL origin, e.g. `https://example.com` of `https://example.com/product/42?details=yes#reviews` */
     origin: null | string;
     /** The URL pathname, e.g. `/product/42` of `https://example.com/product/42?details=yes#reviews` */
@@ -34,8 +35,9 @@ type PageContextUrlComputedPropsClient = {
     /** The URL pathname, e.g. `/product/42` of `https://example.com/product/42?details=yes#reviews` */
     urlPathname: string;
     /** Parsed information about the current URL */
-    urlParsed: UrlParsed;
+    urlParsed: Url;
 };
+/** For Vike internal use */
 type PageContextUrlComputedPropsInternal = PageContextUrlComputedPropsClient & {
     _urlRewrite: string | null;
 };

package/dist/esm/shared/error-page.d.ts

@@ -1,8 +1,8 @@
 export { getErrorPageId };
 export { isErrorPageId };
 export { isErrorPage };
-import type { PageConfig } from './page-configs/PageConfig.js';
+import type { PageConfigRuntime } from './page-configs/PageConfig.js';
 import type { PageFile } from './getPageFiles.js';
-declare function getErrorPageId(pageFilesAll: PageFile[], pageConfigs: PageConfig[]): string | null;
+declare function getErrorPageId(pageFilesAll: PageFile[], pageConfigs: PageConfigRuntime[]): string | null;
 declare function isErrorPageId(pageId: string, _isV1Design: false): boolean;
-declare function isErrorPage(pageId: string, pageConfigs: PageConfig[]): boolean;
+declare function isErrorPage(pageId: string, pageConfigs: PageConfigRuntime[]): boolean;

package/dist/esm/shared/error-page.js

@@ -30,7 +30,7 @@ function isErrorPage(pageId, pageConfigs) {
     if (pageConfigs.length > 0) {
         const pageConfig = pageConfigs.find((p) => p.pageId === pageId);
         assert(pageConfig);
-        return pageConfig.isErrorPage;
+        return !!pageConfig.isErrorPage;
     }
     else {
         return isErrorPageId(pageId, false);

package/dist/esm/shared/getPageFiles/analyzeClientSide.d.ts

@@ -1,7 +1,7 @@
 export { analyzeClientSide };
-import type { PageConfig } from '../page-configs/PageConfig.js';
+import type { PageConfigRuntime } from '../page-configs/PageConfig.js';
 import type { PageFile } from './getPageFileObject.js';
-declare function analyzeClientSide(pageConfig: PageConfig | null, pageFilesAll: PageFile[], pageId: string): {
+declare function analyzeClientSide(pageConfig: PageConfigRuntime | null, pageFilesAll: PageFile[], pageId: string): {
     isClientSideRenderable: boolean;
     isClientRouting: boolean;
 };

package/dist/esm/shared/getPageFiles/assertPageConfigs.d.ts

@@ -1,5 +1,5 @@
-export { assertPageConfigs };
-export { assertPageConfigGlobal };
-import type { PageConfig, PageConfigGlobal } from '../page-configs/PageConfig.js';
-declare function assertPageConfigs(pageConfigs: unknown): asserts pageConfigs is PageConfig[];
-declare function assertPageConfigGlobal(pageConfigGlobal: unknown): asserts pageConfigGlobal is PageConfigGlobal;
+export { assertPageConfigsSerialized };
+export { assertPageConfigGlobalSerialized };
+import type { PageConfigGlobalRuntimeSerialized, PageConfigRuntimeSerialized } from '../page-configs/PageConfig.js';
+declare function assertPageConfigsSerialized(pageConfigsSerialized: unknown): asserts pageConfigsSerialized is PageConfigRuntimeSerialized[];
+declare function assertPageConfigGlobalSerialized(pageConfigGlobalSerialized: unknown): asserts pageConfigGlobalSerialized is PageConfigGlobalRuntimeSerialized;

package/dist/esm/shared/getPageFiles/assertPageConfigs.js

@@ -1,16 +1,16 @@
-export { assertPageConfigs };
-export { assertPageConfigGlobal };
+export { assertPageConfigsSerialized };
+export { assertPageConfigGlobalSerialized };
 import { assert, isObject, hasProp } from '../utils.js';
-function assertPageConfigs(pageConfigs) {
-    assert(Array.isArray(pageConfigs));
-    pageConfigs.forEach((pageConfig) => {
-        assert(isObject(pageConfig));
-        assert(hasProp(pageConfig, 'pageId', 'string'));
-        assert(hasProp(pageConfig, 'routeFilesystem'));
+function assertPageConfigsSerialized(pageConfigsSerialized) {
+    assert(Array.isArray(pageConfigsSerialized));
+    pageConfigsSerialized.forEach((pageConfigSerialized) => {
+        assert(isObject(pageConfigSerialized));
+        assert(hasProp(pageConfigSerialized, 'pageId', 'string'));
+        assert(hasProp(pageConfigSerialized, 'routeFilesystem'));
+        assert(hasProp(pageConfigSerialized, 'configValuesSerialized'));
+        assert(hasProp(pageConfigSerialized, 'configValuesImported'));
     });
 }
-function assertPageConfigGlobal(pageConfigGlobal) {
-    assert(pageConfigGlobal);
-    assert(hasProp(pageConfigGlobal, 'onBeforeRoute'));
-    assert(hasProp(pageConfigGlobal, 'onPrerenderStart'));
+function assertPageConfigGlobalSerialized(pageConfigGlobalSerialized) {
+    assert(hasProp(pageConfigGlobalSerialized, 'configValuesImported'));
 }

package/dist/esm/shared/getPageFiles/getExports.d.ts

@@ -4,7 +4,7 @@ export type { ExportsAll };
 export type { PageContextExports };
 export type { ConfigEntries };
 import type { FileType } from './fileTypes.js';
-import type { PageConfigLoaded } from './../page-configs/PageConfig.js';
+import type { PageConfigRuntimeLoaded } from './../page-configs/PageConfig.js';
 import type { PageFile } from './getPageFileObject.js';
 type ExportsAll = Record<string, {
     exportValue: unknown;
@@ -35,5 +35,5 @@ type PageContextExports = {
     /** @deprecated */
     pageExports: Record<string, unknown>;
 };
-declare function getExports(pageFiles: PageFile[], pageConfig: PageConfigLoaded | null): PageContextExports;
+declare function getExports(pageFiles: PageFile[], pageConfig: PageConfigRuntimeLoaded | null): PageContextExports;
 declare function getExportUnion(exportsAll: ExportsAll, propName: string): string[];

package/dist/esm/shared/getPageFiles/getExports.js

@@ -2,7 +2,7 @@ export { getExportUnion };
 export { getExports };
 import { isScriptFile, isTemplateFile } from '../../utils/isScriptFile.js';
 import { assert, hasProp, isObject, assertWarning, assertUsage, makeLast, isBrowser } from '../utils.js';
-import { assertDefaultExports, forbiddenDefaultExports } from './assertExports.js';
+import { assertDefaultExports, forbiddenDefaultExports } from './assert_exports_old_design.js';
 import { getConfigDefinedAtString } from '../page-configs/utils.js';
 import pc from '@brillout/picocolors';
 function getExports(pageFiles, pageConfig) {

package/dist/esm/shared/getPageFiles/parseGlobResults.d.ts

@@ -1,8 +1,8 @@
 export { parseGlobResults };
 import { type PageFile } from './getPageFileObject.js';
-import type { PageConfig, PageConfigGlobal } from '../page-configs/PageConfig.js';
+import type { PageConfigRuntime, PageConfigGlobalRuntime } from '../page-configs/PageConfig.js';
 declare function parseGlobResults(pageFilesExports: unknown): {
     pageFiles: PageFile[];
-    pageConfigs: PageConfig[];
-    pageConfigGlobal: PageConfigGlobal;
+    pageConfigs: PageConfigRuntime[];
+    pageConfigGlobal: PageConfigGlobalRuntime;
 };

package/dist/esm/shared/getPageFiles/parseGlobResults.js

@@ -1,9 +1,10 @@
 export { parseGlobResults };
 import { assert, hasProp, isCallable, isObject, cast, assertUsage } from '../utils.js';
-import { assertExportValues } from './assertExports.js';
+import { assertExportValues } from './assert_exports_old_design.js';
 import { getPageFileObject } from './getPageFileObject.js';
 import { fileTypes } from './fileTypes.js';
-import { assertPageConfigGlobal, assertPageConfigs } from './assertPageConfigs.js';
+import { assertPageConfigGlobalSerialized, assertPageConfigsSerialized } from './assertPageConfigs.js';
+import { parsePageConfigsSerialized } from './parsePageConfigsSerialized.js';
 function parseGlobResults(pageFilesExports) {
     assert(hasProp(pageFilesExports, 'isGeneratedFile'));
     assert(pageFilesExports.isGeneratedFile !== false, `vike was re-installed(/re-built). Restart your app.`);
@@ -15,12 +16,12 @@ function parseGlobResults(pageFilesExports) {
     assert(hasProp(pageFilesExports.pageFilesLazy, '.page'));
     assert(hasProp(pageFilesExports.pageFilesLazy, '.page.client') || hasProp(pageFilesExports.pageFilesLazy, '.page.server'));
     assert(hasProp(pageFilesExports, 'pageFilesList', 'string[]'));
-    assert(hasProp(pageFilesExports, 'pageConfigs'));
-    assert(hasProp(pageFilesExports, 'pageConfigGlobal'));
-    const { pageConfigs, pageConfigGlobal } = pageFilesExports;
-    assertPageConfigs(pageConfigs);
-    parsePageConfigs(pageConfigs);
-    assertPageConfigGlobal(pageConfigGlobal);
+    assert(hasProp(pageFilesExports, 'pageConfigsSerialized'));
+    assert(hasProp(pageFilesExports, 'pageConfigGlobalSerialized'));
+    const { pageConfigsSerialized, pageConfigGlobalSerialized } = pageFilesExports;
+    assertPageConfigsSerialized(pageConfigsSerialized);
+    assertPageConfigGlobalSerialized(pageConfigGlobalSerialized);
+    const { pageConfigs, pageConfigGlobal } = parsePageConfigsSerialized(pageConfigsSerialized, pageConfigGlobalSerialized);
     const pageFilesMap = {};
     parseGlobResult(pageFilesExports.pageFilesLazy).forEach(({ filePath, pageFile, globValue }) => {
         pageFile = pageFilesMap[filePath] = pageFilesMap[filePath] ?? pageFile;
@@ -87,38 +88,3 @@ function parseGlobResult(globObject) {
 function assertLoadModule(globValue) {
     assert(isCallable(globValue));
 }
-function parsePageConfigs(pageConfigs) {
-    // TODO: remove
-    /*
-    pageConfigs.forEach((pageConfig) => {
-      Object.entries(pageConfig.configElements).forEach(([configName, configElement]) => {
-        {
-          const { configValueSerialized } = configElement
-          if (configValueSerialized !== undefined) {
-            configElement.configValue = parse(configValueSerialized)
-          }
-        }
-        if (configName === 'route') {
-          assertRouteConfigValue(configElement)
-        }
-      })
-    })
-    */
-}
-// TODO: use again
-// function assertRouteConfigValue(configElement: ConfigElement) {
-//   assert(hasProp(configElement, 'configValue')) // route files are eagerly loaded
-//   const { configValue } = configElement
-//   const configValueType = typeof configValue
-//   assertUsage(
-//     configValueType === 'string' || isCallable(configValue),
-//     `${configElement.configDefinedAt} has an invalid type '${configValueType}': it should be a string or a function instead, see https://vike.dev/route`
-//   )
-//   /* We don't do that to avoid unnecessarily bloating the client-side bundle when using Server Routing
-//    *  - When using Server Routing, this file is loaded as well
-//    *  - When using Server Routing, client-side validation is superfluous as Route Strings only need to be validated on the server-side
-//   if (typeof configValue === 'string') {
-//     assertRouteString(configValue, `${configElement.configDefinedAt} defines an`)
-//   }
-//   */
-// }

package/dist/esm/shared/getPageFiles/parsePageConfigsSerialized.d.ts

@@ -0,0 +1,6 @@
+export { parsePageConfigsSerialized };
+import type { PageConfigRuntime, PageConfigGlobalRuntime, PageConfigGlobalRuntimeSerialized, PageConfigRuntimeSerialized } from '../page-configs/PageConfig.js';
+declare function parsePageConfigsSerialized(pageConfigsSerialized: PageConfigRuntimeSerialized[], pageConfigGlobalSerialized: PageConfigGlobalRuntimeSerialized): {
+    pageConfigs: PageConfigRuntime[];
+    pageConfigGlobal: PageConfigGlobalRuntime;
+};