vike 0.4.221-commit-937dbfb → 0.4.222-commit-207e079

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/commonConfig.js

@@ -35,7 +35,10 @@ function commonConfig(vikeVitePluginOptions) {
                         _isDev: isDev,
                         _root: root,
                         _vikeVitePluginOptions: vikeVitePluginOptions,
-                        vike: { config: vikeConfig.global.config },
+                        vike: {
+                            pages: vikeConfig.pages,
+                            config: vikeConfig.global.config
+                        },
                         // TODO/v1-release: remove https://github.com/vikejs/vike/issues/2122
                         configVikePromise: Promise.resolve({
                             prerender: (0, context_js_2.isPrerenderEnabled)(vikeConfig)

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

@@ -15,8 +15,8 @@ const getVikeConfig_js_1 = require("./v1-design/getVikeConfig.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const loggerNotProd_js_1 = require("../../shared/loggerNotProd.js");
 const getFilePath_js_1 = require("../../shared/getFilePath.js");
-const getPlusFilesAll_js_1 = require("./v1-design/getVikeConfig/getPlusFilesAll.js");
 const globalContext_js_1 = require("../../../runtime/globalContext.js");
+const crawlPlusFiles_js_1 = require("./v1-design/getVikeConfig/crawlPlusFiles.js");
 function importUserCode() {
     let config;
     let vikeConfig;
@@ -73,50 +73,55 @@ function handleFileAddRemove(server, config) {
     return;
     function listener(file, isRemove) {
         file = (0, vite_1.normalizePath)(file);
-        const isVikeConfig = isVikeConfigModule(file) || isVikeConfigFile(file);
-        if (isVikeConfig) {
-            const virtualModules = getVirtualModules(server);
-            virtualModules.forEach((mod) => {
-                server.moduleGraph.invalidateModule(mod);
-            });
+        if ((0, crawlPlusFiles_js_1.isPlusFile)(file) || isVikeConfigDependency(file, server.moduleGraph)?.modifiesVikeVirtualFiles) {
+            invalidateVikeVirtualFiles(server);
             reloadConfig(file, config, isRemove ? 'removed' : 'created');
         }
     }
 }
+function invalidateVikeVirtualFiles(server) {
+    const vikeVirtualFiles = getVikeVirtualFiles(server);
+    vikeVirtualFiles.forEach((mod) => {
+        server.moduleGraph.invalidateModule(mod);
+    });
+}
 function handleHotUpdate(ctx, config) {
     const { file, server } = ctx;
-    const isVikeConfig = isVikeConfigModule(file);
-    const isViteModule = ctx.modules.length > 0;
-    /* Should we show this?
-    // - Can be useful for server files that aren't processed by Vite.
-    // - Can be annoying for files that obviously aren't processed by Vite.
-    if (!isVikeConfig && !isViteModule) {
-      logViteAny(
-        `${msg} — ${pc.cyan('no HMR')}, see https://vike.dev/on-demand-compiler`,
-        'info',
-        null,
-        true
-      )
-      return
-    }
-    //*/
-    // It can hide an error it shouldn't hide (because the error isn't shown again), but it's ok since users can reload the page and the error will be shown again (Vite transpilation errors are shown again upon a page reload).
-    if (!isVikeConfig && isViteModule) {
-        return;
-    }
+    const isVikeConfig = isVikeConfigDependency(ctx.file, ctx.server.moduleGraph);
     if (isVikeConfig) {
-        /* Tailwind breaks this assertion, see https://github.com/vikejs/vike/discussions/1330#discussioncomment-7787238
-        assert(!isViteModule)
-        */
-        reloadConfig(file, config, 'modified');
-        const virtualModules = getVirtualModules(server);
-        return virtualModules;
+        if (isVikeConfig.modifiesVikeVirtualFiles) {
+            /* Tailwind breaks this assertion, see https://github.com/vikejs/vike/discussions/1330#discussioncomment-7787238
+            const isViteModule = ctx.modules.length > 0
+            assert(!isViteModule)
+            */
+            // Ensure server.ssrLoadModule() loads fresh Vike virtual files (`reloadConfig()` > `updateUserFiles()` > `server.ssrLoadModule()`)
+            invalidateVikeVirtualFiles(server);
+            reloadConfig(file, config, 'modified');
+            // Triggers a full page reload
+            const vikeVirtualFiles = getVikeVirtualFiles(server);
+            return vikeVirtualFiles;
+        }
+        else {
+            // Ensure we invalidate `file` *before* server.ssrLoadModule() in updateUserFiles()
+            // Vite already invalidates it, but possibly *after* handleHotUpdate() and thus after server.ssrLoadModule()
+            ctx.modules.forEach((mod) => server.moduleGraph.invalidateModule(mod));
+            (0, globalContext_js_1.updateUserFiles)();
+        }
     }
 }
-function isVikeConfigModule(filePathAbsoluteFilesystem) {
+function isVikeConfigDependency(filePathAbsoluteFilesystem, moduleGraph) {
+    // Check config-only files, for example all pages/+config.js dependencies. (There aren't part of Vite's module graph.)
     (0, utils_js_1.assertPosixPath)(filePathAbsoluteFilesystem);
     getVikeConfig_js_1.vikeConfigDependencies.forEach((f) => (0, utils_js_1.assertPosixPath)(f));
-    return getVikeConfig_js_1.vikeConfigDependencies.has(filePathAbsoluteFilesystem);
+    if (getVikeConfig_js_1.vikeConfigDependencies.has(filePathAbsoluteFilesystem))
+        return { modifiesVikeVirtualFiles: true };
+    // Check using Vite's module graph, for example all +htmlAttributes dependencies.
+    // Alternatively, simply call updateUserFiles() on every handleHotUpdate() call.
+    const importers = getImporters(filePathAbsoluteFilesystem, moduleGraph);
+    const isPlusValueFileDependency = Array.from(importers).some((importer) => importer.file && (0, crawlPlusFiles_js_1.isPlusFile)(importer.file));
+    if (isPlusValueFileDependency)
+        return { modifiesVikeVirtualFiles: false };
+    return null;
 }
 function reloadConfig(filePath, config, op) {
     {
@@ -127,16 +132,45 @@ function reloadConfig(filePath, config, op) {
     (0, getVikeConfig_js_1.reloadVikeConfig)(config);
     (0, globalContext_js_1.updateUserFiles)();
 }
-function getVirtualModules(server) {
-    const virtualModules = Array.from(server.moduleGraph.urlToModuleMap.keys())
+function getVikeVirtualFiles(server) {
+    const vikeVirtualFiles = Array.from(server.moduleGraph.urlToModuleMap.keys())
         .filter((url) => (0, virtualFilePageConfigValuesAll_js_1.isVirtualFileIdPageConfigValuesAll)(url) || (0, virtualFileImportUserCode_js_1.isVirtualFileIdImportUserCode)(url))
         .map((url) => {
         const mod = server.moduleGraph.urlToModuleMap.get(url);
         (0, utils_js_1.assert)(mod);
         return mod;
     });
-    return virtualModules;
+    return vikeVirtualFiles;
+}
+// Get all transitive importers (including the module itself)
+function getImporters(file, moduleGraph) {
+    const importers = new Set();
+    const mods = moduleGraph.getModulesByFile(file);
+    if (!mods)
+        return importers;
+    for (const mod of mods) {
+        getModuleImporters(mod).forEach((importer) => {
+            if (importer)
+                importers.add(importer);
+        });
+    }
+    return importers;
 }
-function isVikeConfigFile(filePath) {
-    return !!(0, getPlusFilesAll_js_1.getPlusFileValueConfigName)(filePath);
+function getModuleImporters(mod, seen = new Set()) {
+    if (seen.has(mod))
+        return new Set();
+    seen.add(mod);
+    const importers = new Set();
+    if (mod.id)
+        importers.add(mod);
+    // Traverse through the importers (modules that import this module)
+    for (const importer of mod.importers) {
+        if (importer.id)
+            importers.add(importer);
+        getModuleImporters(importer, seen).forEach((importerTransitive) => {
+            if (importerTransitive)
+                importers.add(importerTransitive);
+        });
+    }
+    return importers;
 }

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

@@ -4,6 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.crawlPlusFiles = crawlPlusFiles;
+exports.isPlusFile = isPlusFile;
+exports.getPlusFileValueConfigName = getPlusFileValueConfigName;
 const utils_js_1 = require("../../../../utils.js");
 const path_1 = __importDefault(require("path"));
 const fast_glob_1 = __importDefault(require("fast-glob"));
@@ -54,6 +56,7 @@ async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem) {
         (0, utils_js_1.assertPosixPath)(filePath);
         (0, utils_js_1.assert)(!filePath.startsWith(userRootDir));
         const filePathAbsoluteUserRootDir = path_1.default.posix.join('/', filePath);
+        (0, utils_js_1.assert)(isPlusFile(filePathAbsoluteUserRootDir));
         return { filePathAbsoluteUserRootDir };
     });
     return plusFiles;
@@ -228,3 +231,37 @@ function isGitCrawlDisabled() {
     const crawSettings = (0, getEnvVarObject_js_1.getEnvVarObject)('VIKE_CRAWL');
     return crawSettings?.git === false;
 }
+function isPlusFile(filePath) {
+    (0, utils_js_1.assertPosixPath)(filePath);
+    if ((0, transpileAndExecuteFile_js_1.isTemporaryBuildFile)(filePath))
+        return false;
+    const fileName = filePath.split('/').pop();
+    return fileName.startsWith('+');
+}
+function getPlusFileValueConfigName(filePath) {
+    if (!isPlusFile(filePath))
+        return null;
+    const fileName = path_1.default.posix.basename(filePath);
+    // assertNoUnexpectedPlusSign(filePath, fileName)
+    const basename = fileName.split('.')[0];
+    (0, utils_js_1.assert)(basename.startsWith('+'));
+    const configName = basename.slice(1);
+    (0, utils_js_1.assertUsage)(configName !== '', `${filePath} Invalid filename ${fileName}`);
+    return configName;
+}
+/* https://github.com/vikejs/vike/issues/1407
+function assertNoUnexpectedPlusSign(filePath: string, fileName: string) {
+  const dirs = path.posix.dirname(filePath).split('/')
+  dirs.forEach((dir, i) => {
+    const dirPath = dirs.slice(0, i + 1).join('/')
+    assertUsage(
+      !dir.includes('+'),
+      `Character '+' is a reserved character: remove '+' from the directory name ${dirPath}/`
+    )
+  })
+  assertUsage(
+    !fileName.slice(1).includes('+'),
+    `Character '+' is only allowed at the beginning of filenames: make sure ${filePath} doesn't contain any '+' in its filename other than its first letter`
+  )
+}
+*/

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

@@ -1,27 +1,21 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPlusFilesAll = getPlusFilesAll;
-exports.getPlusFileValueConfigName = getPlusFileValueConfigName;
 const utils_js_1 = require("../../../../utils.js");
 const configDefinitionsBuiltIn_js_1 = require("./configDefinitionsBuiltIn.js");
 const filesystemRouting_js_1 = require("./filesystemRouting.js");
-const transpileAndExecuteFile_js_1 = require("./transpileAndExecuteFile.js");
 const crawlPlusFiles_js_1 = require("./crawlPlusFiles.js");
 const getConfigFileExport_js_1 = require("./getConfigFileExport.js");
 const loadFileAtConfigTime_js_1 = require("./loadFileAtConfigTime.js");
 const resolvePointerImport_js_1 = require("./resolvePointerImport.js");
 const getFilePath_js_1 = require("../../../../shared/getFilePath.js");
 const assertExtensions_js_1 = require("./assertExtensions.js");
-const node_path_1 = __importDefault(require("node:path"));
 async function getPlusFilesAll(userRootDir, esbuildCache) {
     const plusFiles = await findPlusFiles(userRootDir, null);
     const configFiles = [];
     const valueFiles = [];
     plusFiles.forEach((f) => {
-        if (getPlusFileValueConfigName(f.filePathAbsoluteFilesystem) === 'config') {
+        if ((0, crawlPlusFiles_js_1.getPlusFileValueConfigName)(f.filePathAbsoluteFilesystem) === 'config') {
             configFiles.push(f);
         }
         else {
@@ -66,7 +60,7 @@ async function getPlusFilesAll(userRootDir, esbuildCache) {
         ...valueFiles.map(async (filePath) => {
             const { filePathAbsoluteUserRootDir } = filePath;
             (0, utils_js_1.assert)(filePathAbsoluteUserRootDir);
-            const configName = getPlusFileValueConfigName(filePathAbsoluteUserRootDir);
+            const configName = (0, crawlPlusFiles_js_1.getPlusFileValueConfigName)(filePathAbsoluteUserRootDir);
             (0, utils_js_1.assert)(configName);
             const locationId = (0, filesystemRouting_js_1.getLocationId)(filePathAbsoluteUserRootDir);
             const plusFile = {
@@ -125,35 +119,3 @@ async function findPlusFiles(userRootDir, outDirRoot) {
     const plusFiles = files.map(({ filePathAbsoluteUserRootDir }) => (0, getFilePath_js_1.getFilePathResolved)({ filePathAbsoluteUserRootDir, userRootDir }));
     return plusFiles;
 }
-function getPlusFileValueConfigName(filePath) {
-    (0, utils_js_1.assertPosixPath)(filePath);
-    if ((0, transpileAndExecuteFile_js_1.isTemporaryBuildFile)(filePath))
-        return null;
-    const fileName = node_path_1.default.posix.basename(filePath);
-    // assertNoUnexpectedPlusSign(filePath, fileName)
-    const basename = fileName.split('.')[0];
-    if (!basename.startsWith('+')) {
-        return null;
-    }
-    else {
-        const configName = basename.slice(1);
-        (0, utils_js_1.assertUsage)(configName !== '', `${filePath} Invalid filename ${fileName}`);
-        return configName;
-    }
-}
-/* https://github.com/vikejs/vike/issues/1407
-function assertNoUnexpectedPlusSign(filePath: string, fileName: string) {
-  const dirs = path.posix.dirname(filePath).split('/')
-  dirs.forEach((dir, i) => {
-    const dirPath = dirs.slice(0, i + 1).join('/')
-    assertUsage(
-      !dir.includes('+'),
-      `Character '+' is a reserved character: remove '+' from the directory name ${dirPath}/`
-    )
-  })
-  assertUsage(
-    !fileName.slice(1).includes('+'),
-    `Character '+' is only allowed at the beginning of filenames: make sure ${filePath} doesn't contain any '+' in its filename other than its first letter`
-  )
-}
-*/

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

@@ -28,6 +28,7 @@ if (debugEsbuildResolve.isActivated)
     debugEsbuildResolve('esbuild version', esbuild_1.version);
 async function transpileAndExecuteFile(filePath, userRootDir, isExtensionConfig, esbuildCache) {
     const { filePathAbsoluteFilesystem, filePathToShowToUserResolved } = filePath;
+    (0, utils_js_1.assert)(filePathAbsoluteFilesystem);
     const fileExtension = getFileExtension(filePathAbsoluteFilesystem);
     if (esbuildCache[filePathAbsoluteFilesystem]) {
         return await esbuildCache[filePathAbsoluteFilesystem];
@@ -54,6 +55,7 @@ async function transpileAndExecuteFile(filePath, userRootDir, isExtensionConfig,
 }
 async function transpileFile(filePath, transformImports, userRootDir) {
     const { filePathAbsoluteFilesystem, filePathToShowToUserResolved } = filePath;
+    (0, utils_js_1.assert)(filePathAbsoluteFilesystem);
     (0, utils_js_1.assertPosixPath)(filePathAbsoluteFilesystem);
     getVikeConfig_js_1.vikeConfigDependencies.add(filePathAbsoluteFilesystem);
     if (debug.isActivated)

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

@@ -37,6 +37,7 @@ function reloadVikeConfig(config) {
     const userRootDir = config.root;
     const vikeVitePluginOptions = config._vikeVitePluginOptions;
     (0, utils_js_1.assert)(vikeVitePluginOptions);
+    // TODO/now: unify with esbuildCache
     vikeConfigDependencies.clear();
     vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, true, vikeVitePluginOptions);
     handleReloadSideEffects();
@@ -132,7 +133,8 @@ async function loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePlug
                     configDefinitions: {},
                     configValueSources: {}
                 },
-                global: (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyNew)({ configValues: {} })
+                global: (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyNew)({ configValues: {} }),
+                pages: {}
             };
             return dummyData;
         }
@@ -141,15 +143,26 @@ async function loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePlug
 async function loadVikeConfig(userRootDir, vikeVitePluginOptions) {
     const esbuildCache = {};
     const plusFilesAll = await (0, getPlusFilesAll_js_1.getPlusFilesAll)(userRootDir, esbuildCache);
-    // assertKnownConfigs(plusFilesAll)
     const configDefinitionsResolved = await resolveConfigDefinitions(plusFilesAll, userRootDir, esbuildCache);
+    assertKnownConfigs(configDefinitionsResolved, plusFilesAll);
     const { pageConfigGlobal, pageConfigs } = getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRootDir);
     // interop vike(options) in vite.config.js
     temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, userRootDir);
     // global
-    const configValues = getConfigValues(pageConfigGlobal);
-    const global = (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyNew)({ configValues });
-    return { pageConfigs, pageConfigGlobal, global };
+    const configValuesGlobal = getConfigValues(pageConfigGlobal);
+    const global = (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyNew)({ configValues: configValuesGlobal });
+    // TODO/now DEDUPE
+    // 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];
+    }));
+    return { pageConfigs, pageConfigGlobal, global, pages };
 }
 async function resolveConfigDefinitions(plusFilesAll, userRootDir, esbuildCache) {
     const configDefinitionsGlobal = getConfigDefinitions(
@@ -289,7 +302,7 @@ function assertOnBeforeRenderEnv(pageConfig) {
     // When using Server Routing, loading a onBeforeRender() hook on the client-side hasn't any effect (the Server Routing's client runtime never calls it); it unnecessarily bloats client bundle sizes
     (0, utils_js_1.assertUsage)(!(onBeforeRenderEnv.client && !isClientRouting), `Page ${pageConfig.pageId} has an onBeforeRender() hook with env ${picocolors_1.default.cyan(JSON.stringify(onBeforeRenderEnv))} which doesn't make sense because the page is using Server Routing: onBeforeRender() can be run in the client only when using Client Routing.`);
 }
-function getConfigValues(pageConfig) {
+function getConfigValues(pageConfig, tolerateMissingValue) {
     const configValues = {};
     (0, serializeConfigValues_js_1.getConfigValuesBase)(pageConfig, (configEnv) => !!configEnv.config, null).forEach((entry) => {
         if (entry.configValueBase.type === 'computed') {
@@ -300,7 +313,11 @@ function getConfigValues(pageConfig) {
         if (entry.configValueBase.type === 'standard') {
             (0, utils_js_1.assert)('sourceRelevant' in entry); // Help TS
             const { configValueBase, sourceRelevant, configName } = entry;
-            (0, utils_js_1.assert)('value' in sourceRelevant);
+            if (!sourceRelevant.valueIsLoaded) {
+                if (tolerateMissingValue)
+                    return;
+                (0, utils_js_1.assert)(false);
+            }
             const { value } = sourceRelevant;
             configValues[configName] = { ...configValueBase, value };
         }
@@ -309,9 +326,18 @@ function getConfigValues(pageConfig) {
             const { configValueBase, sourcesRelevant, configName } = entry;
             const values = [];
             sourcesRelevant.forEach((source) => {
-                (0, utils_js_1.assert)('value' in source);
+                if (!source.valueIsLoaded) {
+                    if (tolerateMissingValue)
+                        return;
+                    (0, utils_js_1.assert)(false);
+                }
                 values.push(source.value);
             });
+            if (values.length === 0) {
+                if (tolerateMissingValue)
+                    return;
+                (0, utils_js_1.assert)(false);
+            }
             configValues[configName] = { ...configValueBase, value: values };
         }
     });
@@ -356,7 +382,6 @@ function getPlusFilesRelevant(plusFilesAll, locationIdPage) {
     return plusFilesRelevant;
 }
 function sortForGlobal(plusFilesAll) {
-    const locationIdsAll = (0, utils_js_1.objectKeys)(plusFilesAll);
     const plusFilesAllSorted = Object.fromEntries((0, utils_js_1.objectEntries)(plusFilesAll)
         .sort((0, utils_js_1.lowerFirst)(([locationId]) => locationId.split('/').length))
         .sort((0, utils_js_1.makeFirst)(([locationId]) => isGlobalLocation(locationId, plusFilesAll))));
@@ -753,13 +778,13 @@ function getComputed(configValueSources, configDefinitions) {
     return configValuesComputed;
 }
 // Show error message upon unknown config
-function assertKnownConfigs(plusFilesAll) {
+function assertKnownConfigs(configDefinitionsResolved, plusFilesAll) {
     const configDefinitionsAll = getConfigDefinitions(plusFilesAll);
     const configNamesKnownAll = Object.keys(configDefinitionsAll);
-    (0, utils_js_1.objectEntries)(plusFilesAll).forEach(([locationId, plusFiles]) => {
-        const plusFilesRelevant = getPlusFilesRelevant(plusFilesAll, locationId);
-        const configDefinitionsLocal = getConfigDefinitions(plusFilesRelevant);
-        const configNamesKnownLocal = Object.keys(configDefinitionsLocal);
+    const configNamesGlobal = Object.keys(configDefinitionsResolved.configDefinitionsGlobal);
+    (0, utils_js_1.objectEntries)(configDefinitionsResolved.configDefinitionsLocal).forEach(([_locationId, { configDefinitions, plusFiles }]) => {
+        const configDefinitionsLocal = configDefinitions;
+        const configNamesKnownLocal = [...Object.keys(configDefinitionsLocal), ...configNamesGlobal];
         plusFiles.forEach((plusFile) => {
             const configNames = getDefiningConfigNames(plusFile);
             configNames.forEach((configName) => {

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,6 +35,7 @@ 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());
 async function getGlobalContextInternal() {
@@ -78,8 +79,14 @@ async function getGlobalContextAsync(isProduction) {
     return globalContext_public;
 }
 function makePublic(globalContext) {
-    // TODO/soon: add `pages`
-    const globalContextPublic = (0, utils_js_1.makePublicCopy)(globalContext, 'globalContext', ['assetsManifest', 'config', 'viteConfig']);
+    const globalContextPublic = (0, utils_js_1.makePublicCopy)(globalContext, 'globalContext', [
+        'assetsManifest',
+        'config',
+        'viteConfig',
+        'pages',
+        'baseServer',
+        'baseAssets'
+    ]);
     return globalContextPublic;
 }
 async function setGlobalContext_viteDevServer(viteDevServer) {
@@ -183,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 });
@@ -192,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;
@@ -211,7 +218,8 @@ function assembleGlobalContext() {
             viteDevServer,
             viteConfig,
             ...userFiles,
-            viteConfigRuntime
+            viteConfigRuntime,
+            ...resolveBaseRuntime(viteConfigRuntime, userFiles.config)
         };
     }
     else {
@@ -228,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);
@@ -253,7 +262,7 @@ async function getUserFiles() {
     const globalObject_ = globalObject;
     const { pageConfigsRuntime } = globalObject_;
     (0, utils_js_1.assert)(pageConfigsRuntime);
-    const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, globalConfig } = pageConfigsRuntime;
+    const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, globalConfig, pageConfigsUserFriendly } = pageConfigsRuntime;
     const { pageRoutes, onBeforeRouteHook } = await (0, loadPageRoutes_js_1.loadPageRoutes)(pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds);
     const userFiles = {
         pageFilesAll,
@@ -262,6 +271,7 @@ async function getUserFiles() {
         allPageIds,
         pageRoutes,
         onBeforeRouteHook,
+        pages: pageConfigsUserFriendly,
         config: globalConfig.config
     };
     (0, assertV1Design_js_1.assertV1Design)(
@@ -396,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/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

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

@@ -23,7 +23,6 @@ const error_page_js_1 = require("../../shared/error-page.js");
 const handleErrorWithoutErrorPage_js_1 = require("./renderPage/handleErrorWithoutErrorPage.js");
 const loadUserFilesServerSide_js_1 = require("./renderPage/loadUserFilesServerSide.js");
 const resolveRedirects_js_1 = require("./renderPage/resolveRedirects.js");
-const resolveBase_js_1 = require("../shared/resolveBase.js");
 const globalObject = (0, utils_js_1.getGlobalObject)('runtime/renderPage.ts', {
     httpRequestsCount: 0
 });
@@ -343,7 +342,6 @@ function assertIsNotViteRequest(urlPathname, urlOriginal) {
     (0, utils_js_1.assertUsage)(false, `${picocolors_1.default.code('renderPage(pageContextInit)')} called with ${picocolors_1.default.code(`pageContextInit.urlOriginal===${JSON.stringify(urlOriginal)}`)} which is unexpected because the URL ${picocolors_1.default.bold(urlOriginal)} should have already been handled by the development middleware: make sure the ${picocolors_1.default.cyan('createDevMiddleware()')} middleware is executed *before* the ${picocolors_1.default.cyan('renderPage()')} middleware, see ${picocolors_1.default.underline('https://vike.dev/renderPage')}`);
 }
 async function normalizeUrl(pageContextInit, globalContext, httpRequestId) {
-    const { baseServer } = (0, resolveBase_js_1.resolveBaseRuntime)(globalContext);
     const { trailingSlash, disableUrlNormalization } = globalContext.config;
     if (disableUrlNormalization)
         return null;
@@ -351,7 +349,7 @@ async function normalizeUrl(pageContextInit, globalContext, httpRequestId) {
     const { isPageContextRequest } = (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(urlOriginal);
     if (isPageContextRequest)
         return null;
-    const urlNormalized = (0, utils_js_1.normalizeUrlPathname)(urlOriginal, trailingSlash ?? false, baseServer);
+    const urlNormalized = (0, utils_js_1.normalizeUrlPathname)(urlOriginal, trailingSlash ?? false, globalContext.baseServer);
     if (!urlNormalized)
         return null;
     (0, loggerRuntime_js_1.logRuntimeInfo)?.(`URL normalized from ${picocolors_1.default.cyan(urlOriginal)} to ${picocolors_1.default.cyan(urlNormalized)} (https://vike.dev/url-normalization)`, httpRequestId, 'info');
@@ -361,8 +359,7 @@ async function normalizeUrl(pageContextInit, globalContext, httpRequestId) {
     return pageContextHttpResponse;
 }
 async function getPermanentRedirect(pageContextInit, globalContext, httpRequestId) {
-    const { baseServer } = (0, resolveBase_js_1.resolveBaseRuntime)(globalContext);
-    const urlWithoutBase = (0, utils_js_1.removeBaseServer)(pageContextInit.urlOriginal, baseServer);
+    const urlWithoutBase = (0, utils_js_1.removeBaseServer)(pageContextInit.urlOriginal, globalContext.baseServer);
     let origin = null;
     let urlTargetExternal = null;
     let urlTarget = (0, utils_js_1.modifyUrlPathname)(urlWithoutBase, (urlPathname) => {
@@ -393,9 +390,8 @@ async function getPermanentRedirect(pageContextInit, globalContext, httpRequestI
         }
         if (normalize(urlTarget) === normalize(urlWithoutBase))
             return null;
-        const { baseServer } = (0, resolveBase_js_1.resolveBaseRuntime)(globalContext);
         if (!originChanged)
-            urlTarget = (0, utils_js_1.prependBase)(urlTarget, baseServer);
+            urlTarget = (0, utils_js_1.prependBase)(urlTarget, globalContext.baseServer);
         (0, utils_js_1.assert)(urlTarget !== pageContextInit.urlOriginal);
     }
     (0, loggerRuntime_js_1.logRuntimeInfo)?.(`Permanent redirection defined by config.redirects (https://vike.dev/redirects)`, httpRequestId, 'info');
@@ -459,7 +455,7 @@ pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit, globalConte
     return { pageContextAbort };
 }
 async function assertBaseUrl(pageContextInit, globalContext) {
-    const { baseServer } = (0, resolveBase_js_1.resolveBaseRuntime)(globalContext);
+    const { baseServer } = globalContext;
     const { urlOriginal } = pageContextInit;
     const { urlWithoutPageContextRequestSuffix } = (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(urlOriginal);
     const { hasBaseServer } = (0, utils_js_1.parseUrl)(urlWithoutPageContextRequestSuffix, baseServer);