vike 0.4.218 → 0.4.220-commit-a9f46b8

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

@@ -17,23 +17,26 @@ exports.setGlobalContext_viteConfig = setGlobalContext_viteConfig;
 exports.setGlobalContext_vikeConfig = setGlobalContext_vikeConfig;
 exports.setGlobalContext_isViteDev = setGlobalContext_isViteDev;
 exports.setGlobalContext_isPrerendering = setGlobalContext_isPrerendering;
+exports.setGlobalContext_buildEntry = setGlobalContext_buildEntry;
+exports.clearGlobalContext = clearGlobalContext;
 const utils_js_1 = require("./utils.js");
-const loadImportBuild_js_1 = require("./globalContext/loadImportBuild.js");
-const getPageFiles_js_1 = require("../../shared/getPageFiles.js");
+const runtime_1 = require("@brillout/vite-plugin-server-entry/runtime");
+const virtualFileImportUserCode_js_1 = require("../shared/virtual-files/virtualFileImportUserCode.js");
+const getPageFiles_js_1 = require("../../shared/getPageFiles/getPageFiles.js");
 const assertPluginManifest_js_1 = require("../shared/assertPluginManifest.js");
 const assertRuntimeManifest_js_1 = require("../shared/assertRuntimeManifest.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const getPageFilesExports_js_1 = require("./page-files/getPageFilesExports.js");
 const resolveBase_js_1 = require("../shared/resolveBase.js");
-const globalObject = (0, utils_js_1.getGlobalObject)('globalContext.ts', (() => {
-    const { promise: viteDevServerPromise, resolve: viteDevServerPromiseResolve } = (0, utils_js_1.genPromise)();
-    return {
-        viteDevServerPromise,
-        viteDevServerPromiseResolve
-    };
-})());
+const loadPageRoutes_js_1 = require("../../shared/route/loadPageRoutes.js");
+const assertV1Design_js_1 = require("../shared/assertV1Design.js");
+const debug = (0, utils_js_1.createDebugger)('vike:globalContext');
+const globalObject = (0, utils_js_1.getGlobalObject)('globalContext.ts', getInitialGlobalContext());
+initDevEntry();
 function getGlobalContext() {
-    (0, utils_js_1.assert)(globalObject.globalContext);
+    if (!globalObject.globalContext) {
+        debug('getGlobalContext()', new Error().stack);
+        (0, utils_js_1.assert)(false);
+    }
     return globalObject.globalContext;
 }
 /** @experimental https://vike.dev/getGlobalContext */
@@ -50,27 +53,8 @@ async function getGlobalContextAsync(isProduction) {
     return makePublic(globalContext);
 }
 function makePublic(globalContext) {
-    const globalContextPublic = {
-        assetsManifest: globalContext.assetsManifest
-    };
-    // Add internals (and prepended _ prefix to their keys)
-    {
-        const publicKeys = Object.keys(globalContextPublic);
-        (0, utils_js_1.objectKeys)(globalContext)
-            .filter((key) => !publicKeys.includes(key))
-            .forEach((key) => {
-            const keyPublic = `_${key}`;
-            Object.defineProperty(globalContextPublic, keyPublic, {
-                enumerable: true,
-                get() {
-                    (0, utils_js_1.assertWarning)(false, `Using internal globalContext.${keyPublic} which is discouraged: it may break in any minor version update. Instead, reach out on GitHub and elaborate your use case.`, {
-                        onlyOnce: true
-                    });
-                    return globalContext[key];
-                }
-            });
-        });
-    }
+    // TODO/now: add viteConfig and vikeConfig
+    const globalContextPublic = (0, utils_js_1.makePublicCopy)(globalContext, 'globalContext', ['assetsManifest']);
     return globalContextPublic;
 }
 function setGlobalContext_viteDevServer(viteDevServer) {
@@ -112,9 +96,11 @@ function getViteConfig() {
     return globalObject.viteConfig ?? null;
 }
 async function initGlobalContext_renderPage() {
+    debug('initGlobalContext_renderPage()');
     await initGlobalContext(!globalObject.isViteDev);
 }
 async function initGlobalContext_runPrerender() {
+    debug('initGlobalContext_runPrerender()');
     if (globalObject.initGlobalContext_runPrerender_alreadyCalled)
         return;
     globalObject.initGlobalContext_runPrerender_alreadyCalled = true;
@@ -128,6 +114,7 @@ async function initGlobalContext_runPrerender() {
     await initGlobalContext(true);
 }
 async function initGlobalContext_getGlobalContextAsync(isProduction) {
+    debug('initGlobalContext_getGlobalContextAsync()');
     if (!isProduction) {
         const waitFor = 20;
         const timeout = setTimeout(() => {
@@ -141,6 +128,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) {
         (0, utils_js_1.assert)(globalObject.globalContext.isProduction === isProduction);
@@ -155,41 +143,45 @@ async function initGlobalContext(isProduction) {
         (0, utils_js_1.assert)(vikeConfig);
         (0, utils_js_1.assert)(viteDevServer);
         (0, utils_js_1.assert)(!isPrerendering);
-        const vikeConfigGlobal = vikeConfig.vikeConfigGlobal;
-        const pluginManifest = getRuntimeManifest(vikeConfigGlobal, viteConfig);
+        const { globalConfig, userFiles } = await getPageRuntimeInfo(isProduction);
+        const pluginManifest = getRuntimeManifest(vikeConfig.vikeConfigGlobal, viteConfig);
         globalObject.globalContext = {
             isProduction: false,
             isPrerendering: false,
             assetsManifest: null,
-            pluginManifest: 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
         };
     }
     else {
-        const buildEntries = await (0, loadImportBuild_js_1.loadImportBuild)(globalObject.outDirRoot);
-        assertBuildEntries(buildEntries, isPrerendering ?? false);
-        const { pageFiles, assetsManifest, pluginManifest } = buildEntries;
-        (0, getPageFiles_js_1.setPageFiles)(pageFiles);
+        const buildEntry = await getBuildEntry(globalObject.outDirRoot, isPrerendering);
+        const { assetsManifest, pluginManifest } = buildEntry;
+        (0, getPageFiles_js_1.setPageFiles)(buildEntry.pageFiles);
+        const { globalConfig, userFiles } = await getPageRuntimeInfo(isProduction);
         assertViteManifest(assetsManifest);
         (0, assertPluginManifest_js_1.assertPluginManifest)(pluginManifest);
         const globalContext = {
             isProduction: true,
             assetsManifest,
-            pluginManifest,
+            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
         };
         if (isPrerendering) {
@@ -209,29 +201,35 @@ async function initGlobalContext(isProduction) {
         }
     }
 }
+async function getPageRuntimeInfo(isProduction) {
+    const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, globalConfig } = await (0, getPageFiles_js_1.getPageFilesAll)(false, isProduction);
+    const { pageRoutes, onBeforeRouteHook } = await (0, loadPageRoutes_js_1.loadPageRoutes)(pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds);
+    const userFiles = {
+        pageFilesAll,
+        pageConfigs,
+        pageConfigGlobal,
+        allPageIds,
+        pageRoutes,
+        onBeforeRouteHook
+    };
+    (0, assertV1Design_js_1.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 } = (0, resolveBase_js_1.resolveBaseFromResolvedConfig)(vikeConfigGlobal.baseServer, vikeConfigGlobal.baseAssets, viteConfig);
     const manifest = {
         baseServer,
         baseAssets,
         includeAssetsImportedByServer,
-        redirects,
         trailingSlash,
         disableUrlNormalization
     };
     (0, assertRuntimeManifest_js_1.assertRuntimeManifest)(manifest);
     return manifest;
 }
-function assertBuildEntries(buildEntries, isPreRendering) {
-    const errMsg = [
-        `You are tyring to run`,
-        isPreRendering ? 'pre-rendering' : 'the server for production',
-        `but your app isn't built yet. Run ${picocolors_1.default.cyan('$ vike build')} before `,
-        isPreRendering ? 'pre-rendering.' : 'running the server.'
-    ].join(' ');
-    (0, utils_js_1.assertUsage)(buildEntries, errMsg);
-}
 function assertViteManifest(manifest) {
     (0, utils_js_1.assert)((0, utils_js_1.isPlainObject)(manifest));
     /* We should include these assertions but we don't as a workaround for PWA manifests: https://github.com/vikejs/vike/issues/769
@@ -248,5 +246,61 @@ function assertViteManifest(manifest) {
 function eagerlyLoadUserFiles() {
     // Other than here, the getPageFilesExports() function is only called only upon calling the renderPage() function.
     // We call it as early as possible here for better performance.
-    (0, getPageFilesExports_js_1.getPageFilesExports)();
+    getPageFilesExports();
+}
+async function getBuildEntry(outDir, isPrerendering) {
+    debug('getBuildEntry()');
+    if (!globalObject.buildEntry) {
+        debug('importServerProductionEntry()');
+        // importServerProductionEntry() loads dist/server/entry.mjs which calls setGlobalContext_buildEntry()
+        await (0, runtime_1.importServerProductionEntry)({ outDir, doNotLoadServer: isPrerendering });
+        if (!globalObject.buildEntry) {
+            debug('globalObject.buildEntryPrevious');
+            // Needed, for example, when calling the API prerender() then preview() because both trigger a importServerProductionEntry() call but only the first only is applied because of the import() cache. (A proper implementation would be to clear the import() cache, but it probably isn't possible on platforms such as Cloudflare Workers.)
+            globalObject.buildEntry = globalObject.buildEntryPrevious;
+        }
+        (0, utils_js_1.assert)(globalObject.buildEntry);
+    }
+    const { buildEntry } = globalObject;
+    (0, utils_js_1.assert)((0, utils_js_1.isObject)(buildEntry));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildEntry, 'pageFiles', 'object'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildEntry, 'assetsManifest', 'object'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildEntry, 'pluginManifest', 'object'));
+    return buildEntry;
+}
+function setGlobalContext_buildEntry(buildEntry) {
+    debug('setGlobalContext_buildEntry()');
+    globalObject.buildEntry = buildEntry;
+    globalObject.buildEntryPrevious = buildEntry;
+}
+function initDevEntry() {
+    (0, getPageFiles_js_1.setPageFilesAsync)(getPageFilesExports);
+}
+async function getPageFilesExports() {
+    const viteDevServer = getViteDevServer();
+    (0, utils_js_1.assert)(viteDevServer);
+    let moduleExports;
+    try {
+        moduleExports = await viteDevServer.ssrLoadModule(virtualFileImportUserCode_js_1.virtualFileIdImportUserCodeServer);
+    }
+    catch (err) {
+        (0, utils_js_1.debugGlob)(`Glob error: ${virtualFileImportUserCode_js_1.virtualFileIdImportUserCodeServer} transpile error: `, err);
+        throw err;
+    }
+    moduleExports = moduleExports.default || moduleExports;
+    (0, utils_js_1.debugGlob)('Glob result: ', moduleExports);
+    (0, utils_js_1.assert)((0, utils_js_1.isObject)(moduleExports));
+    return moduleExports;
+}
+function clearGlobalContext() {
+    debug('clearGlobalContext()');
+    (0, utils_js_1.objectReplace)(globalObject, getInitialGlobalContext(), ['buildEntryPrevious']);
+}
+function getInitialGlobalContext() {
+    debug('getInitialGlobalContext()');
+    const { promise: viteDevServerPromise, resolve: viteDevServerPromiseResolve } = (0, utils_js_1.genPromise)();
+    return {
+        viteDevServerPromise,
+        viteDevServerPromiseResolve
+    };
 }

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

@@ -10,7 +10,7 @@ const sanitizeJson_js_1 = require("./sanitizeJson.js");
 const inferHtmlTags_js_1 = require("./inferHtmlTags.js");
 const mergeScriptTags_js_1 = require("./mergeScriptTags.js");
 const helpers_js_1 = require("../../../../shared/page-configs/helpers.js");
-const getConfigValue_js_1 = require("../../../../shared/page-configs/getConfigValue.js");
+const getConfigValueRuntime_js_1 = require("../../../../shared/page-configs/getConfigValueRuntime.js");
 const globalContext_js_1 = require("../../globalContext.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const getConfigDefinedAt_js_1 = require("../../../../shared/page-configs/getConfigDefinedAt.js");
@@ -218,7 +218,7 @@ function getInjectScriptsAt(pageId, pageConfigs) {
     if (pageConfigs.length === 0)
         return null; // only support V1 design
     const pageConfig = (0, helpers_js_1.getPageConfig)(pageId, pageConfigs);
-    const configValue = (0, getConfigValue_js_1.getConfigValueRuntime)(pageConfig, 'injectScriptsAt');
+    const configValue = (0, getConfigValueRuntime_js_1.getConfigValueRuntime)(pageConfig, 'injectScriptsAt');
     if (!configValue)
         return null;
     const injectScriptsAt = configValue.value;

package/dist/cjs/node/runtime/index-common.js

@@ -24,18 +24,3 @@ Object.defineProperty(exports, "_injectAssets", { enumerable: true, get: functio
 // TODO/v1-release: remove
 var createPageRenderer_js_1 = require("../createPageRenderer.js");
 Object.defineProperty(exports, "createPageRenderer", { enumerable: true, get: function () { return createPageRenderer_js_1.createPageRenderer; } });
-addEcosystemStamp();
-require("./page-files/setup.js");
-// Used by:
-// - Telefunc (to detect the user's stack https://github.com/brillout/telefunc/blob/8288310e88e06a42b710d39c39fb502364ca6d30/telefunc/utils/isVikeApp.ts#L4)
-function addEcosystemStamp() {
-    const g = globalThis;
-    g._isVikeApp =
-        /* Don't set to true so that consumers do `!!globalThis._isVikeApp` instead of `globalThis._isVikeApp === true`.
-        true
-        */
-        // We use an object so that we can eventually, in the future, add helpful information as needed. (E.g. the Vike version, or global settings.)
-        {};
-    // We keep the old stamp for older Telefunc versions
-    g._isVitePluginSsr = true;
-}

package/dist/cjs/node/runtime/onLoad.js

@@ -3,13 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.onLoad = onLoad;
 const assertIsNotBrowser_js_1 = require("../../utils/assertIsNotBrowser.js");
 const assertNodeVersion_js_1 = require("../../utils/assertNodeVersion.js");
+const assert_js_1 = require("../../utils/assert.js");
 const require_shim_1 = require("@brillout/require-shim");
-const utils_js_1 = require("./utils.js");
 const isErrorDebug_js_1 = require("../shared/isErrorDebug.js");
 function onLoad() {
     (0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
     (0, assertNodeVersion_js_1.assertNodeVersion)();
-    (0, require_shim_1.installRequireShim)();
     if ((0, isErrorDebug_js_1.isErrorDebug)())
-        (0, utils_js_1.setAlwaysShowStackTrace)();
+        (0, assert_js_1.setAlwaysShowStackTrace)();
+    addEcosystemStamp();
+    (0, require_shim_1.installRequireShim)();
+}
+// Used by:
+// - Telefunc (to detect the user's stack https://github.com/brillout/telefunc/blob/8288310e88e06a42b710d39c39fb502364ca6d30/telefunc/utils/isVikeApp.ts#L4)
+function addEcosystemStamp() {
+    const g = globalThis;
+    g._isVikeApp =
+        /* Don't set to true so that consumers do `!!globalThis._isVikeApp` instead of `globalThis._isVikeApp === true`.
+        true
+        */
+        // We use an object so that we can eventually, in the future, add helpful information as needed. (E.g. the Vike version, or global settings.)
+        {};
+    // We keep the old stamp for older Telefunc versions
+    g._isVitePluginSsr = true;
 }

package/dist/cjs/node/runtime/page-files/setup.js

@@ -1,5 +1,3 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const getPageFiles_js_1 = require("../../../shared/getPageFiles.js");
-const getPageFilesExports_js_1 = require("./getPageFilesExports.js");
-(0, getPageFiles_js_1.setPageFilesAsync)(getPageFilesExports_js_1.getPageFilesExports);
+// TODO/v1-release: remove https://github.com/vikejs/vike/issues/2122
+// This doesn't do anything anymore. (It's kept to avoid introducing a breaking change.)

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

@@ -6,12 +6,12 @@ const analyzePageClientSide_js_1 = require("../../../shared/getPageFiles/analyze
 const virtualFilePageConfigValuesAll_js_1 = require("../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
 const analyzeClientSide_js_1 = require("../../../shared/getPageFiles/analyzeClientSide.js");
 const globalContext_js_1 = require("../globalContext.js");
-const getConfigValue_js_1 = require("../../../shared/page-configs/getConfigValue.js");
+const getConfigValueRuntime_js_1 = require("../../../shared/page-configs/getConfigValueRuntime.js");
 function analyzePage(pageFilesAll, pageConfig, pageId) {
     if (pageConfig) {
         const { isClientRuntimeLoaded, isClientRouting } = (0, analyzeClientSide_js_1.analyzeClientSide)(pageConfig, pageFilesAll, pageId);
         const clientEntries = [];
-        const clientFilePath = (0, getConfigValue_js_1.getConfigValueRuntime)(pageConfig, 'client', 'string')?.value ?? null;
+        const clientFilePath = (0, getConfigValueRuntime_js_1.getConfigValueRuntime)(pageConfig, 'client', 'string')?.value ?? null;
         if (clientFilePath)
             clientEntries.push(clientFilePath);
         if (isClientRuntimeLoaded)

package/dist/cjs/node/runtime/renderPage/createHttpResponse/getCacheControl.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCacheControl = getCacheControl;
 const helpers_js_1 = require("../../../../shared/page-configs/helpers.js");
-const getConfigValue_js_1 = require("../../../../shared/page-configs/getConfigValue.js");
+const getConfigValueRuntime_js_1 = require("../../../../shared/page-configs/getConfigValueRuntime.js");
 const defaultValue = 'no-store, max-age=0';
 function getCacheControl(pageId, pageConfigs, statusCode) {
     // TODO/v1-release: remove
@@ -11,7 +11,7 @@ function getCacheControl(pageId, pageConfigs, statusCode) {
     if (statusCode > 499)
         return defaultValue;
     const pageConfig = (0, helpers_js_1.getPageConfig)(pageId, pageConfigs);
-    const configValue = (0, getConfigValue_js_1.getConfigValueRuntime)(pageConfig, 'cacheControl', 'string');
+    const configValue = (0, getConfigValueRuntime_js_1.getConfigValueRuntime)(pageConfig, 'cacheControl', 'string');
     const value = configValue?.value;
     if (value)
         return value;

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

@@ -101,7 +101,7 @@ async function loadPageUserFiles(pageFilesAll, pageConfig, pageId, isDev) {
     const pageFilesServerSide = (0, getPageFiles_js_1.getPageFilesServerSide)(pageFilesAll, pageId);
     const pageConfigLoaded = !pageConfig ? null : await (0, loadConfigValues_js_1.loadConfigValues)(pageConfig, isDev);
     await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
-    const pageContextExports = (0, getPageFiles_js_1.getPageContextExports)(pageFilesServerSide, pageConfigLoaded);
+    const pageContextExports = (0, getPageFiles_js_1.getPageConfigUserFriendly)(pageFilesServerSide, pageConfigLoaded);
     return {
         pageContextExports,
         pageFilesLoaded: pageFilesServerSide

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

@@ -7,10 +7,8 @@ exports.renderPageAlreadyRouted = renderPageAlreadyRouted;
 exports.prerenderPage = prerenderPage;
 exports.prerender404Page = prerender404Page;
 exports.getPageContextInitEnhanced = getPageContextInitEnhanced;
-exports.getRenderContext = getRenderContext;
 const error_page_js_1 = require("../../../shared/error-page.js");
 const renderHtml_js_1 = require("../html/renderHtml.js");
-const getPageFiles_js_1 = require("../../../shared/getPageFiles.js");
 const utils_js_1 = require("../utils.js");
 const serializePageContextClientSide_js_1 = require("../html/serializePageContextClientSide.js");
 const getPageContextUrlComputed_js_1 = require("../../../shared/getPageContextUrlComputed.js");
@@ -23,10 +21,8 @@ const loggerRuntime_js_1 = require("./loggerRuntime.js");
 const isNewError_js_1 = require("./isNewError.js");
 const preparePageContextForUserConsumptionServerSide_js_1 = require("./preparePageContextForUserConsumptionServerSide.js");
 const executeGuardHook_js_1 = require("../../../shared/route/executeGuardHook.js");
-const loadPageRoutes_js_1 = require("../../../shared/route/loadPageRoutes.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const isServerSideError_js_1 = require("../../../shared/misc/isServerSideError.js");
-const assertV1Design_js_1 = require("../../shared/assertV1Design.js");
 async function renderPageAlreadyRouted(pageContext) {
     // pageContext.pageId can either be the:
     //  - ID of the page matching the routing, or the
@@ -89,8 +85,9 @@ async function prerenderPage(pageContext) {
         return { documentHtml, pageContextSerialized, pageContext };
     }
 }
-async function prerender404Page(renderContext, pageContextInit_) {
-    const errorPageId = (0, error_page_js_1.getErrorPageId)(renderContext.pageFilesAll, renderContext.pageConfigs);
+async function prerender404Page(pageContextInit_) {
+    const globalContext = (0, globalContext_js_1.getGlobalContext)();
+    const errorPageId = (0, error_page_js_1.getErrorPageId)(globalContext.pageFilesAll, globalContext.pageConfigs);
     if (!errorPageId) {
         return null;
     }
@@ -109,13 +106,13 @@ async function prerender404Page(renderContext, pageContextInit_) {
     };
     (0, utils_js_1.objectAssign)(pageContextInit, pageContextInit_);
     {
-        const pageContextInitEnhanced = getPageContextInitEnhanced(pageContextInit, renderContext);
+        const pageContextInitEnhanced = getPageContextInitEnhanced(pageContextInit);
         (0, utils_js_1.objectAssign)(pageContext, pageContextInitEnhanced);
     }
     (0, utils_js_1.objectAssign)(pageContext, await (0, loadUserFilesServerSide_js_1.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
@@ -131,12 +128,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,
@@ -164,22 +161,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 = (0, globalContext_js_1.getGlobalContext)();
-    const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal } = await (0, getPageFiles_js_1.getPageFilesAll)(false, globalContext.isProduction);
-    const { pageRoutes, onBeforeRouteHook } = await (0, loadPageRoutes_js_1.loadPageRoutes)(pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds);
-    (0, assertV1Design_js_1.assertV1Design)(
-    // pageConfigs is PageConfigRuntime[] but assertV1Design() requires PageConfigBuildTime[]
-    pageConfigs.length > 0, pageFilesAll);
-    const renderContext = {
-        pageFilesAll: pageFilesAll,
-        pageConfigs,
-        pageConfigGlobal,
-        allPageIds: allPageIds,
-        pageRoutes,
-        onBeforeRouteHook
-    };
-    return renderContext;
-}

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

@@ -13,7 +13,8 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 (0, assertIsNotBrowser_js_1.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)
@@ -44,3 +45,10 @@ function assertParams(urlSource, urlTarget) {
         }
     });
 }
+function merge(objs) {
+    const obj = {};
+    objs.forEach((e) => {
+        Object.assign(obj, e);
+    });
+    return obj;
+}