vike 0.4.171-commit-75e1588 → 0.4.171-commit-6e37128

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

@@ -5,7 +5,7 @@ export { runPrerender_forceExit };
 import '../runtime/page-files/setup.js';
 import path from 'path';
 import { route } from '../../shared/route/index.js';
-import { assert, assertUsage, assertWarning, hasProp, projectInfo, objectAssign, isObjectWithKeys, isCallable, getOutDirs, isPropertyGetter, assertPosixPath, urlToFile, isPlainObject, handleNodeEnv_prerender, pLimit, assertPathFilesystemAbsolute, isArray } from './utils.js';
+import { assert, assertUsage, assertWarning, hasProp, projectInfo, objectAssign, isObjectWithKeys, isCallable, getOutDirs, isPropertyGetter, assertPosixPath, urlToFile, isPlainObject, handleNodeEnv_prerender, pLimit, assertPathFilesystemAbsolute, isArray, changeEnumerable } from './utils.js';
 import { prerenderPage, prerender404Page, getRenderContext, getPageContextInitEnhanced } from '../runtime/renderPage/renderPageAlreadyRouted.js';
 import pc from '@brillout/picocolors';
 import { cpus } from 'os';
@@ -16,10 +16,10 @@ import { getPageFilesServerSide } from '../../shared/getPageFiles.js';
 import { getPageContextRequestUrl } from '../../shared/getPageContextRequestUrl.js';
 import { getUrlFromRouteString } from '../../shared/route/resolveRouteString.js';
 import { getConfigValueFilePathToShowToUser } from '../../shared/page-configs/helpers.js';
-import { getConfigValue } from '../../shared/page-configs/getConfigValue.js';
+import { getConfigValueRuntime } from '../../shared/page-configs/getConfigValue.js';
 import { loadConfigValues } from '../../shared/page-configs/loadConfigValues.js';
 import { isErrorPage } from '../../shared/error-page.js';
-import { addUrlComputedProps } from '../../shared/addUrlComputedProps.js';
+import { getPageContextUrlComputed } from '../../shared/getPageContextUrlComputed.js';
 import { isAbortError } from '../../shared/route/abort.js';
 import { loadUserFilesServerSide } from '../runtime/renderPage/loadUserFilesServerSide.js';
 import { getHookFromPageConfig, getHookFromPageConfigGlobal, getHookTimeoutDefault, setIsPrerenderering } from '../../shared/hooks/getHook.js';
@@ -27,6 +27,7 @@ import { noRouteMatch } from '../../shared/route/noRouteMatch.js';
 import { getVikeConfig } from '../plugin/plugins/importUserCode/v1-design/getVikeConfig.js';
 import { logErrorHint } from '../runtime/renderPage/logErrorHint.js';
 import { executeHook, isUserHookError } from '../../shared/hooks/executeHook.js';
+import { getConfigValueBuildTime } from '../../shared/page-configs/getConfigValueBuildTime.js';
 async function runPrerenderFromAPI(options = {}) {
     await runPrerender(options, 'prerender()');
     // - We purposely propagate the error to the user land, so that the error interrupts the user land. It's also, I guess, a nice-to-have that the user has control over the error.
@@ -114,7 +115,7 @@ async function collectDoNoPrerenderList(renderContext, pageConfigs, doNotPrerend
     // V1 design
     pageConfigs.forEach((pageConfig) => {
         const configName = 'prerender';
-        const configValue = getConfigValue(pageConfig, configName, 'boolean');
+        const configValue = getConfigValueBuildTime(pageConfig, configName, 'boolean');
         if (configValue?.value === false) {
             const configValueFilePathToShowToUser = getConfigValueFilePathToShowToUser(configValue.definedAtData);
             assert(configValueFilePathToShowToUser);
@@ -240,9 +241,9 @@ async function callOnBeforePrerenderStartHooks(prerenderContext, renderContext,
             prerenderContext.pageContexts.push(pageContextNew);
             if (pageContext) {
                 objectAssign(pageContextNew, {
-                    _pageContextAlreadyProvidedByOnPrerenderHook: true,
-                    ...pageContext
+                    _pageContextAlreadyProvidedByOnPrerenderHook: true
                 });
+                objectAssign(pageContextNew, pageContext);
             }
         });
     })));
@@ -300,14 +301,11 @@ function createPageContext(urlOriginal, renderContext, prerenderContext) {
         _prerenderContext: prerenderContext
     };
     const pageContextInit = {
-        urlOriginal,
-        ...prerenderContext.pageContextInit
+        urlOriginal
     };
+    objectAssign(pageContextInit, prerenderContext.pageContextInit);
     {
-        const pageContextInitEnhanced = getPageContextInitEnhanced(pageContextInit, renderContext, {
-            // We set `enumerable` to `false` to avoid computed URL properties from being iterated & copied in a onPrerenderStart() hook, e.g. /examples/i18n/
-            urlComputedPropsNonEnumerable: true
-        });
+        const pageContextInitEnhanced = getPageContextInitEnhanced(pageContextInit, renderContext);
         objectAssign(pageContext, pageContextInitEnhanced);
     }
     return pageContext;
@@ -382,6 +380,8 @@ async function callOnPrerenderStartHook(prerenderContext, renderContext) {
         pageContext._urlOriginalBeforeHook = pageContext.urlOriginal;
     });
     const docLink = 'https://vike.dev/i18n#pre-rendering';
+    // Set `enumerable` to `false` to avoid computed URL properties from being iterated & copied in onPrerenderStart() hook, e.g. /examples/i18n/
+    const { restoreEnumerable, addPageContextComputedUrl } = makePageContextComputedUrlNonEnumerable(prerenderContext.pageContexts);
     let result = await executeHook(() => hookFn({
         pageContexts: prerenderContext.pageContexts,
         // TODO/v1-release: remove warning
@@ -393,6 +393,7 @@ async function callOnPrerenderStartHook(prerenderContext, renderContext) {
             return prerenderContext.pageContexts;
         }
     }), onPrerenderStartHook, null);
+    restoreEnumerable();
     if (result === null || result === undefined) {
         return;
     }
@@ -430,9 +431,8 @@ async function callOnPrerenderStartHook(prerenderContext, renderContext) {
                 hookName
             };
         }
-        // Restore as URL computed props are lost when user makes a pageContext copy
-        addUrlComputedProps(pageContext);
     });
+    addPageContextComputedUrl(prerenderContext.pageContexts);
 }
 async function routeAndPrerender(prerenderContext, concurrencyLimit, onComplete) {
     const globalContext = getGlobalContext();
@@ -474,7 +474,7 @@ async function routeAndPrerender(prerenderContext, concurrencyLimit, onComplete)
             if (pageContext._pageConfigs.length > 0) {
                 const pageConfig = pageContext._pageConfigs.find((p) => p.pageId === pageId);
                 assert(pageConfig);
-                usesClientRouter = getConfigValue(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
+                usesClientRouter = getConfigValueRuntime(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
             }
             else {
                 usesClientRouter = globalContext.pluginManifest.usesClientRouter;
@@ -714,3 +714,23 @@ function assertIsNotAbort(err, urlOr404) {
     assert(abortCall);
     assertUsage(false, `${pc.cyan(abortCall)} thrown${thrownBy} while pre-rendering ${urlOr404} but ${pc.cyan(abortCaller)} isn't supported for pre-rendered pages`);
 }
+function makePageContextComputedUrlNonEnumerable(pageContexts) {
+    change(false);
+    return { restoreEnumerable, addPageContextComputedUrl };
+    function restoreEnumerable() {
+        change(true);
+    }
+    function addPageContextComputedUrl(pageContexts) {
+        // Add URL computed props to the user-generated pageContext copies
+        pageContexts.forEach((pageContext) => {
+            const pageContextUrlComputed = getPageContextUrlComputed(pageContext);
+            objectAssign(pageContext, pageContextUrlComputed);
+        });
+    }
+    function change(enumerable) {
+        pageContexts.forEach((pageContext) => {
+            changeEnumerable(pageContext, 'urlPathname', enumerable);
+            changeEnumerable(pageContext, 'urlParsed', enumerable);
+        });
+    }
+}

package/dist/esm/node/prerender/utils.d.ts

@@ -13,3 +13,4 @@ export * from '../../utils/assertNodeEnv.js';
 export * from '../../utils/pLimit.js';
 export * from '../../utils/assertPathFilesystemAbsolute.js';
 export * from '../../utils/isArray.js';
+export * from '../../utils/changeEnumerable.js';

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

@@ -15,3 +15,4 @@ export * from '../../utils/assertNodeEnv.js';
 export * from '../../utils/pLimit.js';
 export * from '../../utils/assertPathFilesystemAbsolute.js';
 export * from '../../utils/isArray.js';
+export * from '../../utils/changeEnumerable.js';

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

@@ -4,12 +4,16 @@ import { analyzePageClientSide } from '../../../shared/getPageFiles/analyzePageC
 import { getVirtualFileIdPageConfigValuesAll } from '../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
 import { analyzeClientSide } from '../../../shared/getPageFiles/analyzeClientSide.js';
 import { getGlobalContext } from '../globalContext.js';
-import { getClientEntry } from '../../shared/getClientEntry.js';
+import { getConfigValueRuntime } from '../../../shared/page-configs/getConfigValue.js';
 function analyzePage(pageFilesAll, pageConfig, pageId) {
     if (pageConfig) {
         const { isClientSideRenderable, isClientRouting } = analyzeClientSide(pageConfig, pageFilesAll, pageId);
-        const clientFilePath = getClientEntry(pageConfig);
-        const clientEntry = !isClientSideRenderable ? clientFilePath : getVikeClientEntry(isClientRouting);
+        const clientEntries = [];
+        const clientFilePath = getConfigValueRuntime(pageConfig, 'client', 'string')?.value ?? null;
+        if (clientFilePath)
+            clientEntries.push(clientFilePath);
+        if (isClientSideRenderable)
+            clientEntries.push(getVikeClientEntry(isClientRouting));
         const clientDependencies = [];
         clientDependencies.push({
             id: getVirtualFileIdPageConfigValuesAll(pageConfig.pageId, true),
@@ -41,15 +45,13 @@ function analyzePage(pageFilesAll, pageConfig, pageId) {
           }
         })
         */
-        const clientEntries = [];
-        if (clientEntry) {
+        clientEntries.forEach((clientEntry) => {
             clientDependencies.push({
                 id: clientEntry,
                 onlyAssets: false,
                 eagerlyImported: false
             });
-            clientEntries.push(clientEntry);
-        }
+        });
         return {
             isHtmlOnly: !isClientSideRenderable,
             isClientRouting,

package/dist/esm/node/runtime/renderPage/createHttpResponseObject/getCacheControl.js

@@ -1,13 +1,13 @@
 export { getCacheControl };
 import { getPageConfig } from '../../../../shared/page-configs/helpers.js';
-import { getConfigValue } from '../../../../shared/page-configs/getConfigValue.js';
+import { getConfigValueRuntime } from '../../../../shared/page-configs/getConfigValue.js';
 const defaultValue = 'no-store, max-age=0';
 function getCacheControl(pageId, pageConfigs) {
     // TODO/v1-release: remove
     if (pageConfigs.length === 0)
         return defaultValue;
     const pageConfig = getPageConfig(pageId, pageConfigs);
-    const configValue = getConfigValue(pageConfig, 'cacheControl', 'string');
+    const configValue = getConfigValueRuntime(pageConfig, 'cacheControl', 'string');
     const value = configValue?.value;
     if (value)
         return value;

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

@@ -63,13 +63,13 @@ function getRenderHook(pageContext) {
         assertUsage(false, [
             `No ${hookName}() hook found, see https://vike.dev/${hookName}`
             /*
-          'See https://vike.dev/render-modes for more information.',
-          [
-            // 'Loaded config files (none of them define the onRenderHtml() hook):',
-            'Loaded server-side page files (none of them `export { render }`):',
-            ...pageContext._pageFilePathsLoaded.map((f, i) => ` (${i + 1}): ${f}`)
-          ].join('\n')
-          */
+            'See https://vike.dev/render-modes for more information.',
+            [
+              // 'Loaded config files (none of them define the onRenderHtml() hook):',
+              'Loaded server-side page files (none of them `export { render }`):',
+              ...pageContext._pageFilePathsLoaded.map((f, i) => ` (${i + 1}): ${f}`)
+            ].join('\n')
+            */
         ].join(' '));
     }
     return hookFound;

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

@@ -14,19 +14,11 @@ type PageContext_loadUserFilesServerSide = PageContextGetPageAssets & PageContex
 type PageFiles = PromiseType<ReturnType<typeof loadUserFilesServerSide>>;
 declare function loadUserFilesServerSide(pageContext: {
     _pageId: string;
-} & PageContext_loadUserFilesServerSide): Promise<{
+} & PageContext_loadUserFilesServerSide): Promise<import("../../../shared/getPageFiles.js").PageContextExports & {
     Page: unknown;
     _isHtmlOnly: boolean;
     _passToClient: string[];
     _pageFilePathsLoaded: string[];
-    source: import("../../../shared/getPageFiles/getExports.js").Source;
-    sources: import("../../../shared/getPageFiles/getExports.js").Sources;
-    from: import("../../../shared/getPageFiles/getExports.js").From;
-    config: Record<string, unknown>;
-    configEntries: import("../../../shared/getPageFiles/getExports.js").ConfigEntries;
-    exports: Record<string, unknown>;
-    exportsAll: import("../../../shared/getPageFiles/getExports.js").ExportsAll;
-    pageExports: Record<string, unknown>;
 } & {
     __getPageAssets: () => Promise<PageAsset[]>;
 }>;

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

@@ -10,7 +10,7 @@ import { getGlobalContext } from '../globalContext.js';
 import { loadConfigValues } from '../../../shared/page-configs/loadConfigValues.js';
 async function loadUserFilesServerSide(pageContext) {
     const pageConfig = findPageConfig(pageContext._pageConfigs, pageContext._pageId); // Make pageConfig globally available as pageContext._pageConfig?
-    const [{ pageFilesLoaded, pageConfigLoaded, ...pageContextExports }] = await Promise.all([
+    const [{ pageFilesLoaded, pageContextExports }] = await Promise.all([
         loadPageUserFiles(pageContext._pageFilesAll, pageConfig, pageContext._pageId, !getGlobalContext().isProduction),
         analyzePageClientSideInit(pageContext._pageFilesAll, pageContext._pageId, { sharedPageFilesAlreadyLoaded: true })
     ]);
@@ -35,8 +35,8 @@ async function loadUserFilesServerSide(pageContext) {
         });
     }
     const pageContextAddendum = {};
+    objectAssign(pageContextAddendum, pageContextExports);
     objectAssign(pageContextAddendum, {
-        ...pageContextExports,
         Page: pageContextExports.exports.Page,
         _isHtmlOnly: isHtmlOnly,
         _passToClient: passToClient,
@@ -101,8 +101,7 @@ async function loadPageUserFiles(pageFilesAll, pageConfig, pageId, isDev) {
     await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
     const pageContextExports = getPageContextExports(pageFilesServerSide, pageConfigLoaded);
     return {
-        ...pageContextExports,
-        pageFilesLoaded: pageFilesServerSide,
-        pageConfigLoaded
+        pageContextExports,
+        pageFilesLoaded: pageFilesServerSide
     };
 }

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

@@ -1,6 +1,6 @@
 export { preparePageContextForUserConsumptionServerSide };
 export type { PageContextForUserConsumptionServerSide };
-import { PageContextUrlComputedPropsInternal } from '../../../shared/addUrlComputedProps.js';
+import { PageContextUrlInternal } from '../../../shared/getPageContextUrlComputed.js';
 import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 import type { PageContextExports } from '../../../shared/getPageFiles/getExports.js';
 import { PageContextBuiltInServerInternal } from '../../../shared/types.js';
@@ -9,7 +9,7 @@ type PageContextForUserConsumptionServerSide = PageContextBuiltInServerInternal
     /** @deprecated */
     url: string;
     urlPathname: string;
-    urlParsed: PageContextUrlComputedPropsInternal['urlParsed'];
+    urlParsed: PageContextUrlInternal['urlParsed'];
     routeParams: Record<string, string>;
     Page: unknown;
     _pageId: string;

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

@@ -1,10 +1,10 @@
 export { preparePageContextForUserConsumptionServerSide };
 import { assert, isPlainObject, isObject } from '../utils.js';
 import { sortPageContext } from '../../../shared/sortPageContext.js';
-import { assertPageContextUrlComputedProps } from '../../../shared/addUrlComputedProps.js';
+import { assertPageContextUrl } from '../../../shared/getPageContextUrlComputed.js';
 import { addIs404ToPageProps } from '../../../shared/addIs404ToPageProps.js';
 function preparePageContextForUserConsumptionServerSide(pageContext) {
-    assertPageContextUrlComputedProps(pageContext);
+    assertPageContextUrl(pageContext);
     assert(isPlainObject(pageContext.routeParams));
     assert('Page' in pageContext);
     assert(isObject(pageContext.pageExports));

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

@@ -7,7 +7,7 @@ export type { RenderContext };
 export type { PageContextAfterRender };
 export type { PageContextInitEnhanced };
 import { type PageFile } from '../../../shared/getPageFiles.js';
-import { type PageContextUrlComputedPropsInternal } from '../../../shared/addUrlComputedProps.js';
+import { type PageContextUrlInternal } from '../../../shared/getPageContextUrlComputed.js';
 import { HttpResponse } from './createHttpResponseObject.js';
 import { PageContext_loadUserFilesServerSide, type PageFiles } from './loadUserFilesServerSide.js';
 import type { PageConfigRuntime, PageConfigGlobalRuntime } from '../../../shared/page-configs/PageConfig.js';
@@ -24,7 +24,7 @@ declare function renderPageAlreadyRouted<PageContext extends {
     routeParams: Record<string, string>;
     errorWhileRendering: null | Error;
     _httpRequestId: number;
-} & PageContextInitEnhanced & PageContextUrlComputedPropsInternal & PageContext_loadUserFilesServerSide>(pageContext: PageContext): Promise<PageContext & PageContextAfterRender>;
+} & PageContextInitEnhanced & PageContextUrlInternal & PageContext_loadUserFilesServerSide>(pageContext: PageContext): Promise<PageContext & PageContextAfterRender>;
 declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles & {
     routeParams: Record<string, string>;
     _pageId: string;
@@ -59,23 +59,17 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _urlRewrite: string | null;
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
-    } & import("../../../shared/addUrlComputedProps.js").PageContextUrlComputedPropsClient & {
-        _urlRewrite: string | null;
     } & {
-        headers: Record<string, string> | null;
+        urlParsed: import("../../../shared/getPageContextUrlComputed.js").Url;
+        urlPathname: string;
+        url: string;
     } & {
+        headers: Record<string, string> | null;
+    } & import("../../../shared/getPageFiles.js").PageContextExports & {
         Page: unknown;
         _isHtmlOnly: boolean;
         _passToClient: string[];
         _pageFilePathsLoaded: string[];
-        source: import("../../../shared/getPageFiles/getExports.js").Source;
-        sources: import("../../../shared/getPageFiles/getExports.js").Sources;
-        from: import("../../../shared/getPageFiles/getExports.js").From;
-        config: Record<string, unknown>;
-        configEntries: import("../../../shared/getPageFiles/getExports.js").ConfigEntries;
-        exports: Record<string, unknown>;
-        exportsAll: import("../../../shared/getPageFiles/getExports.js").ExportsAll;
-        pageExports: Record<string, unknown>;
     } & {
         __getPageAssets: () => Promise<import("./getPageAssets.js").PageAsset[]>;
     } & {
@@ -116,23 +110,17 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _urlRewrite: string | null;
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
-    } & import("../../../shared/addUrlComputedProps.js").PageContextUrlComputedPropsClient & {
-        _urlRewrite: string | null;
     } & {
-        headers: Record<string, string> | null;
+        urlParsed: import("../../../shared/getPageContextUrlComputed.js").Url;
+        urlPathname: string;
+        url: string;
     } & {
+        headers: Record<string, string> | null;
+    } & import("../../../shared/getPageFiles.js").PageContextExports & {
         Page: unknown;
         _isHtmlOnly: boolean;
         _passToClient: string[];
         _pageFilePathsLoaded: string[];
-        source: import("../../../shared/getPageFiles/getExports.js").Source;
-        sources: import("../../../shared/getPageFiles/getExports.js").Sources;
-        from: import("../../../shared/getPageFiles/getExports.js").From;
-        config: Record<string, unknown>;
-        configEntries: import("../../../shared/getPageFiles/getExports.js").ConfigEntries;
-        exports: Record<string, unknown>;
-        exportsAll: import("../../../shared/getPageFiles/getExports.js").ExportsAll;
-        pageExports: Record<string, unknown>;
     } & {
         __getPageAssets: () => Promise<import("./getPageAssets.js").PageAsset[]>;
     } & {
@@ -174,23 +162,17 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
         _urlRewrite: string | null;
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
-    } & import("../../../shared/addUrlComputedProps.js").PageContextUrlComputedPropsClient & {
-        _urlRewrite: string | null;
     } & {
-        headers: Record<string, string> | null;
+        urlParsed: import("../../../shared/getPageContextUrlComputed.js").Url;
+        urlPathname: string;
+        url: string;
     } & {
+        headers: Record<string, string> | null;
+    } & import("../../../shared/getPageFiles.js").PageContextExports & {
         Page: unknown;
         _isHtmlOnly: boolean;
         _passToClient: string[];
         _pageFilePathsLoaded: string[];
-        source: import("../../../shared/getPageFiles/getExports.js").Source;
-        sources: import("../../../shared/getPageFiles/getExports.js").Sources;
-        from: import("../../../shared/getPageFiles/getExports.js").From;
-        config: Record<string, unknown>;
-        configEntries: import("../../../shared/getPageFiles/getExports.js").ConfigEntries;
-        exports: Record<string, unknown>;
-        exportsAll: import("../../../shared/getPageFiles/getExports.js").ExportsAll;
-        pageExports: Record<string, unknown>;
     } & {
         __getPageAssets: () => Promise<import("./getPageAssets.js").PageAsset[]>;
     } & {
@@ -231,23 +213,17 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
         _urlRewrite: string | null;
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
-    } & import("../../../shared/addUrlComputedProps.js").PageContextUrlComputedPropsClient & {
-        _urlRewrite: string | null;
     } & {
-        headers: Record<string, string> | null;
+        urlParsed: import("../../../shared/getPageContextUrlComputed.js").Url;
+        urlPathname: string;
+        url: string;
     } & {
+        headers: Record<string, string> | null;
+    } & import("../../../shared/getPageFiles.js").PageContextExports & {
         Page: unknown;
         _isHtmlOnly: boolean;
         _passToClient: string[];
         _pageFilePathsLoaded: string[];
-        source: import("../../../shared/getPageFiles/getExports.js").Source;
-        sources: import("../../../shared/getPageFiles/getExports.js").Sources;
-        from: import("../../../shared/getPageFiles/getExports.js").From;
-        config: Record<string, unknown>;
-        configEntries: import("../../../shared/getPageFiles/getExports.js").ConfigEntries;
-        exports: Record<string, unknown>;
-        exportsAll: import("../../../shared/getPageFiles/getExports.js").ExportsAll;
-        pageExports: Record<string, unknown>;
     } & {
         __getPageAssets: () => Promise<import("./getPageAssets.js").PageAsset[]>;
     } & {
@@ -268,8 +244,7 @@ declare function getPageContextInitEnhanced(pageContextInit: {
     urlOriginal: string;
     headersOriginal?: unknown;
     headers?: unknown;
-}, renderContext: RenderContext, { urlComputedPropsNonEnumerable, ssr: { urlRewrite, urlHandler, isClientSideNavigation } }?: {
-    urlComputedPropsNonEnumerable?: boolean;
+}, renderContext: RenderContext, { ssr: { urlRewrite, urlHandler, isClientSideNavigation } }?: {
     ssr?: {
         urlRewrite: null | string;
         urlHandler: null | ((url: string) => string);
@@ -298,8 +273,10 @@ declare function getPageContextInitEnhanced(pageContextInit: {
     _urlRewrite: string | null;
     _urlHandler: ((url: string) => string) | null;
     isClientSideNavigation: boolean;
-} & import("../../../shared/addUrlComputedProps.js").PageContextUrlComputedPropsClient & {
-    _urlRewrite: string | null;
+} & {
+    urlParsed: import("../../../shared/getPageContextUrlComputed.js").Url;
+    urlPathname: string;
+    url: string;
 } & {
     headers: Record<string, string> | null;
 };

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

@@ -8,7 +8,7 @@ import { getHtmlString } from '../html/renderHtml.js';
 import { getPageFilesAll } from '../../../shared/getPageFiles.js';
 import { assert, assertUsage, assertWarning, hasProp, normalizeHeaders, objectAssign } from '../utils.js';
 import { serializePageContextClientSide } from '../html/serializePageContextClientSide.js';
-import { addUrlComputedProps } from '../../../shared/addUrlComputedProps.js';
+import { getPageContextUrlComputed } from '../../../shared/getPageContextUrlComputed.js';
 import { getGlobalContext } from '../globalContext.js';
 import { createHttpResponseObject, createHttpResponsePageContextJson } from './createHttpResponseObject.js';
 import { loadUserFilesServerSide } from './loadUserFilesServerSide.js';
@@ -21,7 +21,6 @@ import { executeGuardHook } from '../../../shared/route/executeGuardHook.js';
 import { loadPageRoutes } from '../../../shared/route/loadPageRoutes.js';
 import pc from '@brillout/picocolors';
 import { isServerSideError } from '../../../shared/misc/isServerSideError.js';
-import { assertV1Design } from '../../shared/assertV1Design.js';
 async function renderPageAlreadyRouted(pageContext) {
     // pageContext._pageId can either be the:
     //  - ID of the page matching the routing, or the
@@ -116,7 +115,7 @@ async function prerender404Page(renderContext, pageContextInit_) {
     objectAssign(pageContext, await loadUserFilesServerSide(pageContext));
     return prerenderPage(pageContext);
 }
-function getPageContextInitEnhanced(pageContextInit, renderContext, { urlComputedPropsNonEnumerable = false, ssr: { urlRewrite, urlHandler, isClientSideNavigation } = {
+function getPageContextInitEnhanced(pageContextInit, renderContext, { ssr: { urlRewrite, urlHandler, isClientSideNavigation } = {
     urlRewrite: null,
     urlHandler: null,
     isClientSideNavigation: false
@@ -144,7 +143,8 @@ function getPageContextInitEnhanced(pageContextInit, renderContext, { urlCompute
         isClientSideNavigation
     });
     // pageContext.urlParsed
-    addUrlComputedProps(pageContextInitEnhanced, !urlComputedPropsNonEnumerable);
+    const pageContextUrlComputed = getPageContextUrlComputed(pageContextInitEnhanced);
+    objectAssign(pageContextInitEnhanced, pageContextUrlComputed);
     // pageContext.headers
     {
         let headers;
@@ -170,7 +170,8 @@ async function getRenderContext() {
     const globalContext = getGlobalContext();
     const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal } = await getPageFilesAll(false, globalContext.isProduction);
     const { pageRoutes, onBeforeRouteHook } = await loadPageRoutes(pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds);
-    assertV1Design(pageFilesAll.length > 0, pageConfigs, pageFilesAll);
+    // We assume assertV1Design() was already called at build-time
+    assert(pageFilesAll.length === 0 || pageConfigs.length === 0);
     const renderContext = {
         pageFilesAll: pageFilesAll,
         pageConfigs,

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

@@ -1,4 +1,4 @@
 export { assertV1Design };
 import { PageFile } from '../../shared/getPageFiles.js';
-import type { PageConfigBuildTime, PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
-declare function assertV1Design(isOldDesign: boolean, pageConfigs: (PageConfigRuntime | PageConfigBuildTime)[], pageFilesAll?: PageFile[]): void;
+import type { PageConfigBuildTime } from '../../shared/page-configs/PageConfig.js';
+declare function assertV1Design(isOldDesign: boolean, pageConfigs: PageConfigBuildTime[], pageFilesAll?: PageFile[]): void;

package/dist/esm/node/shared/assertV1Design.js

@@ -1,5 +1,4 @@
 export { assertV1Design };
-import { getConfigValueFilePathToShowToUser } from '../../shared/page-configs/helpers.js';
 import { assert, assertUsage, assertWarning, isNotNullish, unique } from './utils.js';
 function assertV1Design(isOldDesign, pageConfigs, pageFilesAll) {
     const isV1Design = pageConfigs.length > 0;
@@ -9,10 +8,10 @@ function assertV1Design(isOldDesign, pageConfigs, pageFilesAll) {
             assert(pageFilesAll.length > 0);
             const indent = '- ';
             const filesV1 = unique(pageConfigs
-                .map((p) => Object.values(p.configValues)
-                .map((c) => getConfigValueFilePathToShowToUser(c.definedAtData))
+                .map((p) => Object.values(p.configValueSources).map((sources) => sources
+                .map((c) => c.definedAtFilePath.filePathAbsoluteUserRootDir)
                 .filter(isNotNullish)
-                .map((filePathToShowToUser) => indent + filePathToShowToUser))
+                .map((filePathToShowToUser) => indent + filePathToShowToUser)))
                 .flat(2));
             const filesOld = pageFilesAll.map((p) => indent + p.filePath);
             lines.push(...['V1 design files:', ...filesV1, 'Old design files:', ...filesOld]);

package/dist/esm/shared/{addUrlComputedProps.d.ts → getPageContextUrlComputed.d.ts}

@@ -1,9 +1,9 @@
-export { addUrlComputedProps };
-export { assertPageContextUrlComputedProps };
-export type { PageContextUrlComputedPropsInternal };
-export type { PageContextUrlComputedPropsClient };
-export type { PageContextUrlComputedPropsServer };
-export type { PageContextUrlSources };
+export { getPageContextUrlComputed };
+export { assertPageContextUrl };
+export type { PageContextUrlInternal };
+export type { PageContextUrlClient };
+export type { PageContextUrlServer };
+export type { PageContextUrlSource };
 export type { Url };
 type Url = {
     /** The URL origin, e.g. `https://example.com` of `https://example.com/product/42?details=yes#reviews` */
@@ -27,23 +27,24 @@ type Url = {
     /** @deprecated */
     searchString: null | string;
 };
-type PageContextUrlComputedPropsClient = {
+type PageContextUrlComputed = {
+    /** Parsed information about the current URL */
+    urlParsed: Url;
+    /** The URL pathname, e.g. `/product/42` of `https://example.com/product/42?details=yes#reviews` */
+    urlPathname: string;
     /** @deprecated */
     url: string;
+};
+type PageContextUrl = {
     /** The URL of the HTTP request */
     urlOriginal: string;
-    /** 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: Url;
-};
-/** For Vike internal use */
-type PageContextUrlComputedPropsInternal = PageContextUrlComputedPropsClient & {
+} & PageContextUrlComputed;
+type PageContextUrlInternal = PageContextUrl & {
     _urlRewrite: string | null;
 };
-type HashProps = 'hash' | 'hashString' | 'hashOriginal';
-type PageContextUrlComputedPropsServer = PageContextUrlComputedPropsClient & {
-    urlParsed: Omit<PageContextUrlComputedPropsClient['urlParsed'], HashProps> & {
+type PageContextUrlClient = PageContextUrl;
+type PageContextUrlServer = PageContextUrl & {
+    urlParsed: Omit<PageContextUrl['urlParsed'], HashProps> & {
         /** Only available on the client-side */
         hash: '';
         /** Only available on the client-side */
@@ -52,14 +53,15 @@ type PageContextUrlComputedPropsServer = PageContextUrlComputedPropsClient & {
         hashOriginal: null;
     };
 };
-declare function addUrlComputedProps<PageContext extends Record<string, unknown> & PageContextUrlSources>(pageContext: PageContext, enumerable?: boolean): asserts pageContext is PageContext & PageContextUrlComputedPropsInternal;
-type PageContextUrlSources = {
+type HashProps = 'hash' | 'hashString' | 'hashOriginal';
+declare function getPageContextUrlComputed(pageContext: PageContextUrlSource): PageContextUrlComputed;
+type PageContextUrlSource = {
     urlOriginal: string;
     urlLogical?: string;
     _urlRewrite: string | null;
     _baseServer: string;
     _urlHandler: null | ((url: string) => string);
 };
-declare function assertPageContextUrlComputedProps(pageContext: {
+declare function assertPageContextUrl(pageContext: {
     urlOriginal: string;
-} & PageContextUrlComputedPropsClient): void;
+} & PageContextUrlClient): void;