vike 0.4.221 → 0.4.222-commit-6647d1e

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/crawlPlusFiles.d.ts

@@ -1,4 +1,8 @@
 export { crawlPlusFiles };
+export { isPlusFile };
+export { getPlusFileValueConfigName };
 declare function crawlPlusFiles(userRootDir: string, outDirAbsoluteFilesystem: null | string): Promise<{
     filePathAbsoluteUserRootDir: string;
 }[]>;
+declare function isPlusFile(filePath: string): boolean;
+declare function getPlusFileValueConfigName(filePath: string): string | null;

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

@@ -1,5 +1,7 @@
 export { crawlPlusFiles };
-import { assertPosixPath, assert, scriptFileExtensions, assertIsSingleModuleInstance, assertIsNotProductionRuntime, isVersionOrAbove, isScriptFile, scriptFileExtensionList } from '../../../../utils.js';
+export { isPlusFile };
+export { getPlusFileValueConfigName };
+import { assertPosixPath, assert, scriptFileExtensions, assertIsSingleModuleInstance, assertIsNotProductionRuntime, isVersionOrAbove, isScriptFile, scriptFileExtensionList, createDebugger, deepEqual, assertUsage } from '../../../../utils.js';
 import path from 'path';
 import glob from 'fast-glob';
 import { exec } from 'child_process';
@@ -7,6 +9,7 @@ import { promisify } from 'util';
 import { isTemporaryBuildFile } from './transpileAndExecuteFile.js';
 import { getEnvVarObject } from '../../../../shared/getEnvVarObject.js';
 const execA = promisify(exec);
+const debug = createDebugger('vike:crawl');
 assertIsNotProductionRuntime();
 assertIsSingleModuleInstance('crawlPlusFiles.ts');
 let gitIsNotUsable = false;
@@ -30,17 +33,16 @@ async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem) {
             //
             !outDirRelativeFromUserRootDir.startsWith('../')));
     // Crawl
-    let files;
-    const res = !isGitCrawlDisabled() && (await gitLsFiles(userRootDir, outDirRelativeFromUserRootDir));
-    if (res &&
-        // Fallback to fast-glob for users that dynamically generate plus files. (Assuming that no plus file is found because of the user's .gitignore list.)
-        res.length > 0) {
-        files = res;
-        // We cannot find files inside symlink directories with `$ git ls-files` => we use fast-glob
-    }
-    else {
-        files = await fastGlob(userRootDir, outDirRelativeFromUserRootDir);
-    }
+    const filesGit = !isGitCrawlDisabled() && (await gitLsFiles(userRootDir, outDirRelativeFromUserRootDir));
+    const filesGitNothingFound = !filesGit || filesGit.length === 0;
+    const filesGlob = (filesGitNothingFound || debug.isActivated) && (await fastGlob(userRootDir, outDirRelativeFromUserRootDir));
+    let files = !filesGitNothingFound
+        ? filesGit
+        : // Fallback to fast-glob for users that dynamically generate plus files. (Assuming that no plus file is found because of the user's .gitignore list.)
+            filesGlob;
+    assert(files);
+    if (debug.isActivated)
+        assert(deepEqual(filesGlob, filesGit), "Git and glob results aren't matching.");
     // Filter build files
     files = files.filter((filePath) => !isTemporaryBuildFile(filePath));
     // Normalize
@@ -49,6 +51,7 @@ async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem) {
         assertPosixPath(filePath);
         assert(!filePath.startsWith(userRootDir));
         const filePathAbsoluteUserRootDir = path.posix.join('/', filePath);
+        assert(isPlusFile(filePathAbsoluteUserRootDir));
         return { filePathAbsoluteUserRootDir };
     });
     return plusFiles;
@@ -69,7 +72,7 @@ async function gitLsFiles(userRootDir, outDirRelativeFromUserRootDir) {
         preserveUTF8,
         'ls-files',
         // Performance gain seems negligible: https://github.com/vikejs/vike/pull/1688#issuecomment-2166206648
-        ...scriptFileExtensionList.map((ext) => `"**/+*.${ext}"`),
+        ...scriptFileExtensionList.map((ext) => `"**/+*.${ext}" "+*.${ext}"`),
         // Performance gain is non-negligible.
         //  - https://github.com/vikejs/vike/pull/1688#issuecomment-2166206648
         //  - When node_modules/ is untracked the performance gain could be significant?
@@ -96,6 +99,12 @@ async function gitLsFiles(userRootDir, outDirRelativeFromUserRootDir) {
         }
         throw err;
     }
+    if (debug.isActivated) {
+        debug('[git] userRootDir:', userRootDir);
+        debug('[git] cmd:', cmd);
+        debug('[git] result:', filesAll);
+        debug('[git] filesDeleted:', filesDeleted);
+    }
     const files = [];
     for (const filePath of filesAll) {
         // + file?
@@ -116,14 +125,21 @@ async function gitLsFiles(userRootDir, outDirRelativeFromUserRootDir) {
 }
 // Same as gitLsFiles() but using fast-glob
 async function fastGlob(userRootDir, outDirRelativeFromUserRootDir) {
-    const files = await glob(`**/+*.${scriptFileExtensions}`, {
+    const pattern = `**/+*.${scriptFileExtensions}`;
+    const options = {
         ignore: getIgnoreAsPatterns(outDirRelativeFromUserRootDir),
         cwd: userRootDir,
         dot: false
-    });
+    };
+    const files = await glob(pattern, options);
     // Make build deterministic, in order to get a stable generated hash for dist/client/assets/entries/entry-client-routing.${hash}.js
     // https://github.com/vikejs/vike/pull/1750
     files.sort();
+    if (debug.isActivated) {
+        debug('[glob] pattern:', pattern);
+        debug('[glob] options:', options);
+        debug('[glob] result:', files);
+    }
     return files;
 }
 // Same as getIgnoreAsFilterFn() but as glob pattern
@@ -210,3 +226,37 @@ function isGitCrawlDisabled() {
     const crawSettings = getEnvVarObject('VIKE_CRAWL');
     return crawSettings?.git === false;
 }
+function isPlusFile(filePath) {
+    assertPosixPath(filePath);
+    if (isTemporaryBuildFile(filePath))
+        return false;
+    const fileName = filePath.split('/').pop();
+    return fileName.startsWith('+');
+}
+function getPlusFileValueConfigName(filePath) {
+    if (!isPlusFile(filePath))
+        return null;
+    const fileName = path.posix.basename(filePath);
+    // assertNoUnexpectedPlusSign(filePath, fileName)
+    const basename = fileName.split('.')[0];
+    assert(basename.startsWith('+'));
+    const configName = basename.slice(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/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/filesystemRouting.d.ts

@@ -3,7 +3,6 @@ export { getFilesystemRouteDefinedBy };
 export { isInherited };
 export { getLocationId };
 export { sortAfterInheritanceOrder };
-export { isGlobalLocation };
 export { applyFilesystemRoutingRootEffect };
 export type { LocationId };
 export { getLogicalPath };
@@ -46,8 +45,6 @@ declare function getFilesystemRouteString(locationId: LocationId): string;
  * getLogicalPath('/pages/some-page', ['pages']) => '/some-page'
  */
 declare function getLogicalPath(locationId: LocationId, ignoredDirs: string[], removeParenthesesDirs?: true): string;
-/** Whether configs defined in `locationId` apply in every `locationIds` */
-declare function isGlobalLocation(locationId: LocationId, locationIds: LocationId[]): boolean;
 declare function sortAfterInheritanceOrder(locationId1: LocationId, locationId2: LocationId, locationIdPage: LocationId): -1 | 1 | 0;
 /** Whether configs defined at `locationId1` also apply at `locationId2` */
 declare function isInherited(locationId1: LocationId, locationId2: LocationId): boolean;

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

@@ -3,7 +3,6 @@ export { getFilesystemRouteDefinedBy };
 export { isInherited };
 export { getLocationId };
 export { sortAfterInheritanceOrder };
-export { isGlobalLocation };
 export { applyFilesystemRoutingRootEffect };
 // For ./filesystemRouting.spec.ts
 export { getLogicalPath };
@@ -41,10 +40,6 @@ function getLogicalPath(locationId, ignoredDirs, removeParenthesesDirs) {
     assertIsPath(logicalPath);
     return logicalPath;
 }
-/** Whether configs defined in `locationId` apply in every `locationIds` */
-function isGlobalLocation(locationId, locationIds) {
-    return locationIds.every((locId) => isInherited(locationId, locId) || locationIsRendererDir(locId));
-}
 function sortAfterInheritanceOrder(locationId1, locationId2, locationIdPage) {
     assertLocationId(locationId1);
     assertLocationId(locationId2);

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/getPlusFilesAll.d.ts

@@ -1,5 +1,4 @@
 export { getPlusFilesAll };
-export { getPlusFileValueConfigName };
 export type { PlusFileValue };
 export type { PlusFile };
 export type { PlusFilesByLocationId };
@@ -36,4 +35,3 @@ type PlusFileValue = PlusFileCommons & {
 };
 type PlusFilesByLocationId = Record<LocationId, PlusFile[]>;
 declare function getPlusFilesAll(userRootDir: string, esbuildCache: EsbuildCache): Promise<PlusFilesByLocationId>;
-declare function getPlusFileValueConfigName(filePath: string): string | null;

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

@@ -1,16 +1,13 @@
 export { getPlusFilesAll };
-export { getPlusFileValueConfigName };
-import { assert, assertPosixPath, assertUsage } from '../../../../utils.js';
+import { assert } from '../../../../utils.js';
 import { configDefinitionsBuiltIn } from './configDefinitionsBuiltIn.js';
 import { getLocationId } from './filesystemRouting.js';
-import { isTemporaryBuildFile } from './transpileAndExecuteFile.js';
-import { crawlPlusFiles } from './crawlPlusFiles.js';
+import { crawlPlusFiles, getPlusFileValueConfigName } from './crawlPlusFiles.js';
 import { getConfigFileExport } from './getConfigFileExport.js';
 import { loadConfigFile, loadValueFile } from './loadFileAtConfigTime.js';
 import { resolvePointerImport } from './resolvePointerImport.js';
 import { getFilePathResolved } from '../../../../shared/getFilePath.js';
 import { assertExtensionsConventions } from './assertExtensions.js';
-import path from 'node:path';
 async function getPlusFilesAll(userRootDir, esbuildCache) {
     const plusFiles = await findPlusFiles(userRootDir, null);
     const configFiles = [];
@@ -120,35 +117,3 @@ async function findPlusFiles(userRootDir, outDirRoot) {
     const plusFiles = files.map(({ filePathAbsoluteUserRootDir }) => getFilePathResolved({ filePathAbsoluteUserRootDir, userRootDir }));
     return plusFiles;
 }
-function getPlusFileValueConfigName(filePath) {
-    assertPosixPath(filePath);
-    if (isTemporaryBuildFile(filePath))
-        return null;
-    const fileName = path.posix.basename(filePath);
-    // assertNoUnexpectedPlusSign(filePath, fileName)
-    const basename = fileName.split('.')[0];
-    if (!basename.startsWith('+')) {
-        return null;
-    }
-    else {
-        const configName = basename.slice(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/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/loadFileAtConfigTime.js

@@ -51,7 +51,7 @@ async function loadValueFile(interfaceValueFile, configDefinitions, userRootDir,
 async function loadConfigFile(configFilePath, userRootDir, visited, isExtensionConfig, esbuildCache) {
     const { filePathAbsoluteFilesystem } = configFilePath;
     assertNoInfiniteLoop(visited, filePathAbsoluteFilesystem);
-    const { fileExports } = await transpileAndExecuteFile(configFilePath, userRootDir, isExtensionConfig ? 'is-extension-config' : true, esbuildCache);
+    const { fileExports } = await transpileAndExecuteFile(configFilePath, userRootDir, isExtensionConfig, esbuildCache);
     const { extendsConfigs, extendsFilePaths } = await loadExtendsConfigs(fileExports, configFilePath, userRootDir, [...visited, filePathAbsoluteFilesystem], esbuildCache);
     const configFile = {
         fileExports,

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/transpileAndExecuteFile.d.ts

@@ -10,7 +10,7 @@ type FileExports = {
 };
 type EsbuildCache = Record<string, // filePathAbsoluteFilesystem
 Promise<FileExports>>;
-declare function transpileAndExecuteFile(filePath: FilePathResolved, userRootDir: string, isConfigFile: boolean | 'is-extension-config', esbuildCache: EsbuildCache): Promise<FileExports>;
+declare function transpileAndExecuteFile(filePath: FilePathResolved, userRootDir: string, isExtensionConfig: boolean, esbuildCache: EsbuildCache): Promise<FileExports>;
 declare function getConfigBuildErrorFormatted(err: unknown): null | string;
 declare function getConfigExecutionErrorIntroMsg(err: unknown): string | null;
 declare function isTemporaryBuildFile(filePath: string): boolean;

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

@@ -21,8 +21,9 @@ const debug = createDebugger('vike:pointer-imports');
 const debugEsbuildResolve = createDebugger('vike:esbuild-resolve');
 if (debugEsbuildResolve.isActivated)
     debugEsbuildResolve('esbuild version', version);
-async function transpileAndExecuteFile(filePath, userRootDir, isConfigFile, esbuildCache) {
+async function transpileAndExecuteFile(filePath, userRootDir, isExtensionConfig, esbuildCache) {
     const { filePathAbsoluteFilesystem, filePathToShowToUserResolved } = filePath;
+    assert(filePathAbsoluteFilesystem);
     const fileExtension = getFileExtension(filePathAbsoluteFilesystem);
     if (esbuildCache[filePathAbsoluteFilesystem]) {
         return await esbuildCache[filePathAbsoluteFilesystem];
@@ -35,12 +36,12 @@ async function transpileAndExecuteFile(filePath, userRootDir, isConfigFile, esbu
         assertWarning(false, `${pc.cyan('.h.js')} files are deprecated: simply renaming ${filePathToShowToUserResolved} to ${removeHeaderFileExtension(filePathToShowToUserResolved)} is usually enough, although you may occasionally need to use ${pc.cyan("with { type: 'pointer' }")} as explained at https://vike.dev/config#pointer-imports`, { onlyOnce: true });
     }
     let fileExports;
-    if (isConfigFile === 'is-extension-config' && !isHeader && fileExtension.endsWith('js')) {
+    if (isExtensionConfig && !isHeader && fileExtension.endsWith('js')) {
         // This doesn't track dependencies => we should never use this for user land configs
         fileExports = await executeFile(filePathAbsoluteFilesystem, filePath);
     }
     else {
-        const transformImports = isConfigFile && (isHeader ? 'all' : true);
+        const transformImports = isHeader ? 'all' : true;
         const code = await transpileFile(filePath, transformImports, userRootDir);
         fileExports = await executeTranspiledFile(filePath, code);
     }
@@ -49,6 +50,7 @@ async function transpileAndExecuteFile(filePath, userRootDir, isConfigFile, esbu
 }
 async function transpileFile(filePath, transformImports, userRootDir) {
     const { filePathAbsoluteFilesystem, filePathToShowToUserResolved } = filePath;
+    assert(filePathAbsoluteFilesystem);
     assertPosixPath(filePathAbsoluteFilesystem);
     vikeConfigDependencies.add(filePathAbsoluteFilesystem);
     if (debug.isActivated)
@@ -333,6 +335,7 @@ function isTemporaryBuildFile(filePath) {
     const fileName = path.posix.basename(filePath);
     return /\.build-[a-z0-9]{12}\.mjs$/.test(fileName);
 }
+// TODO/next-major: remove
 function isHeaderFile(filePath) {
     assertPosixPath(filePath);
     const fileExtensions = getFileExtensions(filePath);

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.d.ts

@@ -9,12 +9,13 @@ export type { VikeConfigObject };
 import type { PageConfigGlobalBuildTime, PageConfigBuildTime } from '../../../../../shared/page-configs/PageConfig.js';
 import { type ConfigDefinitions, type ConfigDefinitionInternal } from './getVikeConfig/configDefinitionsBuiltIn.js';
 import type { ResolvedConfig } from 'vite';
-import { getPageConfigUserFriendlyNew } from '../../../../../shared/page-configs/getPageConfigUserFriendly.js';
+import { type PageConfigUserFriendly, type PageConfigsUserFriendly } from '../../../../../shared/page-configs/getPageConfigUserFriendly.js';
 import { type PlusFile } from './getVikeConfig/getPlusFilesAll.js';
 type VikeConfigObject = {
     pageConfigs: PageConfigBuildTime[];
     pageConfigGlobal: PageConfigGlobalBuildTime;
-    global: ReturnType<typeof getPageConfigUserFriendlyNew>;
+    global: PageConfigUserFriendly;
+    pages: PageConfigsUserFriendly;
 };
 declare const vikeConfigDependencies: Set<string>;
 declare function reloadVikeConfig(config: ResolvedConfig): void;

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

@@ -7,7 +7,7 @@ export { getConfVal };
 export { getConfigDefinitionOptional };
 import { assertPosixPath, assert, isObject, assertUsage, assertWarning, objectEntries, hasProp, includes, assertIsNotProductionRuntime, getMostSimilar, joinEnglish, assertKeys, objectKeys, objectFromEntries, unique, isCallable, makeFirst, lowerFirst } from '../../../utils.js';
 import { configDefinitionsBuiltIn } from './getVikeConfig/configDefinitionsBuiltIn.js';
-import { getLocationId, getFilesystemRouteString, getFilesystemRouteDefinedBy, isInherited, sortAfterInheritanceOrder, isGlobalLocation, applyFilesystemRoutingRootEffect } from './getVikeConfig/filesystemRouting.js';
+import { getLocationId, getFilesystemRouteString, getFilesystemRouteDefinedBy, isInherited, sortAfterInheritanceOrder, applyFilesystemRoutingRootEffect } from './getVikeConfig/filesystemRouting.js';
 import { isConfigInvalid, isConfigInvalid_set } from '../../../../runtime/renderPage/isConfigInvalid.js';
 import { getViteDevServer } from '../../../../runtime/globalContext.js';
 import { logConfigError, logConfigErrorRecover } from '../../../shared/loggerNotProd.js';
@@ -19,7 +19,7 @@ import { resolvePointerImport } from './getVikeConfig/resolvePointerImport.js';
 import { getFilePathResolved } from '../../../shared/getFilePath.js';
 import { getConfigValueBuildTime } from '../../../../../shared/page-configs/getConfigValueBuildTime.js';
 import { assertExtensionsRequire } from './getVikeConfig/assertExtensions.js';
-import { getPageConfigUserFriendlyNew } from '../../../../../shared/page-configs/getPageConfigUserFriendly.js';
+import { getPageConfigGlobalUserFriendly, getPageConfigUserFriendly } from '../../../../../shared/page-configs/getPageConfigUserFriendly.js';
 import { getConfigValuesBase } from '../../../../../shared/page-configs/serialize/serializeConfigValues.js';
 import { getPlusFilesAll } from './getVikeConfig/getPlusFilesAll.js';
 assertIsNotProductionRuntime();
@@ -31,6 +31,7 @@ function reloadVikeConfig(config) {
     const userRootDir = config.root;
     const vikeVitePluginOptions = config._vikeVitePluginOptions;
     assert(vikeVitePluginOptions);
+    // TODO/now: unify with esbuildCache
     vikeConfigDependencies.clear();
     vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, true, vikeVitePluginOptions);
     handleReloadSideEffects();
@@ -126,7 +127,8 @@ async function loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePlug
                     configDefinitions: {},
                     configValueSources: {}
                 },
-                global: getPageConfigUserFriendlyNew({ configValues: {} })
+                global: getPageConfigGlobalUserFriendly({ pageConfigGlobalValues: {} }),
+                pages: {}
             };
             return dummyData;
         }
@@ -135,15 +137,20 @@ async function loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePlug
 async function loadVikeConfig(userRootDir, vikeVitePluginOptions) {
     const esbuildCache = {};
     const plusFilesAll = await 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 = getPageConfigUserFriendlyNew({ configValues });
-    return { pageConfigs, pageConfigGlobal, global };
+    const pageConfigGlobalValues = getConfigValues(pageConfigGlobal);
+    const global = getPageConfigGlobalUserFriendly({ pageConfigGlobalValues });
+    // pages
+    const pages = objectFromEntries(pageConfigs.map((pageConfig) => {
+        const pageConfigValues = getConfigValues(pageConfig, true);
+        return getPageConfigUserFriendly(pageConfigGlobalValues, pageConfig, pageConfigValues);
+    }));
+    return { pageConfigs, pageConfigGlobal, global, pages };
 }
 async function resolveConfigDefinitions(plusFilesAll, userRootDir, esbuildCache) {
     const configDefinitionsGlobal = getConfigDefinitions(
@@ -206,13 +213,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,
@@ -229,10 +235,9 @@ function assertPageConfigGlobal(pageConfigGlobal, plusFilesAll) {
     });
 }
 function assertGlobalConfigLocation(configName, sources, plusFilesAll, configDefinitionsGlobal) {
-    const locationIdsAll = objectKeys(plusFilesAll);
     // Determine existing global +config.js files
     const configFilePathsGlobal = [];
-    const plusFilesGlobal = Object.values(objectFromEntries(objectEntries(plusFilesAll).filter(([locationId]) => isGlobalLocation(locationId, locationIdsAll)))).flat();
+    const plusFilesGlobal = Object.values(objectFromEntries(objectEntries(plusFilesAll).filter(([locationId]) => isGlobalLocation(locationId, plusFilesAll)))).flat();
     plusFilesGlobal
         .filter((i) => i.isConfigFile)
         .forEach((plusFile) => {
@@ -251,7 +256,7 @@ function assertGlobalConfigLocation(configName, sources, plusFilesAll, configDef
         if (!filePathAbsoluteUserRootDir)
             return;
         assert(!plusFile.isExtensionConfig);
-        if (!isGlobalLocation(source.locationId, locationIdsAll)) {
+        if (!isGlobalLocation(source.locationId, plusFilesAll)) {
             const configDef = configDefinitionsGlobal[configName];
             assert(configDef);
             const isConditionallyGlobal = isCallable(configDef.global);
@@ -284,7 +289,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
     assertUsage(!(onBeforeRenderEnv.client && !isClientRouting), `Page ${pageConfig.pageId} has an onBeforeRender() hook with env ${pc.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 = {};
     getConfigValuesBase(pageConfig, (configEnv) => !!configEnv.config, null).forEach((entry) => {
         if (entry.configValueBase.type === 'computed') {
@@ -295,7 +300,11 @@ function getConfigValues(pageConfig) {
         if (entry.configValueBase.type === 'standard') {
             assert('sourceRelevant' in entry); // Help TS
             const { configValueBase, sourceRelevant, configName } = entry;
-            assert('value' in sourceRelevant);
+            if (!sourceRelevant.valueIsLoaded) {
+                if (tolerateMissingValue)
+                    return;
+                assert(false);
+            }
             const { value } = sourceRelevant;
             configValues[configName] = { ...configValueBase, value };
         }
@@ -304,9 +313,18 @@ function getConfigValues(pageConfig) {
             const { configValueBase, sourcesRelevant, configName } = entry;
             const values = [];
             sourcesRelevant.forEach((source) => {
-                assert('value' in source);
+                if (!source.valueIsLoaded) {
+                    if (tolerateMissingValue)
+                        return;
+                    assert(false);
+                }
                 values.push(source.value);
             });
+            if (values.length === 0) {
+                if (tolerateMissingValue)
+                    return;
+                assert(false);
+            }
             configValues[configName] = { ...configValueBase, value: values };
         }
     });
@@ -351,10 +369,9 @@ function getPlusFilesRelevant(plusFilesAll, locationIdPage) {
     return plusFilesRelevant;
 }
 function sortForGlobal(plusFilesAll) {
-    const locationIdsAll = objectKeys(plusFilesAll);
     const plusFilesAllSorted = Object.fromEntries(objectEntries(plusFilesAll)
         .sort(lowerFirst(([locationId]) => locationId.split('/').length))
-        .sort(makeFirst(([locationId]) => isGlobalLocation(locationId, locationIdsAll))));
+        .sort(makeFirst(([locationId]) => isGlobalLocation(locationId, plusFilesAll))));
     return plusFilesAllSorted;
 }
 function resolveConfigValueSources(configName, configDef, plusFilesRelevant, userRootDir, isGlobal) {
@@ -748,13 +765,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);
-    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);
+    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) => {
@@ -926,3 +943,10 @@ function resolveConfigEnv(configEnv, filePath) {
     }
     return configEnvResolved;
 }
+/** Whether configs defined in `locationId` apply to every page */
+function isGlobalLocation(locationId, plusFilesAll) {
+    const locationIdsPage = objectEntries(plusFilesAll)
+        .filter(([_locationId, plusFiles]) => isDefiningPage(plusFiles))
+        .map(([locationId]) => locationId);
+    return locationIdsPage.every((locId) => isInherited(locationId, locId));
+}

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

@@ -16,23 +16,25 @@ export { assertBuildInfo };
 export { getViteConfigRuntime };
 export { updateUserFiles };
 export type { BuildInfo };
-export type { GlobalContext };
+export type { GlobalContextInternal };
 export type { GlobalContextPublic };
 import type { ViteManifest } from '../shared/ViteManifest.js';
 import type { ResolvedConfig, ViteDevServer } from 'vite';
-import type { ConfigUserFriendly } from '../../shared/page-configs/getPageConfigUserFriendly.js';
+import type { PageConfigUserFriendly, PageConfigsUserFriendly } from '../../shared/page-configs/getPageConfigUserFriendly.js';
 import type { ConfigVitePluginServerEntry } from '@brillout/vite-plugin-server-entry/plugin';
-type GlobalContextPublic = Pick<GlobalContext, 'assetsManifest' | 'config' | 'viteConfig'>;
+import { type BaseUrlsResolved } from '../shared/resolveBase.js';
+type GlobalContextPublic = Pick<GlobalContext, 'assetsManifest' | 'config' | 'viteConfig' | 'pages' | 'baseAssets' | 'baseServer'>;
 type PageRuntimeInfo = Awaited<ReturnType<typeof getUserFiles>>;
-type GlobalContext = GlobalContextWithoutPublicCopy & {
+type GlobalContextInternal = GlobalContext & {
     globalContext_public: GlobalContextPublic;
 };
-type GlobalContextWithoutPublicCopy = {
+type GlobalContext = {
     viteConfigRuntime: {
         _baseViteOriginal: null | string;
     };
-    config: ConfigUserFriendly['config'];
-} & PageRuntimeInfo & ({
+    config: PageConfigUserFriendly['config'];
+    pages: PageConfigsUserFriendly;
+} & BaseUrlsResolved & PageRuntimeInfo & ({
     isProduction: false;
     isPrerendering: false;
     viteConfig: ResolvedConfig;
@@ -50,7 +52,7 @@ type GlobalContextWithoutPublicCopy = {
     usesClientRouter: boolean;
     viteConfig: ResolvedConfig;
 })));
-declare function getGlobalContextInternal(): Promise<GlobalContext>;
+declare function getGlobalContextInternal(): Promise<GlobalContextInternal>;
 /** @experimental https://vike.dev/getGlobalContext */
 declare function getGlobalContextSync(): GlobalContextPublic;
 /** @experimental https://vike.dev/getGlobalContext */
@@ -71,6 +73,7 @@ declare function getUserFiles(): Promise<{
     allPageIds: string[];
     pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
     onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
+    pages: PageConfigsUserFriendly;
     config: import("../../shared/page-configs/Config/PageContextConfig.js").ConfigResolved;
 }>;
 declare function setGlobalContext_buildEntry(buildEntry: unknown): Promise<void>;