vike 0.4.218-commit-85af52a → 0.4.218-commit-65f582c

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

@@ -13,4 +13,5 @@ export * from '../../utils/assertSetup.js';
 export * from '../../utils/pLimit.js';
 export * from '../../utils/isFilePathAbsoluteFilesystem.js';
 export * from '../../utils/isArray.js';
+export * from '../../utils/isObject.js';
 export * from '../../utils/changeEnumerable.js';

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

@@ -15,4 +15,5 @@ export * from '../../utils/assertSetup.js';
 export * from '../../utils/pLimit.js';
 export * from '../../utils/isFilePathAbsoluteFilesystem.js';
 export * from '../../utils/isArray.js';
+export * from '../../utils/isObject.js';
 export * from '../../utils/changeEnumerable.js';

package/dist/esm/node/runtime/globalContext.d.ts

@@ -19,21 +19,24 @@ import type { ResolvedConfig, ViteDevServer } from 'vite';
 import type { VikeConfigGlobal } from '../plugin/plugins/importUserCode/v1-design/getVikeConfig.js';
 import { type RuntimeManifest } from '../shared/assertRuntimeManifest.js';
 import type { VikeConfigObject } from '../plugin/plugins/importUserCode/v1-design/getVikeConfig.js';
+import type { ConfigUserFriendly } from '../../shared/page-configs/getPageConfigUserFriendly.js';
 type GlobalContextPublic = {
     assetsManifest: null | ViteManifest;
 };
+type PageRuntimeInfo = Awaited<ReturnType<typeof getPageRuntimeInfo>>['userFiles'];
 type GlobalContext = {
     baseServer: string;
     baseAssets: null | string;
     includeAssetsImportedByServer: boolean;
-    redirects: Record<string, string>;
     trailingSlash: boolean;
     disableUrlNormalization: boolean;
-} & ({
+    vikeConfig: {
+        global: ConfigUserFriendly;
+    };
+} & PageRuntimeInfo & ({
     isProduction: false;
     isPrerendering: false;
     viteConfig: ResolvedConfig;
-    vikeConfig: VikeConfigObject;
     viteDevServer: ViteDevServer;
     assetsManifest: null;
 } | ({
@@ -63,6 +66,17 @@ declare function getViteConfig(): ResolvedConfig | null;
 declare function initGlobalContext_renderPage(): Promise<void>;
 declare function initGlobalContext_runPrerender(): Promise<void>;
 declare function initGlobalContext_getGlobalContextAsync(isProduction: boolean): Promise<void>;
+declare function getPageRuntimeInfo(isProduction: boolean): Promise<{
+    userFiles: {
+        pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
+        pageConfigs: import("../../__internal/index.js").PageConfig[];
+        pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
+        allPageIds: string[];
+        pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
+        onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
+    };
+    globalConfig: ConfigUserFriendly;
+}>;
 declare function getRuntimeManifest(vikeConfigGlobal: VikeConfigGlobal, viteConfig: ResolvedConfig): RuntimeManifest;
 declare function setGlobalContext_buildEntry(buildEntry: unknown): void;
 declare function clearGlobalContext(): void;

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

@@ -19,11 +19,13 @@ export { clearGlobalContext };
 import { assert, onSetupRuntime, assertUsage, assertWarning, isPlainObject, objectAssign, objectReplace, objectKeys, isObject, hasProp, debugGlob, getGlobalObject, genPromise, createDebugger } from './utils.js';
 import { importServerProductionEntry } from '@brillout/vite-plugin-server-entry/runtime';
 import { virtualFileIdImportUserCodeServer } from '../shared/virtual-files/virtualFileImportUserCode.js';
-import { setPageFiles, setPageFilesAsync } from '../../shared/getPageFiles/getPageFiles.js';
+import { getPageFilesAll, setPageFiles, setPageFilesAsync } from '../../shared/getPageFiles/getPageFiles.js';
 import { assertPluginManifest } from '../shared/assertPluginManifest.js';
 import { assertRuntimeManifest } from '../shared/assertRuntimeManifest.js';
 import pc from '@brillout/picocolors';
 import { resolveBaseFromResolvedConfig } from '../shared/resolveBase.js';
+import { loadPageRoutes } from '../../shared/route/loadPageRoutes.js';
+import { assertV1Design } from '../shared/assertV1Design.js';
 const debug = createDebugger('vike:globalContext');
 const globalObject = getGlobalObject('globalContext.ts', getInitialGlobalContext());
 initDevEntry();
@@ -49,6 +51,7 @@ async function getGlobalContextAsync(isProduction) {
 }
 function makePublic(globalContext) {
     const globalContextPublic = {
+        // TODO/now: add viteConfig and vikeConfig
         assetsManifest: globalContext.assetsManifest
     };
     // Add internals (and prepended _ prefix to their keys)
@@ -142,6 +145,7 @@ async function initGlobalContext_getGlobalContextAsync(isProduction) {
     }
     await initGlobalContext(isProduction);
 }
+// TODO/now: refactor: move this to the top of the file
 async function initGlobalContext(isProduction) {
     if (globalObject.globalContext) {
         assert(globalObject.globalContext.isProduction === isProduction);
@@ -156,6 +160,7 @@ async function initGlobalContext(isProduction) {
         assert(vikeConfig);
         assert(viteDevServer);
         assert(!isPrerendering);
+        const { globalConfig, userFiles } = await getPageRuntimeInfo(isProduction);
         const pluginManifest = getRuntimeManifest(vikeConfig.vikeConfigGlobal, viteConfig);
         globalObject.globalContext = {
             isProduction: false,
@@ -163,11 +168,13 @@ async function initGlobalContext(isProduction) {
             assetsManifest: null,
             viteDevServer,
             viteConfig,
-            vikeConfig,
+            vikeConfig: {
+                global: globalConfig
+            },
+            ...userFiles,
             baseServer: pluginManifest.baseServer,
             baseAssets: pluginManifest.baseAssets,
             includeAssetsImportedByServer: pluginManifest.includeAssetsImportedByServer,
-            redirects: pluginManifest.redirects,
             trailingSlash: pluginManifest.trailingSlash,
             disableUrlNormalization: pluginManifest.disableUrlNormalization
         };
@@ -176,16 +183,20 @@ async function initGlobalContext(isProduction) {
         const buildEntry = await getBuildEntry(globalObject.outDirRoot);
         const { assetsManifest, pluginManifest } = buildEntry;
         setPageFiles(buildEntry.pageFiles);
+        const { globalConfig, userFiles } = await getPageRuntimeInfo(isProduction);
         assertViteManifest(assetsManifest);
         assertPluginManifest(pluginManifest);
         const globalContext = {
             isProduction: true,
             assetsManifest,
+            vikeConfig: {
+                global: globalConfig
+            },
+            ...userFiles,
             viteDevServer: null,
             baseServer: pluginManifest.baseServer,
             baseAssets: pluginManifest.baseAssets,
             includeAssetsImportedByServer: pluginManifest.includeAssetsImportedByServer,
-            redirects: pluginManifest.redirects,
             trailingSlash: pluginManifest.trailingSlash,
             usesClientRouter: pluginManifest.usesClientRouter,
             disableUrlNormalization: pluginManifest.disableUrlNormalization
@@ -207,14 +218,29 @@ async function initGlobalContext(isProduction) {
         }
     }
 }
+async function getPageRuntimeInfo(isProduction) {
+    const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, globalConfig } = await getPageFilesAll(false, isProduction);
+    const { pageRoutes, onBeforeRouteHook } = await loadPageRoutes(pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds);
+    const userFiles = {
+        pageFilesAll,
+        pageConfigs,
+        pageConfigGlobal,
+        allPageIds,
+        pageRoutes,
+        onBeforeRouteHook
+    };
+    assertV1Design(
+    // pageConfigs is PageConfigRuntime[] but assertV1Design() requires PageConfigBuildTime[]
+    pageConfigs.length > 0, pageFilesAll);
+    return { userFiles, globalConfig };
+}
 function getRuntimeManifest(vikeConfigGlobal, viteConfig) {
-    const { includeAssetsImportedByServer, redirects, trailingSlash, disableUrlNormalization } = vikeConfigGlobal;
+    const { includeAssetsImportedByServer, trailingSlash, disableUrlNormalization } = vikeConfigGlobal;
     const { baseServer, baseAssets } = resolveBaseFromResolvedConfig(vikeConfigGlobal.baseServer, vikeConfigGlobal.baseAssets, viteConfig);
     const manifest = {
         baseServer,
         baseAssets,
         includeAssetsImportedByServer,
-        redirects,
         trailingSlash,
         disableUrlNormalization
     };

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

@@ -2,17 +2,11 @@ export { renderPageAlreadyRouted };
 export { prerenderPage };
 export { prerender404Page };
 export { getPageContextInitEnhanced };
-export { getRenderContext };
-export type { RenderContext };
 export type { PageContextAfterRender };
 export type { PageContextInitEnhanced };
-import type { PageFile } from '../../../shared/getPageFiles/getPageFileObject.js';
 import { type PageContextUrlInternal } from '../../../shared/getPageContextUrlComputed.js';
 import { HttpResponse } from './createHttpResponse.js';
 import { PageContext_loadUserFilesServerSide, type PageFiles } from './loadUserFilesServerSide.js';
-import type { PageConfigRuntime, PageConfigGlobalRuntime } from '../../../shared/page-configs/PageConfig.js';
-import { type PageRoutes } from '../../../shared/route/loadPageRoutes.js';
-import type { Hook } from '../../../shared/hooks/getHook.js';
 type PageContextAfterRender = {
     httpResponse: HttpResponse;
     errorWhileRendering: null | Error;
@@ -45,12 +39,12 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _baseServer: string;
         _baseAssets: string | null;
         _includeAssetsImportedByServer: boolean;
-        _pageFilesAll: PageFile[];
-        _pageConfigs: PageConfigRuntime[];
-        _pageConfigGlobal: PageConfigGlobalRuntime;
+        _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
+        _pageConfigs: import("../../../__internal/index.js").PageConfig[];
+        _pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
         _allPageIds: string[];
-        _pageRoutes: PageRoutes;
-        _onBeforeRouteHook: Hook | null;
+        _pageRoutes: import("../../../__internal/index.js").PageRoutes;
+        _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
         _pageContextInit: {
             urlOriginal: string;
             headersOriginal?: unknown;
@@ -96,12 +90,12 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _baseServer: string;
         _baseAssets: string | null;
         _includeAssetsImportedByServer: boolean;
-        _pageFilesAll: PageFile[];
-        _pageConfigs: PageConfigRuntime[];
-        _pageConfigGlobal: PageConfigGlobalRuntime;
+        _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
+        _pageConfigs: import("../../../__internal/index.js").PageConfig[];
+        _pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
         _allPageIds: string[];
-        _pageRoutes: PageRoutes;
-        _onBeforeRouteHook: Hook | null;
+        _pageRoutes: import("../../../__internal/index.js").PageRoutes;
+        _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
         _pageContextInit: {
             urlOriginal: string;
             headersOriginal?: unknown;
@@ -136,7 +130,7 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _urlHandler: null;
     };
 }>;
-declare function prerender404Page(renderContext: RenderContext, pageContextInit_: Record<string, unknown> | null): Promise<{
+declare function prerender404Page(pageContextInit_: Record<string, unknown> | null): Promise<{
     documentHtml: string;
     pageContextSerialized: null;
     pageContext: {
@@ -148,12 +142,12 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
         _baseServer: string;
         _baseAssets: string | null;
         _includeAssetsImportedByServer: boolean;
-        _pageFilesAll: PageFile[];
-        _pageConfigs: PageConfigRuntime[];
-        _pageConfigGlobal: PageConfigGlobalRuntime;
+        _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
+        _pageConfigs: import("../../../__internal/index.js").PageConfig[];
+        _pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
         _allPageIds: string[];
-        _pageRoutes: PageRoutes;
-        _onBeforeRouteHook: Hook | null;
+        _pageRoutes: import("../../../__internal/index.js").PageRoutes;
+        _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
         _pageContextInit: {
             urlOriginal: string;
             headersOriginal?: unknown;
@@ -199,12 +193,12 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
         _baseServer: string;
         _baseAssets: string | null;
         _includeAssetsImportedByServer: boolean;
-        _pageFilesAll: PageFile[];
-        _pageConfigs: PageConfigRuntime[];
-        _pageConfigGlobal: PageConfigGlobalRuntime;
+        _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
+        _pageConfigs: import("../../../__internal/index.js").PageConfig[];
+        _pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
         _allPageIds: string[];
-        _pageRoutes: PageRoutes;
-        _onBeforeRouteHook: Hook | null;
+        _pageRoutes: import("../../../__internal/index.js").PageRoutes;
+        _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
         _pageContextInit: {
             urlOriginal: string;
             headersOriginal?: unknown;
@@ -244,7 +238,7 @@ declare function getPageContextInitEnhanced(pageContextInit: {
     urlOriginal: string;
     headersOriginal?: unknown;
     headers?: unknown;
-}, renderContext: RenderContext, { ssr: { urlRewrite, urlHandler, isClientSideNavigation } }?: {
+}, { ssr: { urlRewrite, urlHandler, isClientSideNavigation } }?: {
     ssr?: {
         urlRewrite: null | string;
         urlHandler: null | ((url: string) => string);
@@ -259,12 +253,12 @@ declare function getPageContextInitEnhanced(pageContextInit: {
     _baseServer: string;
     _baseAssets: string | null;
     _includeAssetsImportedByServer: boolean;
-    _pageFilesAll: PageFile[];
-    _pageConfigs: PageConfigRuntime[];
-    _pageConfigGlobal: PageConfigGlobalRuntime;
+    _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
+    _pageConfigs: import("../../../__internal/index.js").PageConfig[];
+    _pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
     _allPageIds: string[];
-    _pageRoutes: PageRoutes;
-    _onBeforeRouteHook: Hook | null;
+    _pageRoutes: import("../../../__internal/index.js").PageRoutes;
+    _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
     _pageContextInit: {
         urlOriginal: string;
         headersOriginal?: unknown;
@@ -280,12 +274,3 @@ declare function getPageContextInitEnhanced(pageContextInit: {
 } & {
     headers: Record<string, string> | null;
 };
-type RenderContext = {
-    pageFilesAll: PageFile[];
-    pageConfigs: PageConfigRuntime[];
-    pageConfigGlobal: PageConfigGlobalRuntime;
-    allPageIds: string[];
-    pageRoutes: PageRoutes;
-    onBeforeRouteHook: Hook | null;
-};
-declare function getRenderContext(): Promise<RenderContext>;

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

@@ -2,10 +2,8 @@ export { renderPageAlreadyRouted };
 export { prerenderPage };
 export { prerender404Page };
 export { getPageContextInitEnhanced };
-export { getRenderContext };
 import { getErrorPageId } from '../../../shared/error-page.js';
 import { getHtmlString } from '../html/renderHtml.js';
-import { getPageFilesAll } from '../../../shared/getPageFiles/getPageFiles.js';
 import { assert, assertUsage, assertWarning, hasProp, normalizeHeaders, objectAssign } from '../utils.js';
 import { serializePageContextClientSide } from '../html/serializePageContextClientSide.js';
 import { getPageContextUrlComputed } from '../../../shared/getPageContextUrlComputed.js';
@@ -18,10 +16,8 @@ import { logRuntimeError } from './loggerRuntime.js';
 import { isNewError } from './isNewError.js';
 import { preparePageContextForUserConsumptionServerSide } from './preparePageContextForUserConsumptionServerSide.js';
 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
@@ -84,8 +80,9 @@ async function prerenderPage(pageContext) {
         return { documentHtml, pageContextSerialized, pageContext };
     }
 }
-async function prerender404Page(renderContext, pageContextInit_) {
-    const errorPageId = getErrorPageId(renderContext.pageFilesAll, renderContext.pageConfigs);
+async function prerender404Page(pageContextInit_) {
+    const globalContext = getGlobalContext();
+    const errorPageId = getErrorPageId(globalContext.pageFilesAll, globalContext.pageConfigs);
     if (!errorPageId) {
         return null;
     }
@@ -104,13 +101,13 @@ async function prerender404Page(renderContext, pageContextInit_) {
     };
     objectAssign(pageContextInit, pageContextInit_);
     {
-        const pageContextInitEnhanced = getPageContextInitEnhanced(pageContextInit, renderContext);
+        const pageContextInitEnhanced = getPageContextInitEnhanced(pageContextInit);
         objectAssign(pageContext, pageContextInitEnhanced);
     }
     objectAssign(pageContext, await loadUserFilesServerSide(pageContext));
     return prerenderPage(pageContext);
 }
-function getPageContextInitEnhanced(pageContextInit, renderContext, { ssr: { urlRewrite, urlHandler, isClientSideNavigation } = {
+function getPageContextInitEnhanced(pageContextInit, { ssr: { urlRewrite, urlHandler, isClientSideNavigation } = {
     urlRewrite: null,
     urlHandler: null,
     isClientSideNavigation: false
@@ -126,12 +123,12 @@ function getPageContextInitEnhanced(pageContextInit, renderContext, { ssr: { url
         _baseAssets: globalContext.baseAssets,
         _includeAssetsImportedByServer: globalContext.includeAssetsImportedByServer,
         // TODO: use GloablContext instead
-        _pageFilesAll: renderContext.pageFilesAll,
-        _pageConfigs: renderContext.pageConfigs,
-        _pageConfigGlobal: renderContext.pageConfigGlobal,
-        _allPageIds: renderContext.allPageIds,
-        _pageRoutes: renderContext.pageRoutes,
-        _onBeforeRouteHook: renderContext.onBeforeRouteHook,
+        _pageFilesAll: globalContext.pageFilesAll,
+        _pageConfigs: globalContext.pageConfigs,
+        _pageConfigGlobal: globalContext.pageConfigGlobal,
+        _allPageIds: globalContext.allPageIds,
+        _pageRoutes: globalContext.pageRoutes,
+        _onBeforeRouteHook: globalContext.onBeforeRouteHook,
         _pageContextInit: pageContextInit,
         _urlRewrite: urlRewrite,
         _urlHandler: urlHandler,
@@ -159,22 +156,3 @@ function getPageContextInitEnhanced(pageContextInit, renderContext, { ssr: { url
     }
     return pageContextInitEnhanced;
 }
-// TODO: remove getRenderContext() in favor of getGlobalObject() + reloadGlobalContext()
-// TODO: impl GlobalNodeContext + GlobalClientContext + GloablContext, and use GlobalContext instead of RenderContext
-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(
-    // pageConfigs is PageConfigRuntime[] but assertV1Design() requires PageConfigBuildTime[]
-    pageConfigs.length > 0, pageFilesAll);
-    const renderContext = {
-        pageFilesAll,
-        pageConfigs,
-        pageConfigGlobal,
-        allPageIds,
-        pageRoutes,
-        onBeforeRouteHook
-    };
-    return renderContext;
-}

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

@@ -1,4 +1,4 @@
 export { resolveRedirects };
 export { resolveRouteStringRedirect };
-declare function resolveRedirects(redirects: Record<string, string>, urlPathname: string): null | string;
+declare function resolveRedirects(redirectsAll: Record<string, string>[], urlPathname: string): null | string;
 declare function resolveRouteStringRedirect(urlSource: string, urlTarget: string, urlPathname: string): null | string;

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

@@ -9,7 +9,8 @@ import pc from '@brillout/picocolors';
 assertIsNotBrowser(); // Don't bloat the client
 // TODO/next-major-release: update
 const configSrc = '[vite.config.js > vike({ redirects })]';
-function resolveRedirects(redirects, urlPathname) {
+function resolveRedirects(redirectsAll, urlPathname) {
+    const redirects = merge(redirectsAll);
     for (const [urlSource, urlTarget] of Object.entries(redirects)) {
         const urlResolved = resolveRouteStringRedirect(urlSource, urlTarget, urlPathname);
         if (urlResolved)
@@ -40,3 +41,10 @@ function assertParams(urlSource, urlTarget) {
         }
     });
 }
+function merge(objs) {
+    const obj = {};
+    objs.forEach((e) => {
+        Object.assign(obj, e);
+    });
+    return obj;
+}

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

@@ -1,6 +1,6 @@
 export { renderPage };
 export { renderPage_addWrapper };
-import { getRenderContext, getPageContextInitEnhanced, renderPageAlreadyRouted } from './renderPage/renderPageAlreadyRouted.js';
+import { getPageContextInitEnhanced, renderPageAlreadyRouted } from './renderPage/renderPageAlreadyRouted.js';
 import { route } from '../../shared/route/index.js';
 import { assert, hasProp, objectAssign, isUrl, parseUrl, onSetupRuntime, assertWarning, getGlobalObject, checkType, assertUsage, normalizeUrlPathname, removeBaseServer, modifyUrlPathname, prependBase, removeUrlOrigin, setUrlOrigin, createUrlFromComponents, isUri, getUrlPretty } from './utils.js';
 import { assertNoInfiniteAbortLoop, getPageContextFromAllRewrites, isAbortError, logAbortErrorHandled } from '../../shared/route/abort.js';
@@ -60,10 +60,8 @@ async function renderPageAndPrepare(pageContextInit, httpRequestId) {
         }
     }
     // Prepare context
-    let renderContext;
     try {
         await initGlobalContext_renderPage();
-        renderContext = await getRenderContext();
     }
     catch (err) {
         // Errors are expected since assertUsage() is used in both initGlobalContext_renderPage() and getRenderContext().
@@ -77,7 +75,7 @@ async function renderPageAndPrepare(pageContextInit, httpRequestId) {
         return handleInvalidConfig(isConfigInvalid.err);
     }
     else {
-        // From now on, renderContext.pageConfigs contains all the configuration data; getVikeConfig() isn't called anymore for this request
+        // From now on, gloablContext contains all the configuration data; getVikeConfig() isn't called anymore for this request
     }
     // Check Base URL
     assertBaseUrl(pageContextInit);
@@ -93,9 +91,9 @@ async function renderPageAndPrepare(pageContextInit, httpRequestId) {
         if (pageContextHttpResponse)
             return pageContextHttpResponse;
     }
-    return await renderPageAlreadyPrepared(pageContextInit, httpRequestId, renderContext, []);
+    return await renderPageAlreadyPrepared(pageContextInit, httpRequestId, []);
 }
-async function renderPageAlreadyPrepared(pageContextInit, httpRequestId, renderContext, pageContextsFromRewrite) {
+async function renderPageAlreadyPrepared(pageContextInit, httpRequestId, pageContextsFromRewrite) {
     assertNoInfiniteAbortLoop(pageContextsFromRewrite.length, 
     // There doesn't seem to be a way to count the number of HTTP redirects (vike don't have access to the HTTP request headers/cookies)
     // https://stackoverflow.com/questions/9683007/detect-infinite-http-redirect-loop-on-server-side
@@ -107,7 +105,7 @@ async function renderPageAlreadyPrepared(pageContextInit, httpRequestId, renderC
         objectAssign(pageContextNominalPageInit, pageContextFromAllRewrites);
     }
     {
-        const pageContextInitEnhanced = getPageContextInitEnhancedSSR(pageContextInit, renderContext, pageContextNominalPageInit._urlRewrite, httpRequestId);
+        const pageContextInitEnhanced = getPageContextInitEnhancedSSR(pageContextInit, pageContextNominalPageInit._urlRewrite, httpRequestId);
         objectAssign(pageContextNominalPageInit, pageContextInitEnhanced);
     }
     let errNominalPage;
@@ -139,10 +137,10 @@ async function renderPageAlreadyPrepared(pageContextInit, httpRequestId, renderC
         assert(pageContextNominalPageSuccess === undefined);
         assert(pageContextNominalPageInit);
         assert(hasProp(pageContextNominalPageInit, 'urlOriginal', 'string'));
-        const pageContextErrorPageInit = await getPageContextErrorPageInit(pageContextInit, errNominalPage, pageContextNominalPageInit, renderContext, httpRequestId);
+        const pageContextErrorPageInit = await getPageContextErrorPageInit(pageContextInit, errNominalPage, pageContextNominalPageInit, httpRequestId);
         // Handle `throw redirect()` and `throw render()` while rendering nominal page
         if (isAbortError(errNominalPage)) {
-            const handled = await handleAbortError(errNominalPage, pageContextsFromRewrite, pageContextInit, pageContextNominalPageInit, httpRequestId, renderContext, pageContextErrorPageInit);
+            const handled = await handleAbortError(errNominalPage, pageContextsFromRewrite, pageContextInit, pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit);
             if (handled.pageContextReturn) {
                 // - throw redirect()
                 // - throw render(url)
@@ -155,7 +153,8 @@ async function renderPageAlreadyPrepared(pageContextInit, httpRequestId, renderC
             Object.assign(pageContextErrorPageInit, handled.pageContextAbort);
         }
         {
-            const errorPageId = getErrorPageId(renderContext.pageFilesAll, renderContext.pageConfigs);
+            const globalContext = getGlobalContext();
+            const errorPageId = getErrorPageId(globalContext.pageFilesAll, globalContext.pageConfigs);
             if (!errorPageId) {
                 objectAssign(pageContextErrorPageInit, { pageId: null });
                 return handleErrorWithoutErrorPage(pageContextErrorPageInit);
@@ -171,7 +170,7 @@ async function renderPageAlreadyPrepared(pageContextInit, httpRequestId, renderC
         catch (errErrorPage) {
             // Handle `throw redirect()` and `throw render()` while rendering error page
             if (isAbortError(errErrorPage)) {
-                const handled = await handleAbortError(errErrorPage, pageContextsFromRewrite, pageContextInit, pageContextNominalPageInit, httpRequestId, renderContext, pageContextErrorPageInit);
+                const handled = await handleAbortError(errErrorPage, pageContextsFromRewrite, pageContextInit, pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit);
                 // throw render(abortStatusCode)
                 if (!handled.pageContextReturn) {
                     const pageContextAbort = errErrorPage._pageContextAbort;
@@ -287,8 +286,8 @@ async function renderPageNominal(pageContext) {
     assert(pageContext === pageContextAfterRender);
     return pageContextAfterRender;
 }
-async function getPageContextErrorPageInit(pageContextInit, errNominalPage, pageContextNominalPagePartial, renderContext, httpRequestId) {
-    const pageContextInitEnhanced = getPageContextInitEnhancedSSR(pageContextInit, renderContext, null, httpRequestId);
+async function getPageContextErrorPageInit(pageContextInit, errNominalPage, pageContextNominalPagePartial, httpRequestId) {
+    const pageContextInitEnhanced = getPageContextInitEnhancedSSR(pageContextInit, null, httpRequestId);
     assert(errNominalPage);
     const pageContext = {};
     objectAssign(pageContext, pageContextInitEnhanced);
@@ -303,9 +302,9 @@ async function getPageContextErrorPageInit(pageContextInit, errNominalPage, page
     assert(pageContext.errorWhileRendering);
     return pageContext;
 }
-function getPageContextInitEnhancedSSR(pageContextInit, renderContext, urlRewrite, httpRequestId) {
+function getPageContextInitEnhancedSSR(pageContextInit, urlRewrite, httpRequestId) {
     const { isClientSideNavigation, _urlHandler } = handlePageContextUrl(pageContextInit.urlOriginal);
-    const pageContextInitEnhanced = getPageContextInitEnhanced(pageContextInit, renderContext, {
+    const pageContextInitEnhanced = getPageContextInitEnhanced(pageContextInit, {
         ssr: {
             urlRewrite,
             urlHandler: _urlHandler,
@@ -354,12 +353,12 @@ function normalizeUrl(pageContextInit, httpRequestId) {
     return pageContextHttpResponse;
 }
 function getPermanentRedirect(pageContextInit, httpRequestId) {
-    const { redirects, baseServer } = getGlobalContext();
-    const urlWithoutBase = removeBaseServer(pageContextInit.urlOriginal, baseServer);
+    const globalContext = getGlobalContext();
+    const urlWithoutBase = removeBaseServer(pageContextInit.urlOriginal, globalContext.baseServer);
     let origin = null;
     let urlTargetExternal = null;
     let urlTarget = modifyUrlPathname(urlWithoutBase, (urlPathname) => {
-        const urlTarget = resolveRedirects(redirects, urlPathname);
+        const urlTarget = resolveRedirects(globalContext.vikeConfig.global.config.redirects ?? [], urlPathname);
         if (urlTarget === null)
             return null;
         if (!isUrl(urlTarget)) {
@@ -387,7 +386,7 @@ function getPermanentRedirect(pageContextInit, httpRequestId) {
         if (normalize(urlTarget) === normalize(urlWithoutBase))
             return null;
         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');
@@ -401,13 +400,14 @@ function normalize(url) {
 }
 async function handleAbortError(errAbort, pageContextsFromRewrite, pageContextInit, 
 // handleAbortError() creates a new pageContext object and we don't merge pageContextNominalPageInit to it: we only use some pageContextNominalPageInit information.
-pageContextNominalPageInit, httpRequestId, renderContext, pageContextErrorPageInit) {
+pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit) {
     logAbortErrorHandled(errAbort, getGlobalContext().isProduction, pageContextNominalPageInit);
     const pageContextAbort = errAbort._pageContextAbort;
     let pageContextSerialized;
     if (pageContextNominalPageInit.isClientSideNavigation) {
         if (pageContextAbort.abortStatusCode) {
-            const errorPageId = getErrorPageId(renderContext.pageFilesAll, renderContext.pageConfigs);
+            const globalContext = getGlobalContext();
+            const errorPageId = getErrorPageId(globalContext.pageFilesAll, globalContext.pageConfigs);
             const abortCall = pageContextAbort._abortCall;
             assert(abortCall);
             assertUsage(errorPageId, `You called ${pc.cyan(abortCall)} but you didn't define an error page, make sure to define one https://vike.dev/error-page`);
@@ -415,7 +415,6 @@ pageContextNominalPageInit, httpRequestId, renderContext, pageContextErrorPageIn
             objectAssign(pageContext, { pageId: errorPageId });
             objectAssign(pageContext, pageContextAbort);
             objectAssign(pageContext, pageContextErrorPageInit);
-            objectAssign(pageContext, renderContext);
             objectAssign(pageContext, await loadUserFilesServerSide(pageContext));
             // We include pageContextInit: we don't only serialize pageContextAbort because the error page may need to access pageContextInit
             pageContextSerialized = serializePageContextClientSide(pageContext);
@@ -428,7 +427,7 @@ pageContextNominalPageInit, httpRequestId, renderContext, pageContextErrorPageIn
         return { pageContextReturn };
     }
     if (pageContextAbort._urlRewrite) {
-        const pageContextReturn = await renderPageAlreadyPrepared(pageContextInit, httpRequestId, renderContext, [
+        const pageContextReturn = await renderPageAlreadyPrepared(pageContextInit, httpRequestId, [
             ...pageContextsFromRewrite,
             pageContextAbort
         ]);

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

@@ -6,7 +6,6 @@ type PluginManifest = {
     baseAssets: string | null;
     usesClientRouter: boolean;
     includeAssetsImportedByServer: boolean;
-    redirects: Record<string, string>;
     trailingSlash: boolean;
     disableUrlNormalization: boolean;
 };

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

@@ -4,7 +4,6 @@ type RuntimeManifest = {
     baseServer: string;
     baseAssets: string;
     includeAssetsImportedByServer: boolean;
-    redirects: Record<string, string>;
     trailingSlash: boolean;
     disableUrlNormalization: boolean;
 };

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

@@ -1,5 +1,5 @@
 export { assertRuntimeManifest };
-import { assert, castType, checkType, hasProp, isBaseAssets, isBaseServer, isObject } from './utils.js';
+import { assert, checkType, hasProp, isBaseAssets, isBaseServer, isObject } from './utils.js';
 function assertRuntimeManifest(obj) {
     assert(obj);
     assert(isObject(obj));
@@ -8,8 +8,6 @@ function assertRuntimeManifest(obj) {
     assert(isBaseServer(obj.baseServer));
     assert(isBaseAssets(obj.baseAssets));
     assert(hasProp(obj, 'includeAssetsImportedByServer', 'boolean'));
-    assert(hasProp(obj, 'redirects', 'object'));
-    castType(obj);
     assert(hasProp(obj, 'trailingSlash', 'boolean'));
     assert(hasProp(obj, 'disableUrlNormalization', 'boolean'));
     checkType(obj);

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

@@ -3,6 +3,7 @@ export { setPageFiles };
 export { setPageFilesAsync };
 import type { PageFile } from './getPageFileObject.js';
 import type { PageConfigRuntime, PageConfigGlobalRuntime } from '../page-configs/PageConfig.js';
+import { type ConfigUserFriendly } from '../page-configs/getPageConfigUserFriendly.js';
 declare function setPageFiles(pageFilesExports: unknown): void;
 declare function setPageFilesAsync(getPageFilesExports: () => Promise<unknown>): void;
 declare function getPageFilesAll(isClientSide: boolean, isProduction?: boolean): Promise<{
@@ -10,4 +11,5 @@ declare function getPageFilesAll(isClientSide: boolean, isProduction?: boolean):
     allPageIds: string[];
     pageConfigs: PageConfigRuntime[];
     pageConfigGlobal: PageConfigGlobalRuntime;
+    globalConfig: ConfigUserFriendly;
 }>;