vike 0.4.220-commit-af5c91f → 0.4.221-commit-8577456

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/{debug.js → virtual-files/debug.js}

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.debug = void 0;
-const utils_js_1 = require("../../../utils.js");
+const utils_js_1 = require("../../../../utils.js");
 exports.debug = (0, utils_js_1.createDebugger)('vike:virtual-files');

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/{getVirtualFilePageConfigValuesAll.js → virtual-files/getVirtualFilePageConfigValuesAll.js}

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getVirtualFilePageConfigValuesAll = getVirtualFilePageConfigValuesAll;
-const utils_js_1 = require("../../../utils.js");
-const virtualFilePageConfigValuesAll_js_1 = require("../../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
-const getVikeConfig_js_1 = require("./getVikeConfig.js");
-const extractAssetsQuery_js_1 = require("../../../../shared/extractAssetsQuery.js");
+const utils_js_1 = require("../../../../utils.js");
+const virtualFilePageConfigValuesAll_js_1 = require("../../../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
+const getVikeConfig_js_1 = require("../getVikeConfig.js");
+const extractAssetsQuery_js_1 = require("../../../../../shared/extractAssetsQuery.js");
 const debug_js_1 = require("./debug.js");
 const isRuntimeEnvMatch_js_1 = require("./isRuntimeEnvMatch.js");
-const serializeConfigValues_js_1 = require("../../../../../shared/page-configs/serialize/serializeConfigValues.js");
-const fixServerAssets_js_1 = require("../../buildConfig/fixServerAssets.js");
-const getConfigValueBuildTime_js_1 = require("../../../../../shared/page-configs/getConfigValueBuildTime.js");
+const serializeConfigValues_js_1 = require("../../../../../../shared/page-configs/serialize/serializeConfigValues.js");
+const fixServerAssets_js_1 = require("../../../buildConfig/fixServerAssets.js");
+const getConfigValueBuildTime_js_1 = require("../../../../../../shared/page-configs/getConfigValueBuildTime.js");
 async function getVirtualFilePageConfigValuesAll(id, isDev, config) {
     const result = (0, virtualFilePageConfigValuesAll_js_1.isVirtualFileIdPageConfigValuesAll)(id);
     (0, utils_js_1.assert)(result);

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/{getVirtualFilePageConfigs.js → virtual-files/getVirtualFilePageConfigs.js}

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getVirtualFilePageConfigs = getVirtualFilePageConfigs;
-const virtualFilePageConfigValuesAll_js_1 = require("../../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
+const virtualFilePageConfigValuesAll_js_1 = require("../../../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
 const debug_js_1 = require("./debug.js");
-const getVikeConfig_js_1 = require("./getVikeConfig.js");
+const getVikeConfig_js_1 = require("../getVikeConfig.js");
 const isRuntimeEnvMatch_js_1 = require("./isRuntimeEnvMatch.js");
-const serializeConfigValues_js_1 = require("../../../../../shared/page-configs/serialize/serializeConfigValues.js");
+const serializeConfigValues_js_1 = require("../../../../../../shared/page-configs/serialize/serializeConfigValues.js");
 async function getVirtualFilePageConfigs(isForClientSide, isDev, id, isClientRouting, config) {
     const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config, { doNotRestartViteOnError: true });
     const { pageConfigs, pageConfigGlobal } = vikeConfig;

package/dist/cjs/node/plugin/plugins/setGlobalContext.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setGlobalContext = setGlobalContext;
 const globalContext_js_1 = require("../../runtime/globalContext.js");
 const utils_js_1 = require("../utils.js");
-const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
 const getOutDirs_js_1 = require("../shared/getOutDirs.js");
 function setGlobalContext() {
     return [
@@ -24,7 +23,7 @@ function setGlobalContext() {
                 order: 'pre',
                 handler(_, env) {
                     const isViteDev = (0, utils_js_1.isDevCheck)(env);
-                    (0, globalContext_js_1.setGlobalContext_isViteDev)(isViteDev);
+                    (0, globalContext_js_1.setGlobalContext_isProduction)(!isViteDev);
                     (0, utils_js_1.markSetup_isViteDev)(isViteDev);
                 }
             }
@@ -38,8 +37,6 @@ function setGlobalContext() {
                     const { outDirRoot } = (0, getOutDirs_js_1.getOutDirs)(config);
                     (0, utils_js_1.assertFilePathAbsoluteFilesystem)(outDirRoot); // Needed for `importServerProductionEntry({ outDir })` of @brillout/vite-plugin-server-entry
                     (0, globalContext_js_1.setGlobalContext_viteConfig)(config, outDirRoot);
-                    const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);
-                    (0, globalContext_js_1.setGlobalContext_vikeConfig)(vikeConfig);
                 }
             }
         }

package/dist/cjs/node/plugin/shared/getFullBuildInlineConfig.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFullBuildInlineConfig = getFullBuildInlineConfig;
+const isViteCliCall_js_1 = require("./isViteCliCall.js");
+function getFullBuildInlineConfig(config) {
+    const configFromCli = !(0, isViteCliCall_js_1.isViteCliCall)() ? null : (0, isViteCliCall_js_1.getViteConfigFromCli)();
+    if (config._viteConfigEnhanced) {
+        return config._viteConfigEnhanced;
+    }
+    else {
+        return {
+            ...configFromCli,
+            configFile: configFromCli?.configFile || config.configFile,
+            root: config.root,
+            build: {
+                ...configFromCli?.build
+            }
+        };
+    }
+}

package/dist/cjs/node/plugin/shared/getOutDirs.js

@@ -11,49 +11,34 @@ const viteIsSSR_js_1 = require("./viteIsSSR.js");
 const debug = (0, utils_js_1.createDebugger)('vike:outDir');
 function getOutDirs(config) {
     debug('getOutDirs()', new Error().stack);
-    let outDirRoot;
-    {
-        const outDir = getOutDirFromViteResolvedConfig(config);
-        if (isOutDirRoot(outDir)) {
-            outDirRoot = outDir;
-        }
-        else {
-            assertOutDirResolved(outDir, config);
-            (0, utils_js_1.assert)(outDir.endsWith('/server') || outDir.endsWith('/client'));
-            (0, utils_js_1.assert)('/client'.length === '/server'.length);
-            outDirRoot = outDir.slice(0, -1 * '/client'.length);
-        }
-    }
-    const outDirs = getOutDirsAll(outDirRoot, config.root);
-    debug('outDirRoot', outDirRoot);
-    debug('outDirs', outDirs);
+    const outDir = getOutDirFromViteResolvedConfig(config);
+    if (!isOutDirRoot(outDir))
+        assertOutDirResolved(outDir, config);
+    const outDirs = getOutDirsAll(outDir, config.root);
     return outDirs;
 }
 /** Appends `client/` or `server/` to `config.build.outDir` */
-function resolveOutDir(config) {
+function resolveOutDir(config, isSSR) {
     debug('resolveOutDir()', new Error().stack);
+    const isServerSide = (0, viteIsSSR_js_1.viteIsSSR)(config) || isSSR;
+    debug('isServerSide', isServerSide);
     const outDir = getOutDirFromViteUserConfig(config) || 'dist';
-    debug('outDir', 'outDir');
-    // outDir may already be resolved when using Telefunc + vike (because both Telefunc and vike use this logic)
-    if (!isOutDirRoot(outDir)) {
-        assertOutDirResolved(outDir, config);
-        return outDir;
+    debug('outDir', outDir);
+    /* outDir may already be resolved when using Telefunc + Vike (because both Telefunc and Vike use this logic)
+    assert(isOutDirRoot(outDir))
+    */
+    const { outDirClient, outDirServer } = getOutDirsAll(outDir);
+    if (isServerSide) {
+        debug('outDirServer', 'outDirServer');
+        return outDirServer;
     }
     else {
-        const { outDirClient, outDirServer } = determineOutDirs(outDir);
-        if ((0, viteIsSSR_js_1.viteIsSSR)(config)) {
-            debug('outDirServer', 'outDirServer');
-            return outDirServer;
-        }
-        else {
-            debug('outDirClient', 'outDirClient');
-            return outDirClient;
-        }
+        debug('outDirClient', 'outDirClient');
+        return outDirClient;
     }
 }
 function determineOutDirs(outDirRoot) {
     (0, utils_js_1.assertPosixPath)(outDirRoot);
-    (0, utils_js_1.assert)(!outDirRoot.endsWith('/'));
     (0, utils_js_1.assert)(isOutDirRoot(outDirRoot));
     const outDirClient = (0, utils_js_1.pathJoin)(outDirRoot, 'client');
     const outDirServer = (0, utils_js_1.pathJoin)(outDirRoot, 'server');
@@ -61,8 +46,35 @@ function determineOutDirs(outDirRoot) {
     assertIsNotOutDirRoot(outDirServer);
     return { outDirClient, outDirServer };
 }
-function getOutDirsAll(outDirRoot, root) {
-    if (!outDirIsAbsolutePath(outDirRoot)) {
+function getOutDirsAll(outDir, root) {
+    let outDirRoot;
+    {
+        if (isOutDirRoot(outDir)) {
+            outDirRoot = outDir;
+        }
+        else {
+            (0, utils_js_1.assert)(outDir.endsWith('/server') || outDir.endsWith('/client'));
+            (0, utils_js_1.assert)('/client'.length === '/server'.length);
+            outDirRoot = outDir.slice(0, -1 * '/client'.length);
+        }
+    }
+    debug('outDirRoot', outDirRoot);
+    let outDirs;
+    if (root) {
+        outDirs = getOutDirsAllFromRootNormalized(outDirRoot, root);
+    }
+    else {
+        outDirs = getOutDirsAllFromRoot(outDirRoot);
+    }
+    debug('outDirs', outDirs);
+    return outDirs;
+}
+function getOutDirsAllFromRoot(outDirRoot) {
+    let { outDirClient, outDirServer } = determineOutDirs(outDirRoot);
+    return { outDirRoot, outDirClient, outDirServer };
+}
+function getOutDirsAllFromRootNormalized(outDirRoot, root) {
+    if (root && !outDirIsAbsolutePath(outDirRoot)) {
         (0, utils_js_1.assertPosixPath)(outDirRoot);
         (0, utils_js_1.assertPosixPath)(root);
         outDirRoot = (0, utils_js_1.pathJoin)(root, outDirRoot);
@@ -90,7 +102,7 @@ function isOutDirRoot(outDirRot) {
 function assertIsNotOutDirRoot(outDir) {
     (0, utils_js_1.assert)(outDir.endsWith('/client') || outDir.endsWith('/server'));
 }
-/** `outDir` ends with `/server` or `/client` */
+/** Assert that `outDir` ends with `/server` or `/client` */
 function assertOutDirResolved(outDir, config) {
     (0, utils_js_1.assertPosixPath)(outDir);
     assertIsNotOutDirRoot(outDir);
@@ -108,16 +120,16 @@ function getOutDirFromViteUserConfig(config) {
     let outDir = config.build?.outDir;
     if (outDir === undefined)
         return undefined;
-    outDir = normalize(outDir);
+    outDir = normalizeOutDir(outDir);
     return outDir;
 }
 function getOutDirFromViteResolvedConfig(config) {
     let outDir = config.build.outDir;
     (0, utils_js_1.assert)(outDir);
-    outDir = normalize(outDir);
+    outDir = normalizeOutDir(outDir);
     return outDir;
 }
-function normalize(outDir) {
+function normalizeOutDir(outDir) {
     outDir = (0, utils_js_1.toPosixPath)(outDir);
     outDir = outDir.replace(/\/+$/, ''); // remove trailing slashes
     return outDir;

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

@@ -66,6 +66,8 @@ const prepareViteApiCall_js_1 = require("../api/prepareViteApiCall.js");
 const context_js_1 = require("./context.js");
 const resolvePrerenderConfig_js_1 = require("./resolvePrerenderConfig.js");
 const getOutDirs_js_1 = require("../plugin/shared/getOutDirs.js");
+const context_js_2 = require("../cli/context.js");
+const isViteCliCall_js_1 = require("../plugin/shared/isViteCliCall.js");
 async function runPrerenderFromAPI(options = {}) {
     return await runPrerender(options, 'prerender()');
     // - We purposely propagate the error to the user land, so that the error interrupts the user land. It's also, I guess, a nice-to-have that the user has control over the error.
@@ -83,8 +85,9 @@ async function runPrerenderFromCLIPrerenderCommand() {
         process.exit(1);
     }
     runPrerender_forceExit();
+    (0, utils_js_1.assert)(false);
 }
-async function runPrerenderFromAutoRun(viteConfig) {
+async function runPrerenderFromAutoRun(viteConfig, config) {
     let prerenderContextPublic;
     try {
         const ret = await runPrerender({ viteConfig });
@@ -95,7 +98,9 @@ async function runPrerenderFromAutoRun(viteConfig) {
         (0, logErrorHint_js_1.logErrorHint)(err);
         process.exit(1);
     }
-    return { prerenderContextPublic };
+    config.vike.prerenderContext = prerenderContextPublic;
+    const forceExit = (0, context_js_2.isVikeCli)() || (0, isViteCliCall_js_1.isViteCliCall)();
+    return { forceExit };
 }
 async function runPrerender(options = {}, standaloneTrigger) {
     (0, context_js_1.setContextIsPrerendering)();
@@ -123,7 +128,7 @@ async function runPrerender(options = {}, standaloneTrigger) {
     const { partial = false, noExtraDir = false, parallel = true } = prerenderConfig || {};
     const concurrencyLimit = (0, utils_js_1.pLimit)(parallel === false || parallel === 0 ? 1 : parallel === true || parallel === undefined ? (0, os_1.cpus)().length : parallel);
     await (0, globalContext_js_1.initGlobalContext_runPrerender)();
-    const globalContext = (0, globalContext_js_1.getGlobalContext)();
+    const globalContext = await (0, globalContext_js_1.getGlobalContextInternal)();
     globalContext.pageFilesAll.forEach(assertExportNames);
     const prerenderContext = {
         noExtraDir: noExtraDir ?? false,
@@ -133,10 +138,10 @@ async function runPrerender(options = {}, standaloneTrigger) {
         output: []
     };
     const doNotPrerenderList = [];
-    await collectDoNoPrerenderList(vikeConfig.pageConfigs, doNotPrerenderList, concurrencyLimit);
-    await callOnBeforePrerenderStartHooks(prerenderContext, concurrencyLimit, doNotPrerenderList);
-    await handlePagesWithStaticRoutes(prerenderContext, doNotPrerenderList, concurrencyLimit);
-    await callOnPrerenderStartHook(prerenderContext);
+    await collectDoNoPrerenderList(vikeConfig.pageConfigs, doNotPrerenderList, concurrencyLimit, globalContext);
+    await callOnBeforePrerenderStartHooks(prerenderContext, globalContext, concurrencyLimit, doNotPrerenderList);
+    await handlePagesWithStaticRoutes(prerenderContext, globalContext, doNotPrerenderList, concurrencyLimit);
+    await callOnPrerenderStartHook(prerenderContext, globalContext);
     let prerenderedCount = 0;
     // Write files as soon as pages finish rendering (instead of writing all files at once only after all pages have rendered).
     const onComplete = async (htmlFile) => {
@@ -146,17 +151,17 @@ async function runPrerender(options = {}, standaloneTrigger) {
         }
         await writeFiles(htmlFile, root, outDirClient, options.onPagePrerender, prerenderContext.output, logLevel);
     };
-    await routeAndPrerender(prerenderContext, concurrencyLimit, onComplete);
+    await routeAndPrerender(prerenderContext, globalContext, concurrencyLimit, onComplete);
     warnContradictoryNoPrerenderList(prerenderContext.prerenderedPageContexts, doNotPrerenderList);
-    await prerender404(prerenderContext, onComplete);
+    await prerender404(prerenderContext, globalContext, onComplete);
     if (logLevel === 'info') {
         console.log(`${picocolors_1.default.green(`✓`)} ${prerenderedCount} HTML documents pre-rendered.`);
     }
-    warnMissingPages(prerenderContext.prerenderedPageContexts, doNotPrerenderList, partial);
+    await warnMissingPages(prerenderContext.prerenderedPageContexts, globalContext, doNotPrerenderList, partial);
     const prerenderContextPublic = makePublic(prerenderContext);
     return { viteConfig, prerenderContextPublic };
 }
-async function collectDoNoPrerenderList(pageConfigs, doNotPrerenderList, concurrencyLimit) {
+async function collectDoNoPrerenderList(pageConfigs, doNotPrerenderList, concurrencyLimit, globalContext) {
     // V1 design
     pageConfigs.forEach((pageConfig) => {
         const configValue = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfigLocal)(pageConfig);
@@ -174,7 +179,6 @@ async function collectDoNoPrerenderList(pageConfigs, doNotPrerenderList, concurr
     });
     // Old design
     // TODO/v1-release: remove
-    const globalContext = (0, globalContext_js_1.getGlobalContext)();
     await Promise.all(globalContext.pageFilesAll
         .filter((p) => {
         assertExportNames(p);
@@ -217,9 +221,8 @@ function assertExportNames(pageFile) {
     const { exportNames, fileType } = pageFile;
     (0, utils_js_1.assert)(exportNames || fileType === '.page.route' || fileType === '.css', pageFile.filePath);
 }
-async function callOnBeforePrerenderStartHooks(prerenderContext, concurrencyLimit, doNotPrerenderList) {
+async function callOnBeforePrerenderStartHooks(prerenderContext, globalContext, concurrencyLimit, doNotPrerenderList) {
     const onBeforePrerenderStartHooks = [];
-    const globalContext = (0, globalContext_js_1.getGlobalContext)();
     // V1 design
     await Promise.all(globalContext.pageConfigs.map((pageConfig) => concurrencyLimit(async () => {
         const hookName = 'onBeforePrerenderStart';
@@ -267,7 +270,7 @@ async function callOnBeforePrerenderStartHooks(prerenderContext, concurrencyLimi
         }
         const prerenderResult = await (0, executeHook_js_1.executeHook)(() => hookFn(), { hookName, hookFilePath, hookTimeout }, null);
         const result = normalizeOnPrerenderHookResult(prerenderResult, hookFilePath, hookName);
-        result.forEach(({ url, pageContext }) => {
+        await Promise.all(result.map(async ({ url, pageContext }) => {
             {
                 const pageContextFound = prerenderContext.pageContexts.find((pageContext) => isSameUrl(pageContext.urlOriginal, url));
                 if (pageContextFound) {
@@ -278,7 +281,7 @@ async function callOnBeforePrerenderStartHooks(prerenderContext, concurrencyLimi
                     (0, utils_js_1.assertUsage)(false, `URL ${picocolors_1.default.cyan(url)} provided ${providedTwice}. Make sure to provide the URL only once instead.`);
                 }
             }
-            const pageContextNew = createPageContext(url, prerenderContext);
+            const pageContextNew = await createPageContext(url, prerenderContext, globalContext);
             (0, utils_js_1.objectAssign)(pageContextNew, {
                 _providedByHook: {
                     hookFilePath,
@@ -292,12 +295,11 @@ async function callOnBeforePrerenderStartHooks(prerenderContext, concurrencyLimi
                 });
                 (0, utils_js_1.objectAssign)(pageContextNew, pageContext);
             }
-        });
+        }));
     })));
 }
-async function handlePagesWithStaticRoutes(prerenderContext, doNotPrerenderList, concurrencyLimit) {
+async function handlePagesWithStaticRoutes(prerenderContext, globalContext, doNotPrerenderList, concurrencyLimit) {
     // Pre-render pages with a static route
-    const globalContext = (0, globalContext_js_1.getGlobalContext)();
     await Promise.all(globalContext.pageRoutes.map((pageRoute) => concurrencyLimit(async () => {
         const { pageId } = pageRoute;
         if (doNotPrerenderList.find((p) => p.pageId === pageId)) {
@@ -323,7 +325,7 @@ async function handlePagesWithStaticRoutes(prerenderContext, doNotPrerenderList,
             return;
         }
         const routeParams = {};
-        const pageContext = createPageContext(urlOriginal, prerenderContext);
+        const pageContext = await createPageContext(urlOriginal, prerenderContext, globalContext);
         (0, utils_js_1.objectAssign)(pageContext, {
             _providedByHook: null,
             routeParams,
@@ -341,7 +343,7 @@ async function handlePagesWithStaticRoutes(prerenderContext, doNotPrerenderList,
         prerenderContext.pageContexts.push(pageContext);
     })));
 }
-function createPageContext(urlOriginal, prerenderContext) {
+async function createPageContext(urlOriginal, prerenderContext, globalContext) {
     const pageContext = {
         _urlHandler: null,
         _urlRewrite: null,
@@ -353,13 +355,12 @@ function createPageContext(urlOriginal, prerenderContext) {
     };
     (0, utils_js_1.objectAssign)(pageContextInit, prerenderContext.pageContextInit);
     {
-        const pageContextInitEnhanced = (0, renderPageAlreadyRouted_js_1.getPageContextInitEnhanced)(pageContextInit);
+        const pageContextInitEnhanced = await (0, renderPageAlreadyRouted_js_1.getPageContextInitEnhanced)(pageContextInit, globalContext);
         (0, utils_js_1.objectAssign)(pageContext, pageContextInitEnhanced);
     }
     return pageContext;
 }
-async function callOnPrerenderStartHook(prerenderContext) {
-    const globalContext = (0, globalContext_js_1.getGlobalContext)();
+async function callOnPrerenderStartHook(prerenderContext, globalContext) {
     let onPrerenderStartHook;
     // V1 design
     if (globalContext.pageConfigs.length > 0) {
@@ -486,8 +487,7 @@ async function callOnPrerenderStartHook(prerenderContext) {
     });
     addPageContextComputedUrl(prerenderContext.pageContexts);
 }
-async function routeAndPrerender(prerenderContext, concurrencyLimit, onComplete) {
-    const globalContext = (0, globalContext_js_1.getGlobalContext)();
+async function routeAndPrerender(prerenderContext, globalContext, concurrencyLimit, onComplete) {
     (0, utils_js_1.assert)(globalContext.isPrerendering);
     // Route all URLs
     await Promise.all(prerenderContext.pageContexts.map((pageContext) => concurrencyLimit(async () => {
@@ -569,8 +569,7 @@ function warnContradictoryNoPrerenderList(prerenderedPageContexts, doNotPrerende
         (0, utils_js_1.assertWarning)(false, `The ${providedByHook.hookName}() hook defined by ${providedByHook.hookFilePath} returns the URL ${picocolors_1.default.cyan(urlOriginal)}, while ${setByConfigFile} sets the config ${picocolors_1.default.cyan(setByConfigName)} to ${picocolors_1.default.cyan(String(setByConfigValue))}. This is contradictory: either don't set the config ${picocolors_1.default.cyan(setByConfigName)} to ${picocolors_1.default.cyan(String(setByConfigValue))} or remove the URL ${picocolors_1.default.cyan(urlOriginal)} from the list of URLs to be pre-rendered.`, { onlyOnce: true });
     });
 }
-function warnMissingPages(prerenderedPageContexts, doNotPrerenderList, partial) {
-    const globalContext = (0, globalContext_js_1.getGlobalContext)();
+async function warnMissingPages(prerenderedPageContexts, globalContext, doNotPrerenderList, partial) {
     const isV1 = globalContext.pageConfigs.length > 0;
     const hookName = isV1 ? 'onBeforePrerenderStart' : 'prerender';
     /* TODO/after-v1-design-release: document setting `prerender: false` as an alternative to using prerender.partial (both in the warnings and the docs)
@@ -586,11 +585,11 @@ function warnMissingPages(prerenderedPageContexts, doNotPrerenderList, partial)
         (0, utils_js_1.assertWarning)(partial, `Cannot pre-render page ${pageAt} because it has a non-static route, while no ${hookName}() hook returned any URL matching the page's route. You need to use a ${hookName}() hook (https://vike.dev/${hookName}) providing a list of URLs for ${pageAt} that should be pre-rendered. If you don't want to pre-render ${pageAt} then use the option prerender.partial (https://vike.dev/prerender#partial) to suppress this warning.`, { onlyOnce: true });
     });
 }
-async function prerender404(prerenderContext, onComplete) {
+async function prerender404(prerenderContext, globalContext, onComplete) {
     if (!Object.values(prerenderContext.prerenderedPageContexts).find(({ urlOriginal }) => urlOriginal === '/404')) {
         let result;
         try {
-            result = await (0, renderPageAlreadyRouted_js_1.prerender404Page)(prerenderContext.pageContextInit);
+            result = await (0, renderPageAlreadyRouted_js_1.prerender404Page)(prerenderContext.pageContextInit, globalContext);
         }
         catch (err) {
             assertIsNotAbort(err, 'the 404 page');