vike 0.4.221-commit-ab9e52a → 0.4.221-commit-937dbfb

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

@@ -12,6 +12,7 @@ const util_1 = require("util");
 const transpileAndExecuteFile_js_1 = require("./transpileAndExecuteFile.js");
 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');
 let gitIsNotUsable = false;
@@ -35,17 +36,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;
+    (0, utils_js_1.assert)(files);
+    if (debug.isActivated)
+        (0, utils_js_1.assert)((0, utils_js_1.deepEqual)(filesGlob, filesGit), "Git and glob results aren't matching.");
     // Filter build files
     files = files.filter((filePath) => !(0, transpileAndExecuteFile_js_1.isTemporaryBuildFile)(filePath));
     // Normalize
@@ -74,7 +74,7 @@ async function gitLsFiles(userRootDir, outDirRelativeFromUserRootDir) {
         preserveUTF8,
         'ls-files',
         // Performance gain seems negligible: https://github.com/vikejs/vike/pull/1688#issuecomment-2166206648
-        ...utils_js_1.scriptFileExtensionList.map((ext) => `"**/+*.${ext}"`),
+        ...utils_js_1.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?
@@ -101,6 +101,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?
@@ -121,14 +127,21 @@ async function gitLsFiles(userRootDir, outDirRelativeFromUserRootDir) {
 }
 // Same as gitLsFiles() but using fast-glob
 async function fastGlob(userRootDir, outDirRelativeFromUserRootDir) {
-    const files = await (0, fast_glob_1.default)(`**/+*.${utils_js_1.scriptFileExtensions}`, {
+    const pattern = `**/+*.${utils_js_1.scriptFileExtensions}`;
+    const options = {
         ignore: getIgnoreAsPatterns(outDirRelativeFromUserRootDir),
         cwd: userRootDir,
         dot: false
-    });
+    };
+    const files = await (0, fast_glob_1.default)(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

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

@@ -8,7 +8,6 @@ exports.getFilesystemRouteDefinedBy = getFilesystemRouteDefinedBy;
 exports.isInherited = isInherited;
 exports.getLocationId = getLocationId;
 exports.sortAfterInheritanceOrder = sortAfterInheritanceOrder;
-exports.isGlobalLocation = isGlobalLocation;
 exports.applyFilesystemRoutingRootEffect = applyFilesystemRoutingRootEffect;
 exports.getLogicalPath = getLogicalPath;
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
@@ -45,10 +44,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/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/loadFileAtConfigTime.js

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

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

@@ -26,7 +26,7 @@ const debug = (0, utils_js_1.createDebugger)('vike:pointer-imports');
 const debugEsbuildResolve = (0, utils_js_1.createDebugger)('vike:esbuild-resolve');
 if (debugEsbuildResolve.isActivated)
     debugEsbuildResolve('esbuild version', esbuild_1.version);
-async function transpileAndExecuteFile(filePath, userRootDir, isConfigFile, esbuildCache) {
+async function transpileAndExecuteFile(filePath, userRootDir, isExtensionConfig, esbuildCache) {
     const { filePathAbsoluteFilesystem, filePathToShowToUserResolved } = filePath;
     const fileExtension = getFileExtension(filePathAbsoluteFilesystem);
     if (esbuildCache[filePathAbsoluteFilesystem]) {
@@ -40,12 +40,12 @@ async function transpileAndExecuteFile(filePath, userRootDir, isConfigFile, esbu
         (0, utils_js_1.assertWarning)(false, `${picocolors_1.default.cyan('.h.js')} files are deprecated: simply renaming ${filePathToShowToUserResolved} to ${removeHeaderFileExtension(filePathToShowToUserResolved)} is usually enough, although you may occasionally need to use ${picocolors_1.default.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);
     }
@@ -338,6 +338,7 @@ function isTemporaryBuildFile(filePath) {
     const fileName = path_1.default.posix.basename(filePath);
     return /\.build-[a-z0-9]{12}\.mjs$/.test(fileName);
 }
+// TODO/next-major: remove
 function isHeaderFile(filePath) {
     (0, utils_js_1.assertPosixPath)(filePath);
     const fileExtensions = getFileExtensions(filePath);

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

@@ -141,7 +141,7 @@ 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);
+    // assertKnownConfigs(plusFilesAll)
     const configDefinitionsResolved = await resolveConfigDefinitions(plusFilesAll, userRootDir, esbuildCache);
     const { pageConfigGlobal, pageConfigs } = getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRootDir);
     // interop vike(options) in vite.config.js
@@ -235,10 +235,9 @@ function assertPageConfigGlobal(pageConfigGlobal, plusFilesAll) {
     });
 }
 function assertGlobalConfigLocation(configName, sources, plusFilesAll, configDefinitionsGlobal) {
-    const locationIdsAll = (0, utils_js_1.objectKeys)(plusFilesAll);
     // Determine existing global +config.js files
     const configFilePathsGlobal = [];
-    const plusFilesGlobal = Object.values((0, utils_js_1.objectFromEntries)((0, utils_js_1.objectEntries)(plusFilesAll).filter(([locationId]) => (0, filesystemRouting_js_1.isGlobalLocation)(locationId, locationIdsAll)))).flat();
+    const plusFilesGlobal = Object.values((0, utils_js_1.objectFromEntries)((0, utils_js_1.objectEntries)(plusFilesAll).filter(([locationId]) => isGlobalLocation(locationId, plusFilesAll)))).flat();
     plusFilesGlobal
         .filter((i) => i.isConfigFile)
         .forEach((plusFile) => {
@@ -257,7 +256,7 @@ function assertGlobalConfigLocation(configName, sources, plusFilesAll, configDef
         if (!filePathAbsoluteUserRootDir)
             return;
         (0, utils_js_1.assert)(!plusFile.isExtensionConfig);
-        if (!(0, filesystemRouting_js_1.isGlobalLocation)(source.locationId, locationIdsAll)) {
+        if (!isGlobalLocation(source.locationId, plusFilesAll)) {
             const configDef = configDefinitionsGlobal[configName];
             (0, utils_js_1.assert)(configDef);
             const isConditionallyGlobal = (0, utils_js_1.isCallable)(configDef.global);
@@ -360,7 +359,7 @@ 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]) => (0, filesystemRouting_js_1.isGlobalLocation)(locationId, locationIdsAll))));
+        .sort((0, utils_js_1.makeFirst)(([locationId]) => isGlobalLocation(locationId, plusFilesAll))));
     return plusFilesAllSorted;
 }
 function resolveConfigValueSources(configName, configDef, plusFilesRelevant, userRootDir, isGlobal) {
@@ -932,3 +931,10 @@ function resolveConfigEnv(configEnv, filePath) {
     }
     return configEnvResolved;
 }
+/** Whether configs defined in `locationId` apply to every page */
+function isGlobalLocation(locationId, plusFilesAll) {
+    const locationIdsPage = (0, utils_js_1.objectEntries)(plusFilesAll)
+        .filter(([_locationId, plusFiles]) => isDefiningPage(plusFiles))
+        .map(([locationId]) => locationId);
+    return locationIdsPage.every((locId) => (0, filesystemRouting_js_1.isInherited)(locationId, locId));
+}

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

@@ -14,7 +14,7 @@ async function loadUserFilesServerSide(pageContext) {
     const pageConfig = (0, findPageConfig_js_1.findPageConfig)(pageContext._pageConfigs, pageContext.pageId); // Make pageConfig globally available as pageContext._pageConfig?
     const globalContext = pageContext._globalContext;
     const [{ pageFilesLoaded, pageContextExports }] = await Promise.all([
-        loadPageUserFiles(pageContext._pageFilesAll, pageConfig, pageContext.pageId, !globalContext.isProduction),
+        loadPageUserFiles(pageContext._pageFilesAll, pageConfig, globalContext.pageConfigGlobal, pageContext.pageId, !globalContext.isProduction),
         (0, analyzePageClientSide_js_1.analyzePageClientSideInit)(pageContext._pageFilesAll, pageContext.pageId, { sharedPageFilesAlreadyLoaded: true })
     ]);
     const { isHtmlOnly, isClientRouting, clientEntries, clientDependencies, pageFilesClientSide, pageFilesServerSide } = await (0, analyzePage_js_1.analyzePage)(pageContext._pageFilesAll, pageConfig, pageContext.pageId, globalContext);
@@ -98,11 +98,11 @@ async function loadUserFilesServerSide(pageContext) {
     }
     return pageContextAddendum;
 }
-async function loadPageUserFiles(pageFilesAll, pageConfig, pageId, isDev) {
+async function loadPageUserFiles(pageFilesAll, pageConfig, pageConfigGlobal, pageId, isDev) {
     const pageFilesServerSide = (0, getPageFiles_js_1.getPageFilesServerSide)(pageFilesAll, pageId);
     const pageConfigLoaded = !pageConfig ? null : await (0, loadConfigValues_js_1.loadConfigValues)(pageConfig, isDev);
     await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
-    const pageContextExports = (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyOld)(pageFilesServerSide, pageConfigLoaded);
+    const pageContextExports = (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyOld)(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
     return {
         pageContextExports,
         pageFilesLoaded: pageFilesServerSide

package/dist/cjs/shared/page-configs/getPageConfigUserFriendly.js

@@ -19,7 +19,7 @@ function getPageConfigUserFriendlyNew(pageConfig) {
         _from: res.from
     };
 }
-function getPageConfigUserFriendlyOld(pageFiles, pageConfig) {
+function getPageConfigUserFriendlyOld(pageFiles, pageConfig, pageConfigGlobal) {
     const config = {};
     const configEntries = {}; // TODO/v1-release: remove
     const exportsAll = {}; // TODO/v1-release: remove
@@ -44,7 +44,9 @@ function getPageConfigUserFriendlyOld(pageFiles, pageConfig) {
     let sources;
     let from;
     if (pageConfig) {
-        const res = getPageConfigUserFriendlyV1Desin(pageConfig);
+        const res = getPageConfigUserFriendlyV1Desin({
+            configValues: { ...pageConfigGlobal.configValues, ...pageConfig.configValues }
+        });
         source = res.source;
         sources = res.sources;
         from = res.from;

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.221-commit-ab9e52a';
+exports.PROJECT_VERSION = '0.4.221-commit-937dbfb';

package/dist/cjs/utils/debug.js

@@ -17,6 +17,7 @@ const isArray_js_1 = require("./isArray.js");
 (0, assert_js_1.assert)(!(0, isBrowser_js_1.isBrowser)());
 globalThis.__brillout_debug_createDebugger = createDebugger;
 const flags = [
+    'vike:crawl',
     'vike:error',
     'vike:esbuild-resolve',
     'vike:extractAssets',

package/dist/esm/client/client-routing-runtime/prefetch.js

@@ -45,7 +45,7 @@ function getPageContextPrefetched(pageContext) {
 }
 async function prefetchAssets(pageContextLink) {
     try {
-        await loadUserFilesClientSide(pageContextLink.pageId, pageContextLink._pageFilesAll, pageContextLink._pageConfigs);
+        await loadUserFilesClientSide(pageContextLink.pageId, pageContextLink._pageFilesAll, pageContextLink._pageConfigs, pageContextLink._pageConfigGlobal);
     }
     catch (err) {
         if (isErrorFetchingStaticAssets(err)) {

package/dist/esm/client/client-routing-runtime/renderPageClientSide.js

@@ -131,7 +131,7 @@ async function renderPageClientSide(renderArgs) {
             objectAssign(pageContext, pageContextFromRoute);
         }
         try {
-            objectAssign(pageContext, await loadUserFilesClientSide(pageContext.pageId, pageContext._pageFilesAll, pageContext._pageConfigs));
+            objectAssign(pageContext, await loadUserFilesClientSide(pageContext.pageId, pageContext._pageFilesAll, pageContext._pageConfigs, pageContext._pageConfigGlobal));
         }
         catch (err) {
             if (handleErrorFetchingStaticAssets(err, pageContext, isFirstRender)) {
@@ -336,7 +336,7 @@ async function renderPageClientSide(renderArgs) {
             return;
         }
         try {
-            objectAssign(pageContext, await loadUserFilesClientSide(pageContext.pageId, pageContext._pageFilesAll, pageContext._pageConfigs));
+            objectAssign(pageContext, await loadUserFilesClientSide(pageContext.pageId, pageContext._pageFilesAll, pageContext._pageConfigs, pageContext._pageConfigGlobal));
         }
         catch (err) {
             if (handleErrorFetchingStaticAssets(err, pageContext, isFirstRender)) {

package/dist/esm/client/server-routing-runtime/getPageContext.d.ts

@@ -10,6 +10,7 @@ declare function getPageContext(): Promise<{
 } & {
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
     _pageConfigs: import("../../__internal/index.js").PageConfig[];
+    _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
 } & import("../../shared/getPageFiles.js").PageConfigUserFriendly & {
     _pageFilesLoaded: import("../../shared/getPageFiles.js").PageFile[];
 }>;

package/dist/esm/client/server-routing-runtime/getPageContext.js

@@ -6,7 +6,7 @@ import { getCurrentUrl } from '../shared/getCurrentUrl.js';
 import { getPageConfigsRuntime } from '../../shared/getPageConfigsRuntime.js';
 // @ts-ignore
 import * as virtualFileExports from 'virtual:vike:importUserCode:client:server-routing';
-const { pageFilesAll, pageConfigs } = getPageConfigsRuntime(virtualFileExports);
+const { pageFilesAll, pageConfigs, pageConfigGlobal } = getPageConfigsRuntime(virtualFileExports);
 const urlFirst = getCurrentUrl({ withoutHash: true });
 async function getPageContext() {
     const pageContext = getPageContextSerializedInHtml();
@@ -28,9 +28,10 @@ async function loadPageUserFiles(pageId) {
     const pageContextAddendum = {};
     objectAssign(pageContextAddendum, {
         _pageFilesAll: pageFilesAll,
-        _pageConfigs: pageConfigs
+        _pageConfigs: pageConfigs,
+        _pageConfigGlobal: pageConfigGlobal
     });
-    objectAssign(pageContextAddendum, await loadUserFilesClientSide(pageId, pageContextAddendum._pageFilesAll, pageContextAddendum._pageConfigs));
+    objectAssign(pageContextAddendum, await loadUserFilesClientSide(pageId, pageContextAddendum._pageFilesAll, pageContextAddendum._pageConfigs, pageContextAddendum._pageConfigGlobal));
     pageFilesAll
         .filter((p) => p.fileType !== '.page.server')
         .forEach((p) => {

package/dist/esm/client/shared/loadUserFilesClientSide.d.ts

@@ -2,13 +2,14 @@ export { loadUserFilesClientSide };
 export { isErrorFetchingStaticAssets };
 export type { PageContextUserFiles };
 import { type PageFile, type PageConfigUserFriendly } from '../../shared/getPageFiles.js';
-import type { PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
+import type { PageConfigGlobalRuntime, PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
 type PageContextUserFilesLoaded = PageConfigUserFriendly & {
     _pageFilesLoaded: PageFile[];
 };
 type PageContextUserFiles = {
     _pageFilesAll: PageFile[];
     _pageConfigs: PageConfigRuntime[];
+    _pageConfigGlobal: PageConfigGlobalRuntime;
 };
-declare function loadUserFilesClientSide(pageId: string, pageFilesAll: PageFile[], pageConfigs: PageConfigRuntime[]): Promise<PageContextUserFilesLoaded>;
+declare function loadUserFilesClientSide(pageId: string, pageFilesAll: PageFile[], pageConfigs: PageConfigRuntime[], pageConfigGlobal: PageConfigGlobalRuntime): Promise<PageContextUserFilesLoaded>;
 declare function isErrorFetchingStaticAssets(err: unknown): boolean;

package/dist/esm/client/shared/loadUserFilesClientSide.js

@@ -6,7 +6,7 @@ import { findPageConfig } from '../../shared/page-configs/findPageConfig.js';
 import { loadConfigValues } from '../../shared/page-configs/loadConfigValues.js';
 import { objectAssign } from '../server-routing-runtime/utils.js';
 const stamp = '__whileFetchingAssets';
-async function loadUserFilesClientSide(pageId, pageFilesAll, pageConfigs) {
+async function loadUserFilesClientSide(pageId, pageFilesAll, pageConfigs, pageConfigGlobal) {
     const pageFilesClientSide = getPageFilesClientSide(pageFilesAll, pageId);
     const pageConfig = findPageConfig(pageConfigs, pageId);
     let pageConfigLoaded;
@@ -30,7 +30,7 @@ async function loadUserFilesClientSide(pageId, pageFilesAll, pageConfigs) {
         }
         throw err;
     }
-    const pageContextExports = getPageConfigUserFriendlyOld(pageFilesClientSide, pageConfigLoaded);
+    const pageContextExports = getPageConfigUserFriendlyOld(pageFilesClientSide, pageConfigLoaded, pageConfigGlobal);
     const pageContextAddendum = {};
     objectAssign(pageContextAddendum, pageContextExports);
     objectAssign(pageContextAddendum, { _pageFilesLoaded: pageFilesClientSide });

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

@@ -1,5 +1,5 @@
 export { crawlPlusFiles };
-import { assertPosixPath, assert, scriptFileExtensions, assertIsSingleModuleInstance, assertIsNotProductionRuntime, isVersionOrAbove, isScriptFile, scriptFileExtensionList } from '../../../../utils.js';
+import { assertPosixPath, assert, scriptFileExtensions, assertIsSingleModuleInstance, assertIsNotProductionRuntime, isVersionOrAbove, isScriptFile, scriptFileExtensionList, createDebugger, deepEqual } from '../../../../utils.js';
 import path from 'path';
 import glob from 'fast-glob';
 import { exec } from 'child_process';
@@ -7,6 +7,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 +31,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
@@ -69,7 +69,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 +96,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 +122,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

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/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,7 +21,7 @@ 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;
     const fileExtension = getFileExtension(filePathAbsoluteFilesystem);
     if (esbuildCache[filePathAbsoluteFilesystem]) {
@@ -35,12 +35,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);
     }
@@ -333,6 +333,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.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';
@@ -135,7 +135,7 @@ async function loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePlug
 async function loadVikeConfig(userRootDir, vikeVitePluginOptions) {
     const esbuildCache = {};
     const plusFilesAll = await getPlusFilesAll(userRootDir, esbuildCache);
-    assertKnownConfigs(plusFilesAll);
+    // assertKnownConfigs(plusFilesAll)
     const configDefinitionsResolved = await resolveConfigDefinitions(plusFilesAll, userRootDir, esbuildCache);
     const { pageConfigGlobal, pageConfigs } = getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRootDir);
     // interop vike(options) in vite.config.js
@@ -229,10 +229,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 +250,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);
@@ -354,7 +353,7 @@ 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) {
@@ -926,3 +925,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/renderPage/loadUserFilesServerSide.js

@@ -12,7 +12,7 @@ async function loadUserFilesServerSide(pageContext) {
     const pageConfig = findPageConfig(pageContext._pageConfigs, pageContext.pageId); // Make pageConfig globally available as pageContext._pageConfig?
     const globalContext = pageContext._globalContext;
     const [{ pageFilesLoaded, pageContextExports }] = await Promise.all([
-        loadPageUserFiles(pageContext._pageFilesAll, pageConfig, pageContext.pageId, !globalContext.isProduction),
+        loadPageUserFiles(pageContext._pageFilesAll, pageConfig, globalContext.pageConfigGlobal, pageContext.pageId, !globalContext.isProduction),
         analyzePageClientSideInit(pageContext._pageFilesAll, pageContext.pageId, { sharedPageFilesAlreadyLoaded: true })
     ]);
     const { isHtmlOnly, isClientRouting, clientEntries, clientDependencies, pageFilesClientSide, pageFilesServerSide } = await analyzePage(pageContext._pageFilesAll, pageConfig, pageContext.pageId, globalContext);
@@ -96,11 +96,11 @@ async function loadUserFilesServerSide(pageContext) {
     }
     return pageContextAddendum;
 }
-async function loadPageUserFiles(pageFilesAll, pageConfig, pageId, isDev) {
+async function loadPageUserFiles(pageFilesAll, pageConfig, pageConfigGlobal, pageId, isDev) {
     const pageFilesServerSide = getPageFilesServerSide(pageFilesAll, pageId);
     const pageConfigLoaded = !pageConfig ? null : await loadConfigValues(pageConfig, isDev);
     await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
-    const pageContextExports = getPageConfigUserFriendlyOld(pageFilesServerSide, pageConfigLoaded);
+    const pageContextExports = getPageConfigUserFriendlyOld(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
     return {
         pageContextExports,
         pageFilesLoaded: pageFilesServerSide

package/dist/esm/shared/page-configs/getPageConfigUserFriendly.d.ts

@@ -9,7 +9,7 @@ export type { ExportsAll };
 export type { ConfigEntries };
 import type { FileType } from '../getPageFiles/fileTypes.js';
 import type { PageFile } from '../getPageFiles/getPageFileObject.js';
-import type { ConfigValues, PageConfigRuntimeLoaded } from './PageConfig.js';
+import type { ConfigValues, PageConfigGlobalRuntime, PageConfigRuntimeLoaded } from './PageConfig.js';
 import { type ConfigDefinedAtOptional } from './getConfigDefinedAt.js';
 import type { ConfigResolved } from './Config/PageContextConfig.js';
 type ExportsAll = Record<string, {
@@ -82,4 +82,4 @@ type ConfigUserFriendly = {
 declare function getPageConfigUserFriendlyNew(pageConfig: {
     configValues: ConfigValues;
 }): ConfigUserFriendly;
-declare function getPageConfigUserFriendlyOld(pageFiles: PageFile[], pageConfig: PageConfigRuntimeLoaded | null): PageConfigUserFriendly;
+declare function getPageConfigUserFriendlyOld(pageFiles: PageFile[], pageConfig: PageConfigRuntimeLoaded | null, pageConfigGlobal: PageConfigGlobalRuntime): PageConfigUserFriendly;

package/dist/esm/shared/page-configs/getPageConfigUserFriendly.js

@@ -14,7 +14,7 @@ function getPageConfigUserFriendlyNew(pageConfig) {
         _from: res.from
     };
 }
-function getPageConfigUserFriendlyOld(pageFiles, pageConfig) {
+function getPageConfigUserFriendlyOld(pageFiles, pageConfig, pageConfigGlobal) {
     const config = {};
     const configEntries = {}; // TODO/v1-release: remove
     const exportsAll = {}; // TODO/v1-release: remove
@@ -39,7 +39,9 @@ function getPageConfigUserFriendlyOld(pageFiles, pageConfig) {
     let sources;
     let from;
     if (pageConfig) {
-        const res = getPageConfigUserFriendlyV1Desin(pageConfig);
+        const res = getPageConfigUserFriendlyV1Desin({
+            configValues: { ...pageConfigGlobal.configValues, ...pageConfig.configValues }
+        });
         source = res.source;
         sources = res.sources;
         from = res.from;

package/dist/esm/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.221-commit-ab9e52a";
+export declare const PROJECT_VERSION: "0.4.221-commit-937dbfb";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.221-commit-ab9e52a';
+export const PROJECT_VERSION = '0.4.221-commit-937dbfb';

package/dist/esm/utils/debug.d.ts

@@ -1,7 +1,7 @@
 export { createDebugger };
 export { isDebugActivated };
 export type { Debug };
-declare const flags: readonly ["vike:error", "vike:esbuild-resolve", "vike:extractAssets", "vike:extractExportNames", "vike:glob", "vike:globalContext", "vike:log", "vike:optimizeDeps", "vike:outDir", "vike:pageFiles", "vike:pointer-imports", "vike:routing", "vike:setup", "vike:stream", "vike:virtual-files"];
+declare const flags: readonly ["vike:crawl", "vike:error", "vike:esbuild-resolve", "vike:extractAssets", "vike:extractExportNames", "vike:glob", "vike:globalContext", "vike:log", "vike:optimizeDeps", "vike:outDir", "vike:pageFiles", "vike:pointer-imports", "vike:routing", "vike:setup", "vike:stream", "vike:virtual-files"];
 type Flag = (typeof flags)[number];
 type Debug = ReturnType<typeof createDebugger>;
 type Options = {

package/dist/esm/utils/debug.js

@@ -12,6 +12,7 @@ import { isArray } from './isArray.js';
 assert(!isBrowser());
 globalThis.__brillout_debug_createDebugger = createDebugger;
 const flags = [
+    'vike:crawl',
     'vike:error',
     'vike:esbuild-resolve',
     'vike:extractAssets',

package/dist/esm/utils/projectInfo.d.ts

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.221-commit-ab9e52a";
+    projectVersion: "0.4.221-commit-937dbfb";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.221-commit-ab9e52a",
+  "version": "0.4.221-commit-937dbfb",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {