vike 0.4.237 → 0.4.238-commit-3c1a09d

package/dist/cjs/node/vite/plugins/pluginVirtualFiles/getConfigValueSourcesRelevant.js

@@ -1,30 +1,49 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getConfigValueSourcesRelevant = getConfigValueSourcesRelevant;
+exports.getConfigValueSourceRelevantAnyEnv = getConfigValueSourceRelevantAnyEnv;
 exports.isRuntimeEnvMatch = isRuntimeEnvMatch;
+exports.isConfigSourceValueNull = isConfigSourceValueNull;
 const utils_js_1 = require("../../utils.js");
+(0, utils_js_1.assertIsNotBrowser)();
 function getConfigValueSourcesRelevant(configName, runtimeEnv, pageConfig) {
     const configDef = pageConfig.configDefinitions[configName];
     (0, utils_js_1.assert)(configDef);
     let sourcesRelevant = pageConfig.configValueSources[configName];
     if (!sourcesRelevant)
         return [];
-    if (!configDef.cumulative) {
+    // Ignore configs with value `undefined`
+    sourcesRelevant = sourcesRelevant.filter((source) => !isConfigSourceValueUndefined(source));
+    // Environment filtering
+    sourcesRelevant = sourcesRelevant.filter((source) => isRuntimeEnvMatch(source.configEnv, runtimeEnv));
+    // Overriding - non-cumulative configs
+    if (!configDef.cumulative && sourcesRelevant.length > 1) {
         const source = sourcesRelevant[0];
-        if (source) {
-            sourcesRelevant = [source];
-        }
-        else {
-            (0, utils_js_1.assert)(sourcesRelevant.length === 0);
-        }
+        (0, utils_js_1.assert)(source);
+        sourcesRelevant = [source];
     }
-    else {
-        // isOverridden() must be called before isRuntimeEnvMatch() is called (otherwise isOverridden() will return a wrong value)
-        sourcesRelevant = sourcesRelevant.filter((source) => !isOverridden(source, configName, pageConfig));
+    // Overriding - cumulative configs
+    if (configDef.cumulative && sourcesRelevant.length > 0) {
+        sourcesRelevant = applyFilenameSuffix(sourcesRelevant);
     }
-    sourcesRelevant = sourcesRelevant.filter((source) => isRuntimeEnvMatch(source.configEnv, runtimeEnv));
     return sourcesRelevant;
 }
+function getConfigValueSourceRelevantAnyEnv(configName, pageConfig) {
+    const configDef = pageConfig.configDefinitions[configName];
+    (0, utils_js_1.assert)(configDef);
+    (0, utils_js_1.assert)(!configDef.cumulative); // So far, this function is only used by non-cumulative configs
+    let sourcesRelevant = pageConfig.configValueSources[configName];
+    if (!sourcesRelevant)
+        return null;
+    // Ignore configs with value `undefined`
+    sourcesRelevant = sourcesRelevant.filter((source) => !isConfigSourceValueUndefined(source));
+    const source = sourcesRelevant[0];
+    if (!source)
+        return null;
+    if (isConfigSourceValueNull(source))
+        return null;
+    return source;
+}
 function isRuntimeEnvMatch(configEnv, runtimeEnv) {
     if ('isForConfig' in runtimeEnv)
         return !!configEnv.config;
@@ -54,14 +73,25 @@ function isRuntimeEnvMatch(configEnv, runtimeEnv) {
     }
     return true;
 }
-function isOverridden(source, configName, pageConfig) {
-    const configDef = pageConfig.configDefinitions[configName];
-    (0, utils_js_1.assert)(configDef);
-    if (configDef.cumulative)
-        return false;
-    const sources = pageConfig.configValueSources[configName];
-    (0, utils_js_1.assert)(sources);
-    const idx = sources.indexOf(source);
-    (0, utils_js_1.assert)(idx >= 0);
-    return idx > 0;
+// Setting a config to `undefined` should be equivalent to not setting it at all
+function isConfigSourceValueUndefined(source) {
+    if (!source.valueIsLoaded)
+        return null;
+    return source.value === undefined;
+}
+// Setting a config to `null` enables the user to suppress inherited config by overriding it with `null` (this only works when setting the config value to `null` inside a +config.js file — it doesn't work when setting the config value to `null` with a +{configName}.js file).
+function isConfigSourceValueNull(source) {
+    if (!source.valueIsLoaded)
+        return null;
+    return source.value === null;
+}
+function applyFilenameSuffix(sourcesRelevant) {
+    const getFileName = (source) => source.plusFile?.filePath.fileName ?? '';
+    // Apply `clear`: truncate at first clear file
+    const clearIndex = sourcesRelevant.findIndex((source) => getFileName(source).includes('.clear.'));
+    if (clearIndex !== -1)
+        sourcesRelevant = sourcesRelevant.slice(0, clearIndex + 1);
+    // Apply `default`: exclude defaults if any non-defaults exist, otherwise keep only first default
+    const nonDefaults = sourcesRelevant.filter((source) => !getFileName(source).includes('.default.'));
+    return nonDefaults.length > 0 ? nonDefaults : sourcesRelevant.slice(0, 1);
 }

package/dist/cjs/node/vite/plugins/pluginVirtualFiles.js

@@ -5,11 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginVirtualFiles = pluginVirtualFiles;
 const vite_1 = require("vite");
-const getVirtualFilePageConfigLazy_js_1 = require("./pluginVirtualFiles/getVirtualFilePageConfigLazy.js");
-const getVirtualFileEntry_js_1 = require("./pluginVirtualFiles/getVirtualFileEntry.js");
+const generateVirtualFilePageEntry_js_1 = require("./pluginVirtualFiles/generateVirtualFilePageEntry.js");
+const generateVirtualFileGlobalEntryWithOldDesign_js_1 = require("./pluginVirtualFiles/generateVirtualFileGlobalEntryWithOldDesign.js");
 const utils_js_1 = require("../utils.js");
-const virtualFilePageConfigLazy_js_1 = require("../../shared/virtualFiles/virtualFilePageConfigLazy.js");
-const virtualFileEntry_js_1 = require("../../shared/virtualFiles/virtualFileEntry.js");
+const virtualFileId_js_1 = require("../../shared/virtualFileId.js");
 const resolveVikeConfigInternal_js_1 = require("../shared/resolveVikeConfigInternal.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const loggerNotProd_js_1 = require("../shared/loggerNotProd.js");
@@ -49,13 +48,16 @@ function pluginVirtualFiles() {
             id = (0, utils_js_1.removeVirtualFileIdPrefix)(id);
             const isDev = config._isDev;
             (0, utils_js_1.assert)(typeof isDev === 'boolean');
-            if ((0, virtualFilePageConfigLazy_js_1.isVirtualFileIdPageConfigLazy)(id)) {
-                const code = await (0, getVirtualFilePageConfigLazy_js_1.getVirtualFilePageConfigLazy)(id, isDev, config);
-                return code;
-            }
-            if ((0, virtualFileEntry_js_1.isVirtualFileIdEntry)(id)) {
-                const code = await (0, getVirtualFileEntry_js_1.getVirtualFileEntry)(id, options, config, isDev);
-                return code;
+            const idParsed = (0, virtualFileId_js_1.parseVirtualFileId)(id);
+            if (idParsed) {
+                if (idParsed.type === 'page-entry') {
+                    const code = await (0, generateVirtualFilePageEntry_js_1.generateVirtualFilePageEntry)(id, isDev);
+                    return code;
+                }
+                if (idParsed.type === 'global-entry') {
+                    const code = await (0, generateVirtualFileGlobalEntryWithOldDesign_js_1.generateVirtualFileGlobalEntryWithOldDesign)(id, options, config, this.environment, isDev);
+                    return code;
+                }
             }
         },
         configureServer(server) {
@@ -168,7 +170,7 @@ function reloadConfig(filePath, config, op, server) {
 }
 function getVikeVirtualFiles(server) {
     const vikeVirtualFiles = Array.from(server.moduleGraph.urlToModuleMap.keys())
-        .filter((url) => (0, virtualFilePageConfigLazy_js_1.isVirtualFileIdPageConfigLazy)(url) || (0, virtualFileEntry_js_1.isVirtualFileIdEntry)(url))
+        .filter((url) => (0, virtualFileId_js_1.parseVirtualFileId)(url))
         .map((url) => {
         const mod = server.moduleGraph.urlToModuleMap.get(url);
         (0, utils_js_1.assert)(mod);

package/dist/cjs/node/vite/shared/findPageFiles.js

@@ -10,7 +10,7 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const getOutDirs_js_1 = require("./getOutDirs.js");
 async function findPageFiles(config, fileTypes, isDev) {
     const cwd = config.root;
-    const { outDirRoot } = (0, getOutDirs_js_1.getOutDirs)(config);
+    const { outDirRoot } = (0, getOutDirs_js_1.getOutDirs)(config, undefined);
     const timeBase = new Date().getTime();
     let pageFiles = await (0, tinyglobby_1.glob)(fileTypes.map((fileType) => `**/*${fileType}.${utils_js_1.scriptFileExtensionPattern}`), { ignore: ['**/node_modules/**', `${outDirRoot}/**`], cwd, dot: false, expandDirectories: false });
     pageFiles = pageFiles.map((p) => '/' + (0, utils_js_1.toPosixPath)(p));

package/dist/cjs/node/vite/shared/{resolveClientEntriesDev.js → getClientEntrySrcDev.js}

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveClientEntriesDev = resolveClientEntriesDev;
+exports.getClientEntrySrcDev = getClientEntrySrcDev;
 const utils_js_1 = require("../utils.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
-function resolveClientEntriesDev(clientEntry, viteDevServer) {
+function getClientEntrySrcDev(clientEntry, viteDevServer) {
     let userRootDir = viteDevServer.config.root;
     (0, utils_js_1.assert)(userRootDir);
     userRootDir = (0, utils_js_1.toPosixPath)(userRootDir);
@@ -25,7 +25,7 @@ function resolveClientEntriesDev(clientEntry, viteDevServer) {
     else {
         if (clientEntry.startsWith('@@vike/')) {
             (0, utils_js_1.assert)(clientEntry.endsWith('.js'));
-            filePath = (0, utils_js_1.requireResolveVikeDistFile)(`dist/esm/${clientEntry.replace('@@vike/dist/esm/', '')}`);
+            filePath = (0, utils_js_1.requireResolveDistFile)(`dist/esm/${clientEntry.replace('@@vike/dist/esm/', '')}`);
         }
         else {
             (0, utils_js_1.assertIsImportPathNpmPackage)(clientEntry);

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

@@ -45,7 +45,9 @@ const loggerNotProd_js_1 = require("./loggerNotProd.js");
 const errorWithCodeSnippet_js_1 = require("./loggerNotProd/errorWithCodeSnippet.js");
 const node_util_1 = require("node:util");
 (0, utils_js_1.assertIsNotProductionRuntime)();
-let asyncLocalStorage = null;
+const globalObject = (0, utils_js_1.getGlobalObject)('getHttpRequestAsyncStore.ts', {
+    asyncLocalStorage: null,
+});
 async function installHttpRequestAsyncStore() {
     let mod;
     try {
@@ -54,9 +56,9 @@ async function installHttpRequestAsyncStore() {
     catch {
         return;
     }
-    asyncLocalStorage = new mod.AsyncLocalStorage();
+    globalObject.asyncLocalStorage = new mod.AsyncLocalStorage();
     (0, renderPage_js_1.renderPage_addAsyncHookwrapper)(async (httpRequestId, renderPage) => {
-        (0, utils_js_1.assert)(asyncLocalStorage);
+        (0, utils_js_1.assert)(globalObject.asyncLocalStorage);
         const loggedErrors = new Set();
         const markErrorAsLogged = (err) => {
             loggedErrors.add(err);
@@ -79,15 +81,15 @@ async function installHttpRequestAsyncStore() {
             shouldErrorBeSwallowed,
             errorDebugNoteAlreadyShown: false,
         };
-        const pageContextReturn = await asyncLocalStorage.run(store, renderPage);
+        const pageContextReturn = await globalObject.asyncLocalStorage.run(store, renderPage);
         return { pageContextReturn };
     });
     return;
 }
 function getHttpRequestAsyncStore() {
-    if (asyncLocalStorage === null)
+    if (globalObject.asyncLocalStorage === null)
         return null;
-    const store = asyncLocalStorage.getStore();
+    const store = globalObject.asyncLocalStorage.getStore();
     (0, utils_js_1.assert)(store === undefined || (0, utils_js_1.isObject)(store));
     return store;
 }

package/dist/cjs/node/vite/shared/getMagicString.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMagicString = getMagicString;
 const magic_string_1 = __importDefault(require("magic-string"));
-// TODO/now use everywhere
+// Used everywhere instead of `new MagicString()` for consistent source map generation
 function getMagicString(code, id) {
     const magicString = new magic_string_1.default(code);
     const getMagicStringResult = () => {

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

@@ -7,27 +7,23 @@ exports.getOutDirs = getOutDirs;
 exports.resolveOutDir = resolveOutDir;
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const utils_js_1 = require("../utils.js");
-const isViteServerBuild_js_1 = require("./isViteServerBuild.js");
+const isViteServerSide_js_1 = require("./isViteServerSide.js");
 const debug = (0, utils_js_1.createDebugger)('vike:outDir');
 function getOutDirs(configGlobal, viteEnv) {
-    const configEnv = viteEnv?.config ?? configGlobal;
     debug('getOutDirs()', new Error().stack);
-    const outDir = getOutDirFromViteResolvedConfig(configEnv);
-    if (!isOutDirRoot(outDir))
-        assertOutDirResolved(outDir, configEnv);
-    const outDirs = getOutDirsAll(outDir, configEnv.root);
+    const outDir = getOutDirFromResolvedConfig(configGlobal, viteEnv);
+    assertOutDirResolved(outDir, configGlobal, viteEnv);
+    const outDirs = getOutDirsAll(outDir, configGlobal.root);
+    assertNormalization(outDirs.outDirRoot);
+    assertNormalization(outDirs.outDirClient);
+    assertNormalization(outDirs.outDirServer);
     return outDirs;
 }
 /** Appends `client/` or `server/` to `config.build.outDir` */
-function resolveOutDir(config, isSSR) {
-    debug('resolveOutDir()', new Error().stack);
-    const isServerSide = (0, isViteServerBuild_js_1.isViteServerBuild)(config) || isSSR;
-    debug('isServerSide', isServerSide);
+function resolveOutDir(config, isServerSide) {
+    debug('resolveOutDir()');
     const outDir = getOutDirFromViteUserConfig(config) || 'dist';
     debug('outDir', outDir);
-    /* outDir may already be resolved when using Telefunc + Vike (because both Telefunc and Vike use this logic)
-    assert(isOutDirRoot(outDir))
-    */
     const { outDirClient, outDirServer } = getOutDirsAll(outDir);
     if (isServerSide) {
         debug('outDirServer', 'outDirServer');
@@ -91,9 +87,9 @@ function getOutDirsAllFromRootNormalized(outDirRoot, root) {
 }
 function assertNormalization(outDirAny) {
     (0, utils_js_1.assertPosixPath)(outDirAny);
-    (0, utils_js_1.assert)(outDirIsAbsolutePath(outDirAny));
-    (0, utils_js_1.assert)(outDirAny.endsWith('/'));
-    (0, utils_js_1.assert)(!outDirAny.endsWith('//'));
+    (0, utils_js_1.assert)(outDirIsAbsolutePath(outDirAny), outDirAny);
+    (0, utils_js_1.assert)(outDirAny.endsWith('/'), outDirAny);
+    (0, utils_js_1.assert)(!outDirAny.endsWith('//'), outDirAny);
 }
 function isOutDirRoot(outDirRot) {
     const p = outDirRot.split('/').filter(Boolean);
@@ -103,14 +99,17 @@ function isOutDirRoot(outDirRot) {
 function assertIsNotOutDirRoot(outDir) {
     (0, utils_js_1.assert)(outDir.endsWith('/client') || outDir.endsWith('/server'));
 }
-/** Assert that `outDir` ends with `/server` or `/client` */
-function assertOutDirResolved(outDir, config) {
+/** Assert that `outDir` ends with the correct directory `/server` or `/client` */
+function assertOutDirResolved(outDir, configGlobal, viteEnv) {
     (0, utils_js_1.assertPosixPath)(outDir);
-    assertIsNotOutDirRoot(outDir);
+    if (isOutDirRoot(outDir))
+        return;
+    (0, utils_js_1.assert)(outDir.endsWith('/client') || outDir.endsWith('/server')); // we normalized outDir
     (0, utils_js_1.assert)('/client'.length === '/server'.length);
     const outDirCorrected = outDir.slice(0, -1 * '/client'.length);
     const wrongUsage = `You've set Vite's config.build.outDir to ${picocolors_1.default.cyan(outDir)} but you should set it to ${picocolors_1.default.cyan(outDirCorrected)} instead.`;
-    if ((0, isViteServerBuild_js_1.isViteServerBuild)(config)) {
+    const isServerSide = (0, isViteServerSide_js_1.isViteServerSide_viteEnvOptional)(configGlobal, viteEnv);
+    if (isServerSide) {
         (0, utils_js_1.assertUsage)(outDir.endsWith('/server'), wrongUsage);
     }
     else {
@@ -124,8 +123,8 @@ function getOutDirFromViteUserConfig(config) {
     outDir = normalizeOutDir(outDir);
     return outDir;
 }
-function getOutDirFromViteResolvedConfig(config) {
-    let outDir = config.build.outDir;
+function getOutDirFromResolvedConfig(config, viteEnv) {
+    let outDir = viteEnv?.config.build?.outDir ?? config.build.outDir;
     (0, utils_js_1.assert)(outDir);
     outDir = normalizeOutDir(outDir);
     return outDir;

package/dist/cjs/node/vite/shared/getViteConfigRuntime.js

@@ -5,7 +5,7 @@ const utils_js_1 = require("../utils.js");
 const getOutDirs_js_1 = require("./getOutDirs.js");
 function getViteConfigRuntime(config) {
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(config, '_baseViteOriginal', 'string'));
-    const { outDirRoot } = (0, getOutDirs_js_1.getOutDirs)(config);
+    const { outDirRoot } = (0, getOutDirs_js_1.getOutDirs)(config, undefined);
     (0, utils_js_1.assertFilePathAbsoluteFilesystem)(outDirRoot);
     const viteConfigRuntime = {
         root: config.root,

package/dist/cjs/node/vite/shared/isViteServerSide.js

@@ -0,0 +1,68 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isViteServerSide = isViteServerSide;
+exports.isViteClientSide = isViteClientSide;
+exports.isViteServerSide_viteEnvOptional = isViteServerSide_viteEnvOptional;
+exports.isViteServerSide_onlySsrEnv = isViteServerSide_onlySsrEnv;
+exports.isViteServerSide_extraSafe = isViteServerSide_extraSafe;
+const assert_js_1 = require("../../../utils/assert.js");
+function isViteServerSide_impl(configGlobal, viteEnv) {
+    (0, assert_js_1.assert)(!('consumer' in configGlobal)); // make sure configGlobal isn't viteEnv.config
+    const debug = {
+        viteEnvIsUndefined: !viteEnv,
+        viteEnvName: viteEnv?.name ?? null,
+        viteEnvConsumer: viteEnv?.config.consumer ?? null,
+        configEnvBuildSsr: viteEnv?.config.build?.ssr ?? null,
+        configGlobalBuildSsr: configGlobal.build?.ssr ?? null,
+    };
+    if (!viteEnv) {
+        const isServerSide = getBuildSsrValue(configGlobal.build?.ssr);
+        (0, assert_js_1.assert)(typeof isServerSide === 'boolean', debug);
+        return isServerSide;
+    }
+    else {
+        const isServerSide1 = !viteEnv.config.consumer ? null : viteEnv.config.consumer !== 'client';
+        const isServerSide2 = getBuildSsrValue(viteEnv.config.build?.ssr);
+        const isServerSide3 = viteEnv.name === 'ssr' ? true : viteEnv.name === 'client' ? false : null;
+        const isServerSide = isServerSide1 ?? isServerSide2;
+        (0, assert_js_1.assert)(isServerSide === isServerSide1 || isServerSide1 === null, debug);
+        (0, assert_js_1.assert)(isServerSide === isServerSide2 || isServerSide2 === null, debug);
+        (0, assert_js_1.assert)(isServerSide === isServerSide3 || isServerSide3 === null, debug);
+        (0, assert_js_1.assert)(isServerSide !== null);
+        return isServerSide;
+    }
+}
+function getBuildSsrValue(buildSsr) {
+    if (buildSsr === undefined)
+        return null;
+    (0, assert_js_1.assert)(typeof buildSsr === 'boolean' || typeof buildSsr === 'string');
+    return !!buildSsr;
+}
+function isViteServerSide(configGlobal, viteEnv) {
+    return isViteServerSide_impl(configGlobal, viteEnv);
+}
+function isViteServerSide_viteEnvOptional(configGlobal, viteEnv) {
+    return isViteServerSide_impl(configGlobal, viteEnv);
+}
+function isViteClientSide(configGlobal, viteEnv) {
+    return !isViteServerSide(configGlobal, viteEnv);
+}
+// Only `ssr` env: for example don't include `vercel_edge` nor `vercel_node`.
+function isViteServerSide_onlySsrEnv(configGlobal, viteEnv) {
+    return viteEnv.name ? viteEnv.name === 'ssr' : isViteServerSide(configGlobal, viteEnv);
+}
+// Vite is quite messy about setting config.build.ssr — for security purposes, we use an extra safe implementation with lots of assertions, which is needed for the .client.js and .server.js guarantee.
+function isViteServerSide_extraSafe(config, viteEnv, options) {
+    const isServerSide = isViteServerSide(config, viteEnv);
+    const debug = {
+        isServerSide,
+        configCommand: config.command,
+        configBuildSsr: getBuildSsrValue(config.build.ssr),
+        optionsIsUndefined: options === undefined,
+        optionsSsr: options?.ssr ?? null,
+    };
+    (0, assert_js_1.assert)(options, debug);
+    (0, assert_js_1.assert)(typeof options.ssr === 'boolean', debug);
+    (0, assert_js_1.assert)(options.ssr === isServerSide, debug);
+    return isServerSide;
+}

package/dist/cjs/node/vite/shared/loggerVite/removeSuperfluousViteLog.js

@@ -4,10 +4,12 @@ exports.removeSuperfluousViteLog = removeSuperfluousViteLog;
 exports.removeSuperfluousViteLog_enable = removeSuperfluousViteLog_enable;
 exports.removeSuperfluousViteLog_disable = removeSuperfluousViteLog_disable;
 const utils_js_1 = require("../../utils.js");
+const globalObject = (0, utils_js_1.getGlobalObject)('removeSuperfluousViteLog.ts', {
+    enabled: false,
+});
 const superfluousLog = 'Forced re-optimization of dependencies';
-let enabled = false;
 function removeSuperfluousViteLog(msg) {
-    if (!enabled) {
+    if (!globalObject.enabled) {
         return false;
     }
     if (msg.toLowerCase().includes('forced') && msg.toLowerCase().includes('optimization')) {
@@ -17,8 +19,8 @@ function removeSuperfluousViteLog(msg) {
     return false;
 }
 function removeSuperfluousViteLog_enable() {
-    enabled = true;
+    globalObject.enabled = true;
 }
 function removeSuperfluousViteLog_disable() {
-    enabled = false;
+    globalObject.enabled = false;
 }

package/dist/cjs/node/vite/shared/loggerVite.js

@@ -33,7 +33,7 @@ function intercept(logType, config) {
             // We swallow Vite's message: we didn't see it add any value so far.
             //  - It can even be confusing, such as the following:
             //    ```
-            //    Error when evaluating SSR module virtual:vike:pageConfigLazy:server:/pages/abort: failed to import "/pages/abort/+Page.mdx"
+            //    Error when evaluating SSR module virtual:vike:page-entry:server:/pages/abort: failed to import "/pages/abort/+Page.mdx"
             //    ```
             (0, utils_js_1.assert)(!(0, isErrorDebug_js_1.isErrorDebug)());
             return;

package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js

@@ -110,7 +110,9 @@ const configDefinitionsBuiltIn = {
             }, pageConfig))
                 .flat(1)
                 // Server-only
-                .filter((source) => !source.configEnv.client);
+                .filter((source) => !source.configEnv.client)
+                // Config value isn't `null`
+                .filter((source) => !(0, getConfigValueSourcesRelevant_js_1.isConfigSourceValueNull)(source));
             return sources.length > 0;
         },
     },
@@ -122,22 +124,19 @@ const configDefinitionsBuiltIn = {
         env: { server: true, client: true },
         eager: true,
         _computed: (pageConfig) => {
-            const { configValueSources } = pageConfig;
             {
-                const source = getConfigValueSource(configValueSources, 'clientHooks');
+                const source = (0, getConfigValueSourcesRelevant_js_1.getConfigValueSourceRelevantAnyEnv)('clientHooks', pageConfig);
                 if (source) {
                     (0, utils_js_1.assert)(source.valueIsLoaded);
-                    if (source.value !== null) {
-                        const { value } = source;
-                        const definedAt = (0, getConfigDefinedAt_js_1.getConfigDefinedAt)('Config', 'clientHooks', source.definedAt);
-                        (0, utils_js_1.assertUsage)(typeof value === 'boolean', `${definedAt} should be a boolean`);
-                        return value;
-                    }
+                    const { value, definedAt } = source;
+                    const configDefinedAt = (0, getConfigDefinedAt_js_1.getConfigDefinedAt)('Config', 'clientHooks', definedAt);
+                    (0, utils_js_1.assertUsage)(typeof value === 'boolean', `${configDefinedAt} should be a boolean`);
+                    return value;
                 }
             }
-            return (isConfigSet(configValueSources, 'onRenderClient') &&
-                isConfigSet(configValueSources, 'Page') &&
-                !!getConfigEnv(configValueSources, 'Page')?.client);
+            return (isConfigSet(pageConfig, 'onRenderClient') &&
+                isConfigSet(pageConfig, 'Page') &&
+                !!getConfigEnv(pageConfig, 'Page')?.client);
         },
     },
     // TO-DO/soon/cumulative-hooks: remove and replace with new computed prop `clientOnlyHooks: string[]` (see other TO-DO/soon/cumulative-hooks entries)
@@ -145,10 +144,7 @@ const configDefinitionsBuiltIn = {
         env: { client: true },
         eager: true,
         _computed: (pageConfig) => {
-            const { configValueSources } = pageConfig;
-            return !isConfigSet(configValueSources, 'onBeforeRender')
-                ? null
-                : getConfigEnv(configValueSources, 'onBeforeRender');
+            return !isConfigSet(pageConfig, 'onBeforeRender') ? null : getConfigEnv(pageConfig, 'onBeforeRender');
         },
     },
     // TO-DO/soon/cumulative-hooks: remove and replace with new computed prop `clientOnlyHooks: string[]` (see other TO-DO/soon/cumulative-hooks entries)
@@ -156,8 +152,7 @@ const configDefinitionsBuiltIn = {
         env: { client: true },
         eager: true,
         _computed: (pageConfig) => {
-            const { configValueSources } = pageConfig;
-            return !isConfigSet(configValueSources, 'data') ? null : getConfigEnv(configValueSources, 'data');
+            return !isConfigSet(pageConfig, 'data') ? null : getConfigEnv(pageConfig, 'data');
         },
     },
     hooksTimeout: {
@@ -178,6 +173,9 @@ const configDefinitionsBuiltIn = {
         env: { config: true },
         global: true,
     },
+    csp: {
+        env: { server: true },
+    },
     injectScriptsAt: {
         env: { server: true },
     },
@@ -246,11 +244,11 @@ const configDefinitionsBuiltIn = {
     },
 };
 exports.configDefinitionsBuiltIn = configDefinitionsBuiltIn;
-function getConfigEnv(configValueSources, configName) {
-    const configValueSource = getConfigValueSource(configValueSources, configName);
-    if (!configValueSource)
+function getConfigEnv(pageConfig, configName) {
+    const source = (0, getConfigValueSourcesRelevant_js_1.getConfigValueSourceRelevantAnyEnv)(configName, pageConfig);
+    if (!source)
         return null;
-    const { configEnv } = configValueSource;
+    const { configEnv } = source;
     const env = {};
     if (configEnv.client)
         env.client = true;
@@ -258,18 +256,7 @@ function getConfigEnv(configValueSources, configName) {
         env.server = true;
     return env;
 }
-function isConfigSet(configValueSources, configName) {
-    const source = getConfigValueSource(configValueSources, configName);
-    return (!!source &&
-        !(source.valueIsLoaded &&
-            // Enable users to suppress inherited config by overriding it with `null`
-            source.value === null));
-}
-function getConfigValueSource(configValueSources, configName) {
-    const sources = configValueSources[configName];
-    if (!sources)
-        return null;
-    const configValueSource = sources[0];
-    (0, utils_js_1.assert)(configValueSource);
-    return configValueSource;
+function isConfigSet(pageConfig, configName) {
+    const source = (0, getConfigValueSourcesRelevant_js_1.getConfigValueSourceRelevantAnyEnv)(configName, pageConfig);
+    return !!source;
 }

package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/crawlPlusFiles.js

@@ -19,8 +19,9 @@ const ignorePatternsBuiltIn_js_1 = require("./crawlPlusFiles/ignorePatternsBuilt
 const execA = (0, node_util_1.promisify)(node_child_process_1.exec);
 const debug = (0, utils_js_1.createDebugger)('vike:crawl');
 (0, utils_js_1.assertIsNotProductionRuntime)();
-(0, utils_js_1.assertIsSingleModuleInstance)('getVikeConfig/crawlPlusFiles.ts');
-let gitIsNotUsable = false;
+const globalObject = (0, utils_js_1.getGlobalObject)('getVikeConfig/crawlPlusFiles.ts', {
+    gitIsNotUsable: false,
+});
 async function crawlPlusFiles(userRootDir) {
     (0, utils_js_1.assertPosixPath)(userRootDir);
     (0, utils_js_1.assertFilePathAbsoluteFilesystem)(userRootDir);
@@ -53,7 +54,7 @@ async function crawlPlusFiles(userRootDir) {
 }
 // Same as tinyglobby() but using `$ git ls-files`
 async function gitLsFiles(userRootDir, ignorePatterns, ignoreMatchers) {
-    if (gitIsNotUsable)
+    if (globalObject.gitIsNotUsable)
         return null;
     // Preserve UTF-8 file paths.
     // https://github.com/vikejs/vike/issues/1658
@@ -87,7 +88,7 @@ async function gitLsFiles(userRootDir, ignorePatterns, ignoreMatchers) {
     }
     catch (err) {
         if (await isGitNotUsable(userRootDir)) {
-            gitIsNotUsable = true;
+            globalObject.gitIsNotUsable = true;
             return null;
         }
         throw err;