vike 0.4.222 → 0.4.223

package/dist/cjs/client/shared/getPageContextProxyForUser.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPageContextProxyForUser = getPageContextProxyForUser;
 const utils_js_1 = require("../server-routing-runtime/utils.js");
 const notSerializable_js_1 = require("../../shared/notSerializable.js");
-const globalObject = (0, utils_js_1.getGlobalObject)('getPageContextProxyForUser.ts', {});
+const globalObject = (0, utils_js_1.getGlobalObject)('shared/getPageContextProxyForUser.ts', {});
 /**
  * Throw error when pageContext value isn't:
  * - serializable, or

package/dist/cjs/node/api/prepareViteApiCall.js

@@ -48,7 +48,7 @@ const path_1 = __importDefault(require("path"));
 const utils_js_1 = require("./utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const globalContext_js_1 = require("../runtime/globalContext.js");
-const globalObject = (0, utils_js_1.getGlobalObject)('prepareViteApiCall.ts', {});
+const globalObject = (0, utils_js_1.getGlobalObject)('api/prepareViteApiCall.ts', {});
 async function prepareViteApiCall(viteConfigFromOptions, operation) {
     clear();
     (0, context_js_1.setContextApiOperation)(operation);

package/dist/cjs/node/plugin/index.js

@@ -35,7 +35,7 @@ const workaroundVite6HmrRegression_js_1 = require("./plugins/workaroundVite6HmrR
 const buildApp_js_1 = require("./plugins/buildApp.js");
 // We don't call this in ./onLoad.ts to avoid a cyclic dependency with utils.ts
 (0, getPageAssets_js_1.setResolveClientEntriesDev)(resolveClientEntriesDev_js_1.resolveClientEntriesDev);
-// Return as `any` to avoid Plugin type mismatches when there are multiple Vite versions installed
+// Return `PluginInterop` instead of `Plugin` to avoid type mismatch upon different Vite versions
 function plugin(vikeVitePluginOptions = {}) {
     const plugins = [
         ...(0, commonConfig_js_1.commonConfig)(vikeVitePluginOptions),

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

@@ -29,7 +29,7 @@ function baseUrls() {
         },
         async configResolved(config) {
             const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);
-            const basesResolved2 = (0, resolveBase_js_1.resolveBaseFromResolvedConfig)(vikeConfig.global.config.baseServer ?? null, vikeConfig.global.config.baseAssets ?? null, config);
+            const basesResolved2 = resolveBaseFromResolvedConfig(vikeConfig.global.config.baseServer ?? null, vikeConfig.global.config.baseAssets ?? null, config);
             (0, utils_js_1.assert)(basesResolved2.baseServer === basesResolved.baseServer);
             (0, utils_js_1.assert)(basesResolved2.baseAssets === basesResolved.baseAssets);
             /* In dev, Vite seems buggy around setting vite.config.js#base to an absolute URL (e.g. http://localhost:8080/cdn/)
@@ -40,3 +40,8 @@ function baseUrls() {
         }
     };
 }
+function resolveBaseFromResolvedConfig(baseServer, baseAssets, config) {
+    let baseViteOriginal = config._baseViteOriginal;
+    (0, utils_js_1.assert)(baseViteOriginal === null || typeof baseViteOriginal == 'string');
+    return (0, resolveBase_js_1.resolveBase)(baseViteOriginal, baseServer, baseAssets);
+}

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

@@ -9,6 +9,9 @@ const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js"
 const getFullBuildInlineConfig_js_1 = require("../shared/getFullBuildInlineConfig.js");
 function buildApp() {
     let config;
+    // `builder.buildApp` can be overriden by another plugin e.g vike-vercel https://github.com/vikejs/vike/pull/2184#issuecomment-2659425195
+    // In that case, we should'nt `forceExit`.
+    let forceExit = false;
     return [
         {
             name: 'vike:buildApp',
@@ -23,6 +26,10 @@ function buildApp() {
                             (0, utils_js_1.assert)(builder.environments.ssr);
                             await builder.build(builder.environments.client);
                             await builder.build(builder.environments.ssr);
+                            if (forceExit) {
+                                (0, runPrerender_js_1.runPrerender_forceExit)();
+                                (0, utils_js_1.assert)(false);
+                            }
                         }
                     },
                     environments: {
@@ -61,11 +68,8 @@ function buildApp() {
                 if (!(0, context_js_1.isPrerenderAutoRunEnabled)(vikeConfig))
                     return;
                 const configInline = (0, getFullBuildInlineConfig_js_1.getFullBuildInlineConfig)(config);
-                const { forceExit } = await (0, runPrerender_js_1.runPrerenderFromAutoRun)(configInline, config);
-                if (forceExit) {
-                    (0, runPrerender_js_1.runPrerender_forceExit)();
-                    (0, utils_js_1.assert)(false);
-                }
+                const res = await (0, runPrerender_js_1.runPrerenderFromAutoRun)(configInline, config);
+                forceExit = res.forceExit;
             }
         }
     ];

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

@@ -86,6 +86,9 @@ function buildConfig() {
         {
             name: 'vike:buildConfig:pre',
             apply: 'build',
+            applyToEnvironment(env) {
+                return env.name === 'ssr';
+            },
             // Make sure other writeBundle() hooks are called after this writeBundle() hook.
             //  - set_ASSETS_MANIFEST() needs to be called before dist/server/ code is executed.
             //    - For example, the writeBundle() hook of vite-plugin-vercel needs to be called after this writeBundle() hook, otherwise: https://github.com/vikejs/vike/issues/1527

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

@@ -6,6 +6,7 @@ const utils_js_1 = require("../utils.js");
 const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 const getFilePath_js_1 = require("../shared/getFilePath.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
+const viteIsSSR_js_1 = require("../shared/viteIsSSR.js");
 // TODO/enventually: (after we implemented vike.config.js)
 // - Make import.meta.env work inside +config.js
 //   - For it to work, we'll probably need the user to define the settings (e.g. `envDir`) for loadEnv() inside vike.config.js instead of vite.config.js
@@ -38,7 +39,7 @@ function envVarsPlugin() {
             if (!code.includes('import.meta.env.'))
                 return;
             const isBuild = config.command === 'build';
-            const isClientSide = getIsClientSide(config, options);
+            const isClientSide = !(0, viteIsSSR_js_1.viteIsSSR_safe)(config, options);
             Object.entries(envsAll)
                 .filter(([key]) => {
                 // Already handled by Vite
@@ -84,20 +85,3 @@ function envVarsPlugin() {
 function applyEnvVar(envStatementRegEx, envVal, code) {
     return code.replace(envStatementRegEx, JSON.stringify(envVal));
 }
-function getIsClientSide(config, options) {
-    const isBuild = config.command === 'build';
-    if (isBuild) {
-        (0, utils_js_1.assert)(typeof config.build.ssr === 'boolean');
-        const isServerSide = config.build.ssr;
-        if (options !== undefined) {
-            (0, utils_js_1.assert)(options.ssr === isServerSide);
-        }
-        return !isServerSide;
-    }
-    else {
-        (0, utils_js_1.assert)(config.build.ssr === false);
-        (0, utils_js_1.assert)(typeof options?.ssr === 'boolean');
-        const isServerSide = options.ssr;
-        return !isServerSide;
-    }
-}

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

@@ -48,7 +48,7 @@ function extractAssetsPlugin() {
                 }
                 // TODO/now: add meta.default
                 (0, utils_js_1.assert)(vikeConfig.global.config.includeAssetsImportedByServer ?? true);
-                (0, utils_js_1.assert)(!(0, viteIsSSR_js_1.viteIsSSR_options)(options));
+                (0, utils_js_1.assert)(!(0, viteIsSSR_js_1.viteIsSSR_safe)(config, options));
                 const importStatements = await (0, parseEsModule_js_1.getImportStatements)(src);
                 const moduleNames = getImportedModules(importStatements);
                 const code = moduleNames.map((moduleName) => `import '${moduleName}';`).join('\n');
@@ -65,7 +65,7 @@ function extractAssetsPlugin() {
             //  - Vite's `vite:resolve` plugin; https://github.com/vitejs/vite/blob/d649daba7682791178b711d9a3e44a6b5d00990c/packages/vite/src/node/plugins/resolve.ts#L105
             enforce: 'pre',
             async resolveId(source, importer, options) {
-                if ((0, viteIsSSR_js_1.viteIsSSR_options)(options)) {
+                if ((0, viteIsSSR_js_1.viteIsSSR_safe)(config, options)) {
                     // When building for the server, there should never be a `?extractAssets` query
                     (0, utils_js_1.assert)(!extractAssetsRE.test(source));
                     (0, utils_js_1.assert)(importer === undefined || !extractAssetsRE.test(importer));

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

@@ -11,7 +11,7 @@ const viteIsSSR_js_1 = require("../shared/viteIsSSR.js");
 const extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
 exports.extractExportNamesRE = extractExportNamesRE;
 const debug = (0, utils_js_1.createDebugger)('vike:extractExportNames');
-const globalObject = (0, utils_js_1.getGlobalObject)('extractExportNamesPlugin.ts', {});
+const globalObject = (0, utils_js_1.getGlobalObject)('plugins/extractExportNamesPlugin.ts', {});
 function extractExportNamesPlugin() {
     let isDev = false;
     return {

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/crawlPlusFiles.js

@@ -16,7 +16,7 @@ const getEnvVarObject_js_1 = require("../../../../shared/getEnvVarObject.js");
 const execA = (0, util_1.promisify)(child_process_1.exec);
 const debug = (0, utils_js_1.createDebugger)('vike:crawl');
 (0, utils_js_1.assertIsNotProductionRuntime)();
-(0, utils_js_1.assertIsSingleModuleInstance)('crawlPlusFiles.ts');
+(0, utils_js_1.assertIsSingleModuleInstance)('getVikeConfig/crawlPlusFiles.ts');
 let gitIsNotUsable = false;
 async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem) {
     (0, utils_js_1.assertPosixPath)(userRootDir);

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js

@@ -13,7 +13,7 @@ exports.getConfigDefinitionOptional = getConfigDefinitionOptional;
 const utils_js_1 = require("../../../utils.js");
 const configDefinitionsBuiltIn_js_1 = require("./getVikeConfig/configDefinitionsBuiltIn.js");
 const filesystemRouting_js_1 = require("./getVikeConfig/filesystemRouting.js");
-const isConfigInvalid_js_1 = require("../../../../runtime/renderPage/isConfigInvalid.js");
+const isVikeConfigInvalid_js_1 = require("../../../../runtime/renderPage/isVikeConfigInvalid.js");
 const globalContext_js_1 = require("../../../../runtime/globalContext.js");
 const loggerNotProd_js_1 = require("../../../shared/loggerNotProd.js");
 const removeSuperfluousViteLog_js_1 = require("../../../shared/loggerVite/removeSuperfluousViteLog.js");
@@ -43,7 +43,7 @@ function reloadVikeConfig(config) {
     handleReloadSideEffects();
 }
 async function handleReloadSideEffects() {
-    wasConfigInvalid = !!isConfigInvalid_js_1.isConfigInvalid;
+    wasConfigInvalid = !!isVikeConfigInvalid_js_1.isVikeConfigInvalid;
     const vikeConfigPromisePrevious = vikeConfigPromise;
     try {
         await vikeConfigPromise;
@@ -58,7 +58,7 @@ async function handleReloadSideEffects() {
         // Let the next handleReloadSideEffects() call handle side effects
         return;
     }
-    if (!isConfigInvalid_js_1.isConfigInvalid) {
+    if (!isVikeConfigInvalid_js_1.isVikeConfigInvalid) {
         if (wasConfigInvalid) {
             wasConfigInvalid = false;
             (0, loggerNotProd_js_1.logConfigErrorRecover)();
@@ -111,13 +111,13 @@ async function loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePlug
     if (!hasError) {
         (0, utils_js_1.assert)(ret);
         (0, utils_js_1.assert)(err === undefined);
-        (0, isConfigInvalid_js_1.isConfigInvalid_set)(false);
+        (0, isVikeConfigInvalid_js_1.isVikeConfigInvalid_set)(false);
         return ret;
     }
     else {
         (0, utils_js_1.assert)(ret === undefined);
         (0, utils_js_1.assert)(err);
-        (0, isConfigInvalid_js_1.isConfigInvalid_set)({ err });
+        (0, isVikeConfigInvalid_js_1.isVikeConfigInvalid_set)({ err });
         if (!isDev) {
             (0, utils_js_1.assert)((0, globalContext_js_1.getViteDevServer)() === null);
             throw err;
@@ -133,7 +133,7 @@ async function loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePlug
                     configDefinitions: {},
                     configValueSources: {}
                 },
-                global: (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyNew)({ configValues: {} }),
+                global: (0, getPageConfigUserFriendly_js_1.getPageConfigGlobalUserFriendly)({ pageConfigGlobalValues: {} }),
                 pages: {}
             };
             return dummyData;
@@ -149,18 +149,12 @@ async function loadVikeConfig(userRootDir, vikeVitePluginOptions) {
     // interop vike(options) in vite.config.js
     temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, userRootDir);
     // global
-    const configValuesGlobal = getConfigValues(pageConfigGlobal);
-    const global = (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyNew)({ configValues: configValuesGlobal });
-    // TODO/now DEDUPE
+    const pageConfigGlobalValues = getConfigValues(pageConfigGlobal);
+    const global = (0, getPageConfigUserFriendly_js_1.getPageConfigGlobalUserFriendly)({ pageConfigGlobalValues });
     // pages
     const pages = (0, utils_js_1.objectFromEntries)(pageConfigs.map((pageConfig) => {
-        const configValuesLocal = getConfigValues(pageConfig, true);
-        const configValues = { ...configValuesGlobal, ...configValuesLocal };
-        const page = {
-            ...(0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyNew)({ configValues }),
-            route: pageConfig.routeFilesystem?.routeString ?? null
-        };
-        return [pageConfig.pageId, page];
+        const pageConfigValues = getConfigValues(pageConfig, true);
+        return (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendly)(pageConfigGlobalValues, pageConfig, pageConfigValues);
     }));
     return { pageConfigs, pageConfigGlobal, global, pages };
 }
@@ -225,13 +219,12 @@ function getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRo
                 return;
             configValueSources[configName] = sources;
         });
-        const { routeFilesystem, isErrorPage } = determineRouteFilesystem(locationId, configValueSources);
+        const pageConfigRoute = determineRouteFilesystem(locationId, configValueSources);
         applyEffectsAll(configValueSources, configDefinitionsLocal);
         const configValuesComputed = getComputed(configValueSources, configDefinitionsLocal);
         const pageConfig = {
             pageId: locationId,
-            isErrorPage,
-            routeFilesystem,
+            ...pageConfigRoute,
             configDefinitions: configDefinitionsLocal,
             plusFiles: plusFilesRelevant,
             configValueSources,
@@ -430,20 +423,10 @@ function getPlusFilesOrdered(configName, plusFilesRelevant) {
             const plusFilesConfig = plusFilesForConfigName.filter((plusFile) => plusFile.isConfigFile &&
                 // We consider extensions (e.g. vike-react) later (i.e. with less priority)
                 !plusFile.isExtensionConfig);
-            // Make this value:
-            //   /pages/some-page/+{configName}.js > `export default`
-            // override that value:
-            //   /pages/some-page/+config.js > `export default { someConfig }`
-            const plusFileWinner = plusFilesValue[0] ?? plusFilesConfig[0];
-            if (plusFileWinner) {
-                const plusFilesOverriden = [...plusFilesValue, ...plusFilesConfig].filter((f) => f !== plusFileWinner);
-                // A user-land conflict of plusFiles with the same `locationId` (we are iterating over `plusFilesRelevant: PlusFilesByLocationId`) means that the user has superfluously defined the config twice; the user should remove such redundancy as it makes things unnecessarily ambiguous.
-                assertOverwrittenConfigFile(plusFileWinner, plusFilesOverriden, configName);
-                [plusFileWinner, ...plusFilesOverriden].forEach((plusFile) => {
-                    (0, utils_js_1.assert)(plusFile.filePath.filePathAbsoluteUserRootDir); // ensure it's a user-land plus file
-                    populate(plusFile);
-                });
-            }
+            [...plusFilesValue, ...plusFilesConfig].forEach((plusFile) => {
+                (0, utils_js_1.assert)(plusFile.filePath.filePathAbsoluteUserRootDir); // ensure it's a user-land plus file
+                populate(plusFile);
+            });
         }
         // ==========================
         // Side-effect configs (next)
@@ -595,14 +578,6 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir, isHi
     }
     (0, utils_js_1.assert)(false);
 }
-function assertOverwrittenConfigFile(plusFileWinner, plusFilesOverriden, configName) {
-    plusFilesOverriden.forEach((plusFileLoser) => {
-        const loserFilePath = plusFileLoser.filePath.filePathToShowToUser;
-        const winnerFilePath = plusFileWinner.filePath.filePathToShowToUser;
-        const confName = picocolors_1.default.cyan(configName);
-        (0, utils_js_1.assertWarning)(false, `The value of the config ${confName} defined at ${loserFilePath} is always overwritten by the value defined at ${winnerFilePath}, remove the superfluous value defined at ${loserFilePath}`, { onlyOnce: true });
-    });
-}
 function isDefiningPage(plusFiles) {
     for (const plusFile of plusFiles) {
         const configNames = getDefiningConfigNames(plusFile);

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

@@ -55,7 +55,7 @@ async function installHttpRequestAsyncStore() {
         return;
     }
     asyncLocalStorage = new mod.AsyncLocalStorage();
-    (0, renderPage_js_1.renderPage_addWrapper)(async (httpRequestId, renderPage) => {
+    (0, renderPage_js_1.renderPage_addAsyncHookwrapper)(async (httpRequestId, renderPage) => {
         (0, utils_js_1.assert)(asyncLocalStorage);
         const loggedErrors = new Set();
         const markErrorAsLogged = (err) => {

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

@@ -2,21 +2,30 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.viteIsSSR = viteIsSSR;
 exports.viteIsSSR_options = viteIsSSR_options;
+exports.viteIsSSR_safe = viteIsSSR_safe;
 const assert_js_1 = require("../../../utils/assert.js");
-const isObject_js_1 = require("../../../utils/isObject.js");
 function viteIsSSR(config) {
     return !!config?.build?.ssr;
 }
-// https://github.com/vitejs/vite/discussions/5109#discussioncomment-1450726
 function viteIsSSR_options(options) {
-    if (options === undefined) {
-        return false;
-    }
-    if (typeof options === 'boolean') {
-        return options;
+    return !!options?.ssr;
+}
+// Vite is quite messy about setting `ssr: boolean`, thus we use an extra safe implemention for security purposes.
+// It's used for .client.js and .server.js guarantee thus we use agressive assert() calls for added safety.
+function viteIsSSR_safe(config, options) {
+    if (config.command === 'build') {
+        (0, assert_js_1.assert)(typeof config.build.ssr === 'boolean');
+        const val = config.build.ssr;
+        if (options?.ssr !== undefined)
+            (0, assert_js_1.assert)(val === options.ssr);
+        return val;
     }
-    if ((0, isObject_js_1.isObject)(options)) {
-        return !!options.ssr;
+    else {
+        (0, assert_js_1.assert)(typeof options?.ssr === 'boolean');
+        const val = options.ssr;
+        /* This assert() fails (which is very unexpected).
+        if (typeof config.build.ssr === 'boolean') assert(val === config.build.ssr)
+        //*/
+        return val;
     }
-    (0, assert_js_1.assert)(false);
 }

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

@@ -21,7 +21,7 @@ exports.assertBuildInfo = assertBuildInfo;
 exports.getViteConfigRuntime = getViteConfigRuntime;
 exports.updateUserFiles = 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()
@@ -35,8 +35,9 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const loadPageRoutes_js_1 = require("../../shared/route/loadPageRoutes.js");
 const assertV1Design_js_1 = require("../shared/assertV1Design.js");
 const getPageConfigsRuntime_js_1 = require("../../shared/getPageConfigsRuntime.js");
+const resolveBase_js_1 = require("../shared/resolveBase.js");
 const debug = (0, utils_js_1.createDebugger)('vike:globalContext');
-const globalObject = (0, utils_js_1.getGlobalObject)('globalContext.ts', getInitialGlobalContext());
+const globalObject = (0, utils_js_1.getGlobalObject)('runtime/globalContext.ts', getInitialGlobalContext());
 async function getGlobalContextInternal() {
     // getGlobalContextInternal() should always be called after initGlobalContext()
     (0, utils_js_1.assert)(globalObject.isInitialized);
@@ -82,7 +83,9 @@ function makePublic(globalContext) {
         'assetsManifest',
         'config',
         'viteConfig',
-        'pages'
+        'pages',
+        'baseServer',
+        'baseAssets'
     ]);
     return globalContextPublic;
 }
@@ -124,7 +127,7 @@ function getViteConfig() {
 }
 async function initGlobalContext_renderPage() {
     debug('initGlobalContext_renderPage()');
-    // globalObject.isProduction isn't set upon production server without vike-server (there isn't any signal we can use)
+    // `globalObject.isProduction === undefined` when using production server without `vike-server`. (There isn't any reliable signal we can use to determine early whether the environement is production or development.)
     if (globalObject.isProduction === undefined)
         setIsProduction(true);
     await initGlobalContext();
@@ -187,7 +190,7 @@ function setIsProduction(isProduction) {
     globalObject.isProduction = isProduction;
 }
 function defineGlobalContext() {
-    const globalContext = assembleGlobalContext();
+    const globalContext = resolveGlobalContext();
     assertIsDefined(globalContext);
     const globalContext_public = makePublic(globalContext);
     (0, utils_js_1.objectAssign)(globalContext, { globalContext_public });
@@ -196,7 +199,7 @@ function defineGlobalContext() {
     assertGlobalContextIsDefined();
     (0, utils_js_1.onSetupRuntime)();
 }
-function assembleGlobalContext() {
+function resolveGlobalContext() {
     const { viteDevServer, viteConfig, isPrerendering, isProduction, userFiles } = globalObject;
     (0, utils_js_1.assert)(typeof isProduction === 'boolean');
     let globalContext;
@@ -215,7 +218,8 @@ function assembleGlobalContext() {
             viteDevServer,
             viteConfig,
             ...userFiles,
-            viteConfigRuntime
+            viteConfigRuntime,
+            ...resolveBaseRuntime(viteConfigRuntime, userFiles.config)
         };
     }
     else {
@@ -232,7 +236,8 @@ function assembleGlobalContext() {
             ...userFiles,
             viteDevServer: null,
             viteConfigRuntime: buildInfo.viteConfigRuntime,
-            usesClientRouter: buildInfo.usesClientRouter
+            usesClientRouter: buildInfo.usesClientRouter,
+            ...resolveBaseRuntime(buildInfo.viteConfigRuntime, userFiles.config)
         };
         if (isPrerendering) {
             (0, utils_js_1.assert)(viteConfig);
@@ -401,3 +406,9 @@ function getInitialGlobalContext() {
         viteDevServerPromiseResolve
     };
 }
+function resolveBaseRuntime(viteConfigRuntime, config) {
+    const baseViteOriginal = viteConfigRuntime._baseViteOriginal;
+    const baseServerUnresolved = config.baseServer ?? null;
+    const baseAssetsUnresolved = config.baseAssets ?? null;
+    return (0, resolveBase_js_1.resolveBase)(baseViteOriginal, baseServerUnresolved, baseAssetsUnresolved);
+}

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

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertNoInfiniteHttpRedirect = assertNoInfiniteHttpRedirect;
 const utils_js_1 = require("../../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const globalObject = (0, utils_js_1.getGlobalObject)('assertNoInfiniteHttpRedirect.ts', {
+const globalObject = (0, utils_js_1.getGlobalObject)('createHttpResponse/assertNoInfiniteHttpRedirect.ts', {
     redirectGraph: {}
 });
 function assertNoInfiniteHttpRedirect(urlRedirectTarget, urlLogical) {

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

@@ -5,6 +5,7 @@ exports.createHttpResponsePageContextJson = createHttpResponsePageContextJson;
 exports.createHttpResponseError = createHttpResponseError;
 exports.createHttpResponseRedirect = createHttpResponseRedirect;
 exports.createHttpResponseFavicon404 = createHttpResponseFavicon404;
+exports.createHttpResponseBaseIsMissing = createHttpResponseBaseIsMissing;
 const utils_js_1 = require("../utils.js");
 const error_page_js_1 = require("../../../shared/error-page.js");
 const getHttpResponseBody_js_1 = require("./getHttpResponseBody.js");
@@ -40,6 +41,29 @@ function createHttpResponseFavicon404() {
     const httpResponse = createHttpResponse(404, 'text/html;charset=utf-8', [], "<p>No favicon.ico found.</p><script>console.log('This HTTP response was generated by Vike.')</script>");
     return httpResponse;
 }
+function createHttpResponseBaseIsMissing(urlOriginal, baseServer) {
+    const httpResponse = createHttpResponse(
+    // We use the error code `500` to signal a failing state because this HTTP response should never be used, see https://vike.dev/base-url#setup
+    // In other words: this HTTP response is expected to be generated but isn't expected to be actually used.
+    500, 'text/html;charset=utf-8', [], `
+<h1>Error: Base URL is missing</h1>
+<p>
+  <a href="https://vike.dev/renderPage"><code>renderPage(pageContextInit)</code></a> called with <code>pageContextInit.urlOriginal===${JSON.stringify(urlOriginal)}</code> which doesn't start with the Base URL <code>${baseServer}</code>.
+</p>
+<p>
+  See <a href="https://vike.dev/base-url#setup">vike.dev/base-url#setup</a> for how to properly setup your server while using a Base URL.
+</p>
+<style>
+  code {
+    font-family: monospace;
+    background-color: #eaeaea;
+    padding: 3px 5px;
+    border-radius: 4px;
+  }
+</style>
+`);
+    return httpResponse;
+}
 function createHttpResponseError(pageContext) {
     const reason = (() => {
         if (!pageContext) {

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

@@ -8,7 +8,7 @@ const retrieveAssetsProd_js_1 = require("./getPageAssets/retrieveAssetsProd.js")
 const inferMediaType_js_1 = require("./inferMediaType.js");
 const getManifestEntry_js_1 = require("./getPageAssets/getManifestEntry.js");
 const sortPageAssetsForEarlyHintsHeader_js_1 = require("./getPageAssets/sortPageAssetsForEarlyHintsHeader.js");
-const globalObject = (0, utils_js_1.getGlobalObject)('getPageAssets.ts', {
+const globalObject = (0, utils_js_1.getGlobalObject)('renderPage/getPageAssets.ts', {
     resolveClientEntriesDev: null
 });
 async function getPageAssets(pageContext, clientDependencies, clientEntries) {

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.handlePageContextRequestUrl = handlePageContextRequestUrl;
 const getPageContextRequestUrl_js_1 = require("../../../shared/getPageContextRequestUrl.js");
 const utils_js_1 = require("../utils.js");
-// See shared/getPageContextRequestUrl.ts
+// See also shared/getPageContextRequestUrl.ts
 function handlePageContextRequestUrl(url) {
     if (!hasSuffix(url)) {
         return { urlWithoutPageContextRequestSuffix: url, isPageContextRequest: false };

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isNewError = isNewError;
 exports.setAlreadyLogged = setAlreadyLogged;
 const utils_js_1 = require("../utils.js");
-const globalObject = (0, utils_js_1.getGlobalObject)('runtime/renderPage/isNewError.ts', {
+const globalObject = (0, utils_js_1.getGlobalObject)('renderPage/isNewError.ts', {
     wasAlreadyLogged: new WeakSet()
 });
 function isNewError(errErrorPage, errNominalPage) {

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

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isVikeConfigInvalid_set = exports.isVikeConfigInvalid = void 0;
+const utils_js_1 = require("../utils.js");
+let isVikeConfigInvalid;
+const isVikeConfigInvalid_set = (val) => {
+    (0, utils_js_1.assert)(val === false || val.err);
+    exports.isVikeConfigInvalid = isVikeConfigInvalid = val;
+};
+exports.isVikeConfigInvalid_set = isVikeConfigInvalid_set;

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

@@ -102,7 +102,7 @@ async function loadPageUserFiles(pageFilesAll, pageConfig, pageConfigGlobal, pag
     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, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyOld)(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
+    const pageContextExports = (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendly_oldDesign)(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
     return {
         pageContextExports,
         pageFilesLoaded: pageFilesServerSide

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

@@ -22,7 +22,6 @@ const preparePageContextForUserConsumptionServerSide_js_1 = require("./preparePa
 const executeGuardHook_js_1 = require("../../../shared/route/executeGuardHook.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const isServerSideError_js_1 = require("../../../shared/misc/isServerSideError.js");
-const resolveBase_js_1 = require("../../shared/resolveBase.js");
 async function renderPageAlreadyRouted(pageContext) {
     // pageContext.pageId can either be the:
     //  - ID of the page matching the routing, or the
@@ -117,14 +116,13 @@ async function getPageContextInitEnhanced(pageContextInit, globalContext, { ssr:
     isClientSideNavigation: false
 } } = {}) {
     (0, utils_js_1.assert)(pageContextInit.urlOriginal);
-    const { baseServer, baseAssets } = (0, resolveBase_js_1.resolveBaseRuntime)(globalContext);
     const pageContextInitEnhanced = {};
     (0, utils_js_1.objectAssign)(pageContextInitEnhanced, pageContextInit);
     (0, utils_js_1.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