vike 0.4.221 → 0.4.222-commit-6647d1e

package/dist/esm/node/runtime/globalContext.js

@@ -18,7 +18,7 @@ export { assertBuildInfo };
 export { getViteConfigRuntime };
 export { updateUserFiles };
 // The core logic revolves around:
-// - globalObject.userFiles which is the main requirement for assembleGlobalContext()
+// - globalObject.userFiles which is the main requirement for resolveGlobalContext()
 // - In production: globalObject.buildEntry which is the production entry set by @brillout/vite-plugin-server-entry
 //   - loadBuildEntry() sets globalObject.buildEntry and then sets globalObject.userFiles
 //   - With vike-server it's set at server start: @brillout/vite-plugin-server-entry injects `import './entry.mjs'` (the production entry generated by @brillout/vite-plugin-server-entry) as first line of code of dist/server/index.mjs while dist/server/entry.mjs calls setGlobalContext_buildEntry()
@@ -32,6 +32,7 @@ import pc from '@brillout/picocolors';
 import { loadPageRoutes } from '../../shared/route/loadPageRoutes.js';
 import { assertV1Design } from '../shared/assertV1Design.js';
 import { getPageConfigsRuntime } from '../../shared/getPageConfigsRuntime.js';
+import { resolveBase } from '../shared/resolveBase.js';
 const debug = createDebugger('vike:globalContext');
 const globalObject = getGlobalObject('globalContext.ts', getInitialGlobalContext());
 async function getGlobalContextInternal() {
@@ -75,8 +76,14 @@ async function getGlobalContextAsync(isProduction) {
     return globalContext_public;
 }
 function makePublic(globalContext) {
-    // TODO/soon: add `pages`
-    const globalContextPublic = makePublicCopy(globalContext, 'globalContext', ['assetsManifest', 'config', 'viteConfig']);
+    const globalContextPublic = makePublicCopy(globalContext, 'globalContext', [
+        'assetsManifest',
+        'config',
+        'viteConfig',
+        'pages',
+        'baseServer',
+        'baseAssets'
+    ]);
     return globalContextPublic;
 }
 async function setGlobalContext_viteDevServer(viteDevServer) {
@@ -180,7 +187,7 @@ function setIsProduction(isProduction) {
     globalObject.isProduction = isProduction;
 }
 function defineGlobalContext() {
-    const globalContext = assembleGlobalContext();
+    const globalContext = resolveGlobalContext();
     assertIsDefined(globalContext);
     const globalContext_public = makePublic(globalContext);
     objectAssign(globalContext, { globalContext_public });
@@ -189,7 +196,7 @@ function defineGlobalContext() {
     assertGlobalContextIsDefined();
     onSetupRuntime();
 }
-function assembleGlobalContext() {
+function resolveGlobalContext() {
     const { viteDevServer, viteConfig, isPrerendering, isProduction, userFiles } = globalObject;
     assert(typeof isProduction === 'boolean');
     let globalContext;
@@ -208,7 +215,8 @@ function assembleGlobalContext() {
             viteDevServer,
             viteConfig,
             ...userFiles,
-            viteConfigRuntime
+            viteConfigRuntime,
+            ...resolveBaseRuntime(viteConfigRuntime, userFiles.config)
         };
     }
     else {
@@ -225,7 +233,8 @@ function assembleGlobalContext() {
             ...userFiles,
             viteDevServer: null,
             viteConfigRuntime: buildInfo.viteConfigRuntime,
-            usesClientRouter: buildInfo.usesClientRouter
+            usesClientRouter: buildInfo.usesClientRouter,
+            ...resolveBaseRuntime(buildInfo.viteConfigRuntime, userFiles.config)
         };
         if (isPrerendering) {
             assert(viteConfig);
@@ -250,7 +259,7 @@ async function getUserFiles() {
     const globalObject_ = globalObject;
     const { pageConfigsRuntime } = globalObject_;
     assert(pageConfigsRuntime);
-    const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, globalConfig } = pageConfigsRuntime;
+    const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, globalConfig, pageConfigsUserFriendly } = pageConfigsRuntime;
     const { pageRoutes, onBeforeRouteHook } = await loadPageRoutes(pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds);
     const userFiles = {
         pageFilesAll,
@@ -259,6 +268,7 @@ async function getUserFiles() {
         allPageIds,
         pageRoutes,
         onBeforeRouteHook,
+        pages: pageConfigsUserFriendly,
         config: globalConfig.config
     };
     assertV1Design(
@@ -393,3 +403,9 @@ function getInitialGlobalContext() {
         viteDevServerPromiseResolve
     };
 }
+function resolveBaseRuntime(viteConfigRuntime, config) {
+    const baseViteOriginal = viteConfigRuntime._baseViteOriginal;
+    const baseServerUnresolved = config.baseServer ?? null;
+    const baseAssetsUnresolved = config.baseAssets ?? null;
+    return resolveBase(baseViteOriginal, baseServerUnresolved, baseAssetsUnresolved);
+}

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

@@ -1,5 +1,5 @@
 export { getViteDevScript };
-import type { GlobalContext } from '../../globalContext.js';
+import type { GlobalContextInternal } from '../../globalContext.js';
 declare function getViteDevScript(pageContext: {
-    _globalContext: GlobalContext;
+    _globalContext: GlobalContextInternal;
 }): Promise<string>;

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

@@ -8,7 +8,7 @@ import { type PreloadFilter } from './injectAssets/getHtmlTags.js';
 import type { StreamFromReactStreamingPackage } from './stream/react-streaming.js';
 import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 import type { PageContextSerialization } from './serializePageContextClientSide.js';
-import type { GlobalContext } from '../globalContext.js';
+import type { GlobalContextInternal } from '../globalContext.js';
 type PageContextInjectAssets = {
     urlPathname: string;
     __getPageAssets: () => Promise<PageAsset[]>;
@@ -22,7 +22,7 @@ type PageContextInjectAssets = {
     _baseServer: string;
     _pageConfigs: PageConfigRuntime[];
     is404: null | boolean;
-    _globalContext: GlobalContext;
+    _globalContext: GlobalContextInternal;
 } & PageContextSerialization;
 declare function injectHtmlTagsToString(htmlParts: HtmlPart[], pageContext: PageContextInjectAssets & {
     _isStream: false;

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

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

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

@@ -1,7 +1,7 @@
 export { executeOnBeforeRenderAndDataHooks };
-import { type PageConfigUserFriendly } from '../../../shared/getPageFiles.js';
+import { type PageConfigUserFriendlyOld } from '../../../shared/getPageFiles.js';
 import { type PageContextForUserConsumptionServerSide } from './preparePageContextForUserConsumptionServerSide.js';
 declare function executeOnBeforeRenderAndDataHooks(pageContext: {
     pageId: string;
     _pageContextAlreadyProvidedByOnPrerenderHook?: true;
-} & PageConfigUserFriendly & PageContextForUserConsumptionServerSide): Promise<void>;
+} & PageConfigUserFriendlyOld & PageContextForUserConsumptionServerSide): Promise<void>;

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

@@ -5,7 +5,7 @@ export type { GetPageAssets };
 export type { PageContextGetPageAssets };
 import { type MediaType } from './inferMediaType.js';
 import type { ClientDependency } from '../../../shared/getPageFiles/analyzePageClientSide/ClientDependency.js';
-import type { GlobalContext } from '../globalContext.js';
+import type { GlobalContextInternal } from '../globalContext.js';
 import type { ResolveClientEntriesDev } from '../../plugin/shared/resolveClientEntriesDev.js';
 type PageAsset = {
     src: string;
@@ -18,7 +18,7 @@ type PageContextGetPageAssets = {
     _baseServer: string;
     _baseAssets: string | null;
     _includeAssetsImportedByServer: boolean;
-    _globalContext: GlobalContext;
+    _globalContext: GlobalContextInternal;
 };
 declare function getPageAssets(pageContext: PageContextGetPageAssets, clientDependencies: ClientDependency[], clientEntries: string[]): Promise<PageAsset[]>;
 declare function setResolveClientEntriesDev(resolveClientEntriesDev: ResolveClientEntriesDev): void;

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

@@ -1,5 +1,5 @@
 export { handleErrorWithoutErrorPage };
-import type { GlobalContext } from '../globalContext.js';
+import type { GlobalContextInternal } 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';
@@ -10,6 +10,6 @@ declare function handleErrorWithoutErrorPage<PageContext extends {
     pageId: null;
     _pageFilesAll: PageFile[];
     _pageConfigs: PageConfigRuntime[];
-    _globalContext: GlobalContext;
+    _globalContext: GlobalContextInternal;
     urlOriginal: string;
 }>(pageContext: PageContext): Promise<PageContext & PageContextAfterRender>;

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

@@ -6,17 +6,17 @@ 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 { GlobalContext } from '../globalContext.js';
+import type { GlobalContextInternal } from '../globalContext.js';
 type PageContext_loadUserFilesServerSide = PageContextGetPageAssets & PageContextDebugRouteMatches & {
     urlOriginal: string;
     _pageFilesAll: PageFile[];
     _pageConfigs: PageConfigRuntime[];
-    _globalContext: GlobalContext;
+    _globalContext: GlobalContextInternal;
 };
 type PageFiles = PromiseType<ReturnType<typeof loadUserFilesServerSide>>;
 declare function loadUserFilesServerSide(pageContext: {
     pageId: string;
-} & PageContext_loadUserFilesServerSide): Promise<import("../../../shared/getPageFiles.js").PageConfigUserFriendly & {
+} & PageContext_loadUserFilesServerSide): Promise<import("../../../shared/getPageFiles.js").PageConfigUserFriendlyOld & {
     Page: unknown;
     _isHtmlOnly: boolean;
     _passToClient: string[];

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

@@ -1,6 +1,6 @@
 export { loadUserFilesServerSide };
 import { getPageFilesServerSide } from '../../../shared/getPageFiles.js';
-import { getPageConfigUserFriendlyOld } from '../../../shared/page-configs/getPageConfigUserFriendly.js';
+import { getPageConfigUserFriendly_oldDesign } from '../../../shared/page-configs/getPageConfigUserFriendly.js';
 import { analyzePageClientSideInit } from '../../../shared/getPageFiles/analyzePageClientSide.js';
 import { assert, assertUsage, assertWarning, hasProp, isArrayOfStrings, objectAssign, isArray } from '../utils.js';
 import { getPageAssets } from './getPageAssets.js';
@@ -12,7 +12,7 @@ async function loadUserFilesServerSide(pageContext) {
     const pageConfig = findPageConfig(pageContext._pageConfigs, pageContext.pageId); // Make pageConfig globally available as pageContext._pageConfig?
     const globalContext = pageContext._globalContext;
     const [{ pageFilesLoaded, pageContextExports }] = await Promise.all([
-        loadPageUserFiles(pageContext._pageFilesAll, pageConfig, pageContext.pageId, !globalContext.isProduction),
+        loadPageUserFiles(pageContext._pageFilesAll, pageConfig, globalContext.pageConfigGlobal, pageContext.pageId, !globalContext.isProduction),
         analyzePageClientSideInit(pageContext._pageFilesAll, pageContext.pageId, { sharedPageFilesAlreadyLoaded: true })
     ]);
     const { isHtmlOnly, isClientRouting, clientEntries, clientDependencies, pageFilesClientSide, pageFilesServerSide } = await analyzePage(pageContext._pageFilesAll, pageConfig, pageContext.pageId, globalContext);
@@ -96,11 +96,11 @@ async function loadUserFilesServerSide(pageContext) {
     }
     return pageContextAddendum;
 }
-async function loadPageUserFiles(pageFilesAll, pageConfig, pageId, isDev) {
+async function loadPageUserFiles(pageFilesAll, pageConfig, pageConfigGlobal, pageId, isDev) {
     const pageFilesServerSide = getPageFilesServerSide(pageFilesAll, pageId);
     const pageConfigLoaded = !pageConfig ? null : await loadConfigValues(pageConfig, isDev);
     await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
-    const pageContextExports = getPageConfigUserFriendlyOld(pageFilesServerSide, pageConfigLoaded);
+    const pageContextExports = getPageConfigUserFriendly_oldDesign(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
     return {
         pageContextExports,
         pageFilesLoaded: pageFilesServerSide

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

@@ -1,12 +1,12 @@
 export { log404 };
 export { getRoutesInfo };
 import type { PageRoutes } from '../../../../shared/route/index.js';
-import type { GlobalContext } from '../../globalContext.js';
+import type { GlobalContextInternal } from '../../globalContext.js';
 declare function log404(pageContext: {
     urlPathname: string;
     errorWhileRendering: null | Error;
     isClientSideNavigation: boolean;
     _pageRoutes: PageRoutes;
-    _globalContext: GlobalContext;
+    _globalContext: GlobalContextInternal;
 }): Promise<void>;
 declare function getRoutesInfo(pageRoutes: PageRoutes): string | null;

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

@@ -2,10 +2,10 @@ export { preparePageContextForUserConsumptionServerSide };
 export type { PageContextForUserConsumptionServerSide };
 import { PageContextUrlInternal } from '../../../shared/getPageContextUrlComputed.js';
 import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
-import type { PageConfigUserFriendly } from '../../../shared/page-configs/getPageConfigUserFriendly.js';
+import type { PageConfigUserFriendlyOld } from '../../../shared/page-configs/getPageConfigUserFriendly.js';
 import { PageContextBuiltInServerInternal } from '../../../shared/types.js';
-import type { GlobalContext, GlobalContextPublic } from '../globalContext.js';
-type PageContextForUserConsumptionServerSide = PageContextBuiltInServerInternal & PageConfigUserFriendly & {
+import type { GlobalContextInternal, GlobalContextPublic } from '../globalContext.js';
+type PageContextForUserConsumptionServerSide = PageContextBuiltInServerInternal & PageConfigUserFriendlyOld & {
     urlOriginal: string;
     /** @deprecated */
     url: string;
@@ -18,7 +18,7 @@ type PageContextForUserConsumptionServerSide = PageContextBuiltInServerInternal
     is404: null | boolean;
     isClientSideNavigation: boolean;
     pageProps?: Record<string, unknown>;
-    _globalContext: GlobalContext;
+    _globalContext: GlobalContextInternal;
     globalContext: GlobalContextPublic;
 } & Record<string, unknown>;
 declare function preparePageContextForUserConsumptionServerSide(pageContext: PageContextForUserConsumptionServerSide): void;

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

@@ -5,7 +5,7 @@ export { getPageContextInitEnhanced };
 export type { PageContextAfterRender };
 export type { PageContextInitEnhanced };
 import { type PageContextUrlInternal } from '../../../shared/getPageContextUrlComputed.js';
-import type { GlobalContext } from '../globalContext.js';
+import type { GlobalContextInternal } from '../globalContext.js';
 import { HttpResponse } from './createHttpResponse.js';
 import { PageContext_loadUserFilesServerSide, type PageFiles } from './loadUserFilesServerSide.js';
 type PageContextAfterRender = {
@@ -46,7 +46,7 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _allPageIds: string[];
         _pageRoutes: import("../../../__internal/index.js").PageRoutes;
         _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-        _globalContext: GlobalContext;
+        _globalContext: GlobalContextInternal;
         /** @experimental This is a beta feature https://vike.dev/getGlobalContext */
         globalContext: import("../globalContext.js").GlobalContextPublic;
         _pageContextInit: {
@@ -63,7 +63,7 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         url: string;
     } & {
         headers: Record<string, string> | null;
-    } & import("../../../shared/getPageFiles.js").PageConfigUserFriendly & {
+    } & import("../../../shared/getPageFiles.js").PageConfigUserFriendlyOld & {
         Page: unknown;
         _isHtmlOnly: boolean;
         _passToClient: string[];
@@ -100,7 +100,7 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _allPageIds: string[];
         _pageRoutes: import("../../../__internal/index.js").PageRoutes;
         _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-        _globalContext: GlobalContext;
+        _globalContext: GlobalContextInternal;
         /** @experimental This is a beta feature https://vike.dev/getGlobalContext */
         globalContext: import("../globalContext.js").GlobalContextPublic;
         _pageContextInit: {
@@ -117,7 +117,7 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         url: string;
     } & {
         headers: Record<string, string> | null;
-    } & import("../../../shared/getPageFiles.js").PageConfigUserFriendly & {
+    } & import("../../../shared/getPageFiles.js").PageConfigUserFriendlyOld & {
         Page: unknown;
         _isHtmlOnly: boolean;
         _passToClient: string[];
@@ -137,7 +137,7 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _urlHandler: null;
     };
 }>;
-declare function prerender404Page(pageContextInit_: Record<string, unknown> | null, globalContext: GlobalContext): Promise<{
+declare function prerender404Page(pageContextInit_: Record<string, unknown> | null, globalContext: GlobalContextInternal): Promise<{
     documentHtml: string;
     pageContextSerialized: null;
     pageContext: {
@@ -155,7 +155,7 @@ declare function prerender404Page(pageContextInit_: Record<string, unknown> | nu
         _allPageIds: string[];
         _pageRoutes: import("../../../__internal/index.js").PageRoutes;
         _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-        _globalContext: GlobalContext;
+        _globalContext: GlobalContextInternal;
         /** @experimental This is a beta feature https://vike.dev/getGlobalContext */
         globalContext: import("../globalContext.js").GlobalContextPublic;
         _pageContextInit: {
@@ -172,7 +172,7 @@ declare function prerender404Page(pageContextInit_: Record<string, unknown> | nu
         url: string;
     } & {
         headers: Record<string, string> | null;
-    } & import("../../../shared/getPageFiles.js").PageConfigUserFriendly & {
+    } & import("../../../shared/getPageFiles.js").PageConfigUserFriendlyOld & {
         Page: unknown;
         _isHtmlOnly: boolean;
         _passToClient: string[];
@@ -209,7 +209,7 @@ declare function prerender404Page(pageContextInit_: Record<string, unknown> | nu
         _allPageIds: string[];
         _pageRoutes: import("../../../__internal/index.js").PageRoutes;
         _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-        _globalContext: GlobalContext;
+        _globalContext: GlobalContextInternal;
         /** @experimental This is a beta feature https://vike.dev/getGlobalContext */
         globalContext: import("../globalContext.js").GlobalContextPublic;
         _pageContextInit: {
@@ -226,7 +226,7 @@ declare function prerender404Page(pageContextInit_: Record<string, unknown> | nu
         url: string;
     } & {
         headers: Record<string, string> | null;
-    } & import("../../../shared/getPageFiles.js").PageConfigUserFriendly & {
+    } & import("../../../shared/getPageFiles.js").PageConfigUserFriendlyOld & {
         Page: unknown;
         _isHtmlOnly: boolean;
         _passToClient: string[];
@@ -251,7 +251,7 @@ declare function getPageContextInitEnhanced(pageContextInit: {
     urlOriginal: string;
     headersOriginal?: unknown;
     headers?: unknown;
-}, globalContext: GlobalContext, { ssr: { urlRewrite, urlHandler, isClientSideNavigation } }?: {
+}, globalContext: GlobalContextInternal, { ssr: { urlRewrite, urlHandler, isClientSideNavigation } }?: {
     ssr?: {
         urlRewrite: null | string;
         urlHandler: null | ((url: string) => string);
@@ -272,7 +272,7 @@ declare function getPageContextInitEnhanced(pageContextInit: {
     _allPageIds: string[];
     _pageRoutes: import("../../../__internal/index.js").PageRoutes;
     _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-    _globalContext: GlobalContext;
+    _globalContext: GlobalContextInternal;
     /** @experimental This is a beta feature https://vike.dev/getGlobalContext */
     globalContext: import("../globalContext.js").GlobalContextPublic;
     _pageContextInit: {

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

@@ -17,7 +17,6 @@ import { preparePageContextForUserConsumptionServerSide } from './preparePageCon
 import { executeGuardHook } from '../../../shared/route/executeGuardHook.js';
 import pc from '@brillout/picocolors';
 import { isServerSideError } from '../../../shared/misc/isServerSideError.js';
-import { resolveBaseRuntime } from '../../shared/resolveBase.js';
 async function renderPageAlreadyRouted(pageContext) {
     // pageContext.pageId can either be the:
     //  - ID of the page matching the routing, or the
@@ -112,14 +111,13 @@ async function getPageContextInitEnhanced(pageContextInit, globalContext, { ssr:
     isClientSideNavigation: false
 } } = {}) {
     assert(pageContextInit.urlOriginal);
-    const { baseServer, baseAssets } = resolveBaseRuntime(globalContext);
     const pageContextInitEnhanced = {};
     objectAssign(pageContextInitEnhanced, pageContextInit);
     objectAssign(pageContextInitEnhanced, {
         _objectCreatedByVike: true,
         // The following is defined on `pageContext` because we can eventually make these non-global
-        _baseServer: baseServer,
-        _baseAssets: baseAssets,
+        _baseServer: globalContext.baseServer,
+        _baseAssets: globalContext.baseAssets,
         // TODO/now: add meta.default
         _includeAssetsImportedByServer: globalContext.config.includeAssetsImportedByServer ?? true,
         // TODO/soon: use GloablContext instead

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

@@ -18,7 +18,6 @@ import { getErrorPageId } from '../../shared/error-page.js';
 import { handleErrorWithoutErrorPage } from './renderPage/handleErrorWithoutErrorPage.js';
 import { loadUserFilesServerSide } from './renderPage/loadUserFilesServerSide.js';
 import { resolveRedirects } from './renderPage/resolveRedirects.js';
-import { resolveBaseRuntime } from '../shared/resolveBase.js';
 const globalObject = getGlobalObject('runtime/renderPage.ts', {
     httpRequestsCount: 0
 });
@@ -337,7 +336,6 @@ function assertIsNotViteRequest(urlPathname, urlOriginal) {
     assertUsage(false, `${pc.code('renderPage(pageContextInit)')} called with ${pc.code(`pageContextInit.urlOriginal===${JSON.stringify(urlOriginal)}`)} which is unexpected because the URL ${pc.bold(urlOriginal)} should have already been handled by the development middleware: make sure the ${pc.cyan('createDevMiddleware()')} middleware is executed *before* the ${pc.cyan('renderPage()')} middleware, see ${pc.underline('https://vike.dev/renderPage')}`);
 }
 async function normalizeUrl(pageContextInit, globalContext, httpRequestId) {
-    const { baseServer } = resolveBaseRuntime(globalContext);
     const { trailingSlash, disableUrlNormalization } = globalContext.config;
     if (disableUrlNormalization)
         return null;
@@ -345,7 +343,7 @@ async function normalizeUrl(pageContextInit, globalContext, httpRequestId) {
     const { isPageContextRequest } = handlePageContextRequestUrl(urlOriginal);
     if (isPageContextRequest)
         return null;
-    const urlNormalized = normalizeUrlPathname(urlOriginal, trailingSlash ?? false, baseServer);
+    const urlNormalized = normalizeUrlPathname(urlOriginal, trailingSlash ?? false, globalContext.baseServer);
     if (!urlNormalized)
         return null;
     logRuntimeInfo?.(`URL normalized from ${pc.cyan(urlOriginal)} to ${pc.cyan(urlNormalized)} (https://vike.dev/url-normalization)`, httpRequestId, 'info');
@@ -355,8 +353,7 @@ async function normalizeUrl(pageContextInit, globalContext, httpRequestId) {
     return pageContextHttpResponse;
 }
 async function getPermanentRedirect(pageContextInit, globalContext, httpRequestId) {
-    const { baseServer } = resolveBaseRuntime(globalContext);
-    const urlWithoutBase = removeBaseServer(pageContextInit.urlOriginal, baseServer);
+    const urlWithoutBase = removeBaseServer(pageContextInit.urlOriginal, globalContext.baseServer);
     let origin = null;
     let urlTargetExternal = null;
     let urlTarget = modifyUrlPathname(urlWithoutBase, (urlPathname) => {
@@ -387,9 +384,8 @@ async function getPermanentRedirect(pageContextInit, globalContext, httpRequestI
         }
         if (normalize(urlTarget) === normalize(urlWithoutBase))
             return null;
-        const { baseServer } = resolveBaseRuntime(globalContext);
         if (!originChanged)
-            urlTarget = prependBase(urlTarget, baseServer);
+            urlTarget = prependBase(urlTarget, globalContext.baseServer);
         assert(urlTarget !== pageContextInit.urlOriginal);
     }
     logRuntimeInfo?.(`Permanent redirection defined by config.redirects (https://vike.dev/redirects)`, httpRequestId, 'info');
@@ -453,7 +449,7 @@ pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit, globalConte
     return { pageContextAbort };
 }
 async function assertBaseUrl(pageContextInit, globalContext) {
-    const { baseServer } = resolveBaseRuntime(globalContext);
+    const { baseServer } = globalContext;
     const { urlOriginal } = pageContextInit;
     const { urlWithoutPageContextRequestSuffix } = handlePageContextRequestUrl(urlOriginal);
     const { hasBaseServer } = parseUrl(urlWithoutPageContextRequestSuffix, baseServer);

package/dist/esm/node/runtime-dev/createDevMiddleware.js

@@ -9,7 +9,7 @@ import { setGlobalContext_isProduction } from '../runtime/globalContext.js';
  */
 async function createDevMiddleware(options = {}) {
     setGlobalContext_isProduction(false);
-    const viteConfig = {
+    const viteConfigFromOptions = {
         ...options.viteConfig,
         server: {
             ...options.viteConfig?.server,
@@ -17,8 +17,8 @@ async function createDevMiddleware(options = {}) {
         }
     };
     if (options.root)
-        viteConfig.root = options.root;
-    const { viteConfigEnhanced } = await prepareViteApiCall(viteConfig, 'dev');
+        viteConfigFromOptions.root = options.root;
+    const { viteConfigEnhanced } = await prepareViteApiCall(viteConfigFromOptions, 'dev');
     const server = await createServer(viteConfigEnhanced);
     const devMiddleware = server.middlewares;
     return { devMiddleware, viteServer: server, viteConfig: server.config };

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

@@ -1,15 +1,7 @@
 export { resolveBase };
-export { resolveBaseRuntime };
-export { resolveBaseFromResolvedConfig };
-import type { ResolvedConfig } from 'vite';
-import type { GlobalContext } from '../runtime/globalContext.js';
-declare function resolveBaseFromResolvedConfig(baseServer: string | null, baseAssets: string | null, config: ResolvedConfig): {
-    baseServer: string;
-    baseAssets: string;
-};
+export type { BaseUrlsResolved };
 type BaseUrlsResolved = {
     baseServer: string;
     baseAssets: string;
 };
-declare function resolveBaseRuntime(globalContext: GlobalContext): BaseUrlsResolved;
 declare function resolveBase(baseViteOriginal: string | null, baseServerUnresolved: string | null, baseAssetsUnresolved: string | null): BaseUrlsResolved;

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

@@ -1,19 +1,6 @@
 export { resolveBase };
-export { resolveBaseRuntime };
-export { resolveBaseFromResolvedConfig };
 import { assert, assertUsage, isBaseServer, isBaseAssets } from './utils.js';
 import pc from '@brillout/picocolors';
-function resolveBaseFromResolvedConfig(baseServer, baseAssets, config) {
-    let baseViteOriginal = config._baseViteOriginal;
-    assert(baseViteOriginal === null || typeof baseViteOriginal == 'string');
-    return resolveBase(baseViteOriginal, baseServer, baseAssets);
-}
-function resolveBaseRuntime(globalContext) {
-    const baseViteOriginal = globalContext.viteConfigRuntime._baseViteOriginal;
-    const baseServerUnresolved = globalContext.config.baseServer ?? null;
-    const baseAssetsUnresolved = globalContext.config.baseAssets ?? null;
-    return resolveBase(baseViteOriginal, baseServerUnresolved, baseAssetsUnresolved);
-}
 function resolveBase(baseViteOriginal, baseServerUnresolved, baseAssetsUnresolved) {
     if (baseViteOriginal === '/__UNSET__')
         baseViteOriginal = null;

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

@@ -1,13 +1,14 @@
 export { getPageConfigsRuntime };
 export { getAllPageIds };
 import type { PageFile } from './getPageFiles.js';
-import { type ConfigUserFriendly } from './page-configs/getPageConfigUserFriendly.js';
+import { type PageConfigUserFriendly, type PageConfigsUserFriendly } from './page-configs/getPageConfigUserFriendly.js';
 import type { PageConfigGlobalRuntime, PageConfigRuntime } from './page-configs/PageConfig.js';
 declare function getPageConfigsRuntime(virtualFileExports: unknown): {
     pageFilesAll: PageFile[];
     allPageIds: string[];
     pageConfigs: PageConfigRuntime[];
     pageConfigGlobal: PageConfigGlobalRuntime;
-    globalConfig: ConfigUserFriendly;
+    globalConfig: PageConfigUserFriendly;
+    pageConfigsUserFriendly: PageConfigsUserFriendly;
 };
 declare function getAllPageIds(pageFilesAll: PageFile[], pageConfigs: PageConfigRuntime[]): string[];

package/dist/esm/shared/getPageConfigsRuntime.js

@@ -1,14 +1,17 @@
 export { getPageConfigsRuntime };
 export { getAllPageIds };
 import { parseGlobResults } from './getPageFiles/parseGlobResults.js';
-import { getPageConfigUserFriendlyNew } from './page-configs/getPageConfigUserFriendly.js';
+import { getPageConfigGlobalUserFriendly, getPageConfigUserFriendly } from './page-configs/getPageConfigUserFriendly.js';
 import { unique } from './utils.js';
 function getPageConfigsRuntime(virtualFileExports) {
     const { pageFilesAll, pageConfigs, pageConfigGlobal } = parseGlobResults(virtualFileExports);
     const allPageIds = getAllPageIds(pageFilesAll, pageConfigs);
     // TODO/now: re-use this call, instead of calling it twice
-    const globalConfig = getPageConfigUserFriendlyNew(pageConfigGlobal);
-    return { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, globalConfig };
+    const globalConfig = getPageConfigGlobalUserFriendly({ pageConfigGlobalValues: pageConfigGlobal.configValues });
+    const pageConfigsUserFriendly = Object.fromEntries(pageConfigs.map((pageConfig) => {
+        return getPageConfigUserFriendly(pageConfigGlobal.configValues, pageConfig, pageConfig.configValues);
+    }));
+    return { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, globalConfig, pageConfigsUserFriendly };
 }
 function getAllPageIds(pageFilesAll, pageConfigs) {
     const fileIds = pageFilesAll.filter(({ isDefaultPageFile }) => !isDefaultPageFile).map(({ pageId }) => pageId);

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

@@ -1,4 +1,4 @@
 export type { PageFile } from './getPageFiles/getPageFileObject.js';
-export type { ExportsAll, PageConfigUserFriendly } from './page-configs/getPageConfigUserFriendly.js';
+export type { ExportsAll, PageConfigUserFriendlyOld } from './page-configs/getPageConfigUserFriendly.js';
 export { getPageFilesClientSide } from './getPageFiles/getAllPageIdFiles.js';
 export { getPageFilesServerSide } from './getPageFiles/getAllPageIdFiles.js';

package/dist/esm/shared/hooks/getHook.d.ts

@@ -9,7 +9,7 @@ export type { HookLoc };
 export type { HookTimeout };
 export type { HooksTimeoutProvidedByUser };
 export { getHookTimeoutDefault };
-import type { PageConfigUserFriendly } from '../getPageFiles.js';
+import type { PageConfigUserFriendlyOld } from '../getPageFiles.js';
 import type { HookName, HookNamePage, HookNameGlobal } from '../page-configs/Config.js';
 import type { PageConfigGlobalRuntime, PageConfigRuntime } from '../page-configs/PageConfig.js';
 type Hook = HookLoc & {
@@ -26,10 +26,10 @@ type HookTimeout = {
     warning: number | false;
 };
 type HooksTimeoutProvidedByUser = false | Partial<Record<HookName, false | Partial<HookTimeout>>>;
-declare function getHook(pageContext: PageConfigUserFriendly, hookName: HookName): null | Hook;
+declare function getHook(pageContext: PageConfigUserFriendlyOld, hookName: HookName): null | Hook;
 declare function getHookFromPageConfig(pageConfig: PageConfigRuntime, hookName: HookNamePage): null | Hook;
 declare function getHookFromPageConfigGlobal(pageConfigGlobal: PageConfigGlobalRuntime, hookName: HookNameGlobal): null | Hook;
-declare function assertHook<TPageContext extends PageConfigUserFriendly, THookName extends PropertyKey & HookName>(pageContext: TPageContext, hookName: THookName): asserts pageContext is TPageContext & {
+declare function assertHook<TPageContext extends PageConfigUserFriendlyOld, THookName extends PropertyKey & HookName>(pageContext: TPageContext, hookName: THookName): asserts pageContext is TPageContext & {
     exports: Record<THookName, Function | undefined>;
 };
 declare function getHookTimeoutDefault(hookName: HookName): HookTimeout;

package/dist/esm/shared/page-configs/Config.d.ts

@@ -32,6 +32,7 @@ export type { OnRenderHtmlAsync };
 export type { OnRenderHtmlSync };
 export type { RouteAsync };
 export type { RouteSync };
+export type { Route };
 export type { KeepScrollPosition };
 import type { PrefetchSetting, PrefetchStaticAssets } from '../../client/client-routing-runtime/prefetch/PrefetchSetting.js';
 import type { ConfigDefinition } from '../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js';
@@ -223,6 +224,7 @@ type RouteSync = (pageContext: PageContextServer | PageContextClient) => {
     routeParams?: Record<string, string>;
     precedence?: number;
 } | boolean;
+type Route = string | RouteSync | RouteAsync;
 /** Whether the page scrolls to the top upon navigation.
  *
  * https://vike.dev/keepScrollPosition
@@ -239,7 +241,7 @@ type ConfigBuiltIn = {
      *
      *  https://vike.dev/route
      */
-    route?: string | RouteAsync | RouteSync | ImportString;
+    route?: Route | ImportString;
     /** Protect page(s), e.g. forbid unauthorized access.
      *
      *  https://vike.dev/guard