vike 0.4.223 → 0.4.224

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/virtual-files/getVirtualFilePageConfigValuesAll.js

@@ -8,7 +8,7 @@ const extractAssetsQuery_js_1 = require("../../../../../shared/extractAssetsQuer
 const debug_js_1 = require("./debug.js");
 const isRuntimeEnvMatch_js_1 = require("./isRuntimeEnvMatch.js");
 const serializeConfigValues_js_1 = require("../../../../../../shared/page-configs/serialize/serializeConfigValues.js");
-const fixServerAssets_js_1 = require("../../../buildConfig/fixServerAssets.js");
+const handleAssetsManifest_js_1 = require("../../../build/handleAssetsManifest.js");
 const getConfigValueBuildTime_js_1 = require("../../../../../../shared/page-configs/getConfigValueBuildTime.js");
 async function getVirtualFilePageConfigValuesAll(id, isDev, config) {
     const result = (0, virtualFilePageConfigValuesAll_js_1.isVirtualFileIdPageConfigValuesAll)(id);
@@ -26,11 +26,11 @@ async function getVirtualFilePageConfigValuesAll(id, isDev, config) {
     (0, utils_js_1.assert)(pageConfig, { id, pageId });
     const code = getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, 
     // TODO/now: add meta.default
-    vikeConfig.global.config.includeAssetsImportedByServer ?? true, isDev);
+    vikeConfig.global.config.includeAssetsImportedByServer ?? true, config, isDev);
     (0, debug_js_1.debug)(id, isForClientSide ? 'CLIENT-SIDE' : 'SERVER-SIDE', code);
     return code;
 }
-function getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, includeAssetsImportedByServer, isDev) {
+function getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, includeAssetsImportedByServer, config, isDev) {
     const lines = [];
     const importStatements = [];
     const filesEnv = new Map();
@@ -38,7 +38,7 @@ function getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, includeAsse
     lines.push('export const configValuesSerialized = {');
     lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, filesEnv, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isDev }), '', false));
     lines.push('};');
-    if (!(0, fixServerAssets_js_1.fixServerAssets_isEnabled)() && includeAssetsImportedByServer && isForClientSide && !isDev) {
+    if (!(0, handleAssetsManifest_js_1.handleAssetsManifest_isFixEnabled)(config) && includeAssetsImportedByServer && isForClientSide && !isDev) {
         importStatements.push(`import '${(0, extractAssetsQuery_js_1.extractAssetsAddQuery)((0, virtualFilePageConfigValuesAll_js_1.getVirtualFileIdPageConfigValuesAll)(pageId, false))}'`);
     }
     const code = [...importStatements, ...lines].join('\n');

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

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findPageFiles = findPageFiles;
-const fast_glob_1 = __importDefault(require("fast-glob"));
+const tinyglobby_1 = require("tinyglobby");
 const utils_js_1 = require("../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const getOutDirs_js_1 = require("./getOutDirs.js");
@@ -12,11 +12,11 @@ async function findPageFiles(config, fileTypes, isDev) {
     const cwd = config.root;
     const { outDirRoot } = (0, getOutDirs_js_1.getOutDirs)(config);
     const timeBase = new Date().getTime();
-    let pageFiles = await (0, fast_glob_1.default)(fileTypes.map((fileType) => `**/*${fileType}.${utils_js_1.scriptFileExtensions}`), { ignore: ['**/node_modules/**', `${outDirRoot}/**`], cwd, dot: false });
+    let pageFiles = await (0, tinyglobby_1.glob)(fileTypes.map((fileType) => `**/*${fileType}.${utils_js_1.scriptFileExtensions}`), { ignore: ['**/node_modules/**', `${outDirRoot}/**`], cwd, dot: false, expandDirectories: false });
     pageFiles = pageFiles.map((p) => '/' + (0, utils_js_1.toPosixPath)(p));
     const time = new Date().getTime() - timeBase;
     if (isDev) {
-        // We only warn in dev, because while building it's expected to take a long time as fast-glob is competing for resources with other tasks
+        // We only warn in dev, because while building it's expected to take a long time as tinyglobby is competing for resources with other tasks
         (0, utils_js_1.assertWarning)(time < 1.5 * 1000, `Finding your page files ${picocolors_1.default.cyan('**/*.page.*')} took an unexpected long time (${time}ms). Reach out to the vike maintainer.`, {
             onlyOnce: 'slow-page-files-search'
         });

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

@@ -7,20 +7,21 @@ exports.getOutDirs = getOutDirs;
 exports.resolveOutDir = resolveOutDir;
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const utils_js_1 = require("../utils.js");
-const viteIsSSR_js_1 = require("./viteIsSSR.js");
+const isViteServerBuild_js_1 = require("./isViteServerBuild.js");
 const debug = (0, utils_js_1.createDebugger)('vike:outDir');
-function getOutDirs(config) {
+function getOutDirs(configGlobal, viteEnv) {
+    const configEnv = viteEnv?.config ?? configGlobal;
     debug('getOutDirs()', new Error().stack);
-    const outDir = getOutDirFromViteResolvedConfig(config);
+    const outDir = getOutDirFromViteResolvedConfig(configEnv);
     if (!isOutDirRoot(outDir))
-        assertOutDirResolved(outDir, config);
-    const outDirs = getOutDirsAll(outDir, config.root);
+        assertOutDirResolved(outDir, configEnv);
+    const outDirs = getOutDirsAll(outDir, configEnv.root);
     return outDirs;
 }
 /** Appends `client/` or `server/` to `config.build.outDir` */
 function resolveOutDir(config, isSSR) {
     debug('resolveOutDir()', new Error().stack);
-    const isServerSide = (0, viteIsSSR_js_1.viteIsSSR)(config) || isSSR;
+    const isServerSide = (0, isViteServerBuild_js_1.isViteServerBuild)(config) || isSSR;
     debug('isServerSide', isServerSide);
     const outDir = getOutDirFromViteUserConfig(config) || 'dist';
     debug('outDir', outDir);
@@ -109,7 +110,7 @@ function assertOutDirResolved(outDir, config) {
     (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, viteIsSSR_js_1.viteIsSSR)(config)) {
+    if ((0, isViteServerBuild_js_1.isViteServerBuild)(config)) {
         (0, utils_js_1.assertUsage)(outDir.endsWith('/server'), wrongUsage);
     }
     else {

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

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isViteServerBuild = isViteServerBuild;
+exports.isViteClientBuild = isViteClientBuild;
+exports.isViteServerBuild_options = isViteServerBuild_options;
+exports.isViteServerBuild_safe = isViteServerBuild_safe;
+exports.isViteServerBuild_onlySsrEnv = isViteServerBuild_onlySsrEnv;
+const assert_js_1 = require("../../../utils/assert.js");
+function isViteServerBuild(configGlobal, viteEnv) {
+    const configEnv = viteEnv?.config ?? configGlobal;
+    return !!configEnv?.build?.ssr;
+}
+// Only `ssr` env: for example don't include `vercel_edge` nor `vercel_node`.
+function isViteServerBuild_onlySsrEnv(configGlobal, viteEnv) {
+    return viteEnv ? viteEnv.name === 'ssr' : isViteServerBuild(configGlobal);
+}
+function isViteClientBuild(configGlobal, viteEnv) {
+    const yes = !isViteServerBuild(configGlobal, viteEnv);
+    const isVite5 = viteEnv === undefined;
+    if (!isVite5) {
+        const yes2 = viteEnv.name === 'client';
+        (0, assert_js_1.assert)(yes === yes2);
+    }
+    return yes;
+}
+function isViteServerBuild_options(options) {
+    return !!options?.ssr;
+}
+// Vite is quite messy about setting `ssr: boolean`, thus we use an extra safe implemention for security purposes.
+// It's used for .client.js and .server.js guarantee thus we use agressive assert() calls for added safety.
+function isViteServerBuild_safe(config, options) {
+    if (config.command === 'build') {
+        (0, assert_js_1.assert)(typeof config.build.ssr === 'boolean');
+        const val = config.build.ssr;
+        if (options?.ssr !== undefined)
+            (0, assert_js_1.assert)(val === options.ssr);
+        return val;
+    }
+    else {
+        (0, assert_js_1.assert)(typeof options?.ssr === 'boolean');
+        const val = options.ssr;
+        /* This assert() fails (which is very unexpected).
+        if (typeof config.build.ssr === 'boolean') assert(val === config.build.ssr)
+        //*/
+        return val;
+    }
+}

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveClientEntriesDev = resolveClientEntriesDev;
 const utils_js_1 = require("../utils.js");
 const module_1 = require("module");
-// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
+// @ts-ignore `file://${__filename}` is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = `file://${__filename}`;
 const require_ = (0, module_1.createRequire)(importMetaUrl);
 (0, utils_js_1.assertIsNotProductionRuntime)();

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

@@ -44,3 +44,4 @@ __exportStar(require("../../utils/isArray.js"), exports);
 __exportStar(require("../../utils/PROJECT_VERSION.js"), exports);
 __exportStar(require("../../utils/isEqualStringList.js"), exports);
 __exportStar(require("../../utils/isDocker.js"), exports);
+__exportStar(require("../../utils/isVitest.js"), exports);

package/dist/cjs/node/prerender/context.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isPrerenderEnabled = isPrerenderEnabled;
 exports.isPrerenderAutoRunEnabled = isPrerenderAutoRunEnabled;
 exports.temp_disablePrerenderAutoRun = temp_disablePrerenderAutoRun;
 exports.isPrerendering = isPrerendering;
@@ -8,14 +7,10 @@ exports.setContextIsPrerendering = setContextIsPrerendering;
 const getGlobalObject_js_1 = require("../../utils/getGlobalObject.js");
 const resolvePrerenderConfig_js_1 = require("./resolvePrerenderConfig.js");
 const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('prerender/context.ts', {});
-function isPrerenderEnabled(vikeConfig) {
-    const prerenderConfig = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfig)(vikeConfig);
-    return !!prerenderConfig;
-}
 function isPrerenderAutoRunEnabled(vikeConfig) {
-    const prerenderConfig = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfig)(vikeConfig);
-    return (isPrerenderEnabled(vikeConfig) &&
-        !(prerenderConfig || {}).disableAutoRun &&
+    const prerenderConfigGlobal = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfigGlobal)(vikeConfig);
+    return (prerenderConfigGlobal.isEnabled &&
+        !(prerenderConfigGlobal || {}).disableAutoRun &&
         !globalObject.isDisabled &&
         vikeConfig.global.config.disableAutoFullBuild !== 'prerender');
 }

package/dist/cjs/node/prerender/resolvePrerenderConfig.js

@@ -1,29 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolvePrerenderConfig = resolvePrerenderConfig;
+exports.resolvePrerenderConfigGlobal = resolvePrerenderConfigGlobal;
 exports.resolvePrerenderConfigLocal = resolvePrerenderConfigLocal;
 const utils_js_1 = require("./utils.js");
 const getConfigValueBuildTime_js_1 = require("../../shared/page-configs/getConfigValueBuildTime.js");
-const helpers_js_1 = require("../../shared/page-configs/helpers.js");
-// TODO/now:
-// - prerender.value
-function resolvePrerenderConfig(vikeConfig) {
+function resolvePrerenderConfigGlobal(vikeConfig) {
     const prerenderConfigs = vikeConfig.global.config.prerender;
-    if (!prerenderConfigs &&
-        !vikeConfig.pageConfigs.some((pageConfig) => resolvePrerenderConfigLocal(pageConfig)?.value)) {
-        return false;
-    }
-    let prerenderSettings = prerenderConfigs || [];
+    let prerenderConfigList = prerenderConfigs || [];
     // Needed because of backwards compatibility of `vike({prerender:true})` in `vite.config.js`; after we remove it we can remove this line.
-    prerenderSettings = prerenderSettings.filter(isObject2);
-    (0, utils_js_1.assert)(prerenderSettings.every(isObject2));
-    const prerenderConfig = {
-        partial: pickFirst(prerenderSettings.map((c) => c.partial)) ?? false,
-        noExtraDir: pickFirst(prerenderSettings.map((c) => c.noExtraDir)) ?? false,
-        parallel: pickFirst(prerenderSettings.map((c) => c.parallel)) ?? true,
-        disableAutoRun: pickFirst(prerenderSettings.map((c) => c.disableAutoRun)) ?? false
+    prerenderConfigList = prerenderConfigList.filter(isObject2);
+    (0, utils_js_1.assert)(prerenderConfigList.every(isObject2)); // Help TS
+    const prerenderConfigGlobal = {
+        partial: pickFirst(prerenderConfigList.map((c) => c.partial)) ?? false,
+        noExtraDir: pickFirst(prerenderConfigList.map((c) => c.noExtraDir)) ?? false,
+        parallel: pickFirst(prerenderConfigList.map((c) => c.parallel)) ?? true,
+        disableAutoRun: pickFirst(prerenderConfigList.map((c) => c.disableAutoRun)) ?? false
     };
-    return prerenderConfig;
+    const prerenderConfigGlobalLocalValue = prerenderConfigList.map((c) => c.value).filter((v) => v !== null);
+    const defaultLocalValue = pickFirst(prerenderConfigGlobalLocalValue) ??
+        (prerenderConfigGlobalLocalValue.length > 0 ||
+            // Backwards compatibility for with vike({ prerender: true }) in vite.config.js
+            prerenderConfigs?.some((p) => p === true) ||
+            false);
+    (0, utils_js_1.objectAssign)(prerenderConfigGlobal, {
+        defaultLocalValue,
+        isEnabled: defaultLocalValue || vikeConfig.pageConfigs.some((pageConfig) => resolvePrerenderConfigLocal(pageConfig)?.value)
+    });
+    return prerenderConfigGlobal;
 }
 function resolvePrerenderConfigLocal(pageConfig) {
     const configValue = (0, getConfigValueBuildTime_js_1.getConfigValueBuildTime)(pageConfig, 'prerender');
@@ -34,9 +37,8 @@ function resolvePrerenderConfigLocal(pageConfig) {
     const value = values[0];
     (0, utils_js_1.assert)(typeof value === 'boolean');
     (0, utils_js_1.assert)((0, utils_js_1.isArray)(configValue.definedAtData));
-    const configValueFilePathToShowToUser = (0, helpers_js_1.getConfigValueFilePathToShowToUser)(configValue.definedAtData[0]);
-    (0, utils_js_1.assert)(configValueFilePathToShowToUser);
-    return { value, configValueFilePathToShowToUser };
+    const prerenderConfigLocal = { value };
+    return prerenderConfigLocal;
 }
 function isObject2(p) {
     return typeof p === 'object' && p !== null;

package/dist/cjs/node/prerender/runPrerender.js

@@ -68,6 +68,7 @@ const resolvePrerenderConfig_js_1 = require("./resolvePrerenderConfig.js");
 const getOutDirs_js_1 = require("../plugin/shared/getOutDirs.js");
 const context_js_2 = require("../cli/context.js");
 const isViteCliCall_js_1 = require("../plugin/shared/isViteCliCall.js");
+const commonConfig_js_1 = require("../plugin/plugins/commonConfig.js");
 async function runPrerenderFromAPI(options = {}) {
     return await runPrerender(options, 'prerender()');
     // - We purposely propagate the error to the user land, so that the error interrupts the user land. It's also, I guess, a nice-to-have that the user has control over the error.
@@ -94,11 +95,13 @@ async function runPrerenderFromAutoRun(viteConfig, config) {
         prerenderContextPublic = ret.prerenderContextPublic;
     }
     catch (err) {
+        // Avoid Rollup prefixing the error with [vike:build:pluginAutoFullBuild], see for example https://github.com/vikejs/vike/issues/472#issuecomment-1276274203
         console.error(err);
         (0, logErrorHint_js_1.logErrorHint)(err);
         process.exit(1);
     }
-    config.vike.prerenderContext = prerenderContextPublic;
+    const vike = (0, commonConfig_js_1.getVikeConfigPublic)(config);
+    vike.prerenderContext = prerenderContextPublic;
     const forceExit = (0, context_js_2.isVikeCli)() || (0, isViteCliCall_js_1.isViteCliCall)();
     return { forceExit };
 }
@@ -117,15 +120,16 @@ async function runPrerender(options = {}, standaloneTrigger) {
     const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(viteConfig);
     const { outDirClient } = (0, getOutDirs_js_1.getOutDirs)(viteConfig);
     const { root } = viteConfig;
-    const prerenderConfig = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfig)(vikeConfig);
-    validatePrerenderConfig(prerenderConfig);
-    if (!prerenderConfig) {
+    const prerenderConfigGlobal = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfigGlobal)(vikeConfig);
+    validatePrerenderConfig(prerenderConfigGlobal);
+    const { partial, noExtraDir, parallel, defaultLocalValue, isEnabled } = prerenderConfigGlobal;
+    if (!isEnabled) {
         (0, utils_js_1.assert)(standaloneTrigger);
-        (0, utils_js_1.assertWarning)(prerenderConfig, `You're executing ${picocolors_1.default.cyan(standaloneTrigger)} but the config ${picocolors_1.default.cyan('prerender')} isn't set to true`, {
+        // TODO/now: make it assertUsage() and remove dist/server/entry.mjs whenever possible
+        (0, utils_js_1.assertWarning)(prerenderConfigGlobal, `You're executing ${picocolors_1.default.cyan(standaloneTrigger)} but you didn't enable pre-rendering. Use the config ${picocolors_1.default.cyan('prerender')} (${picocolors_1.default.underline('https://vike.dev/prerender')}) to enable it.`, {
             onlyOnce: true
         });
     }
-    const { partial = false, noExtraDir = false, parallel = true } = prerenderConfig || {};
     const concurrencyLimit = (0, utils_js_1.pLimit)(parallel === false || parallel === 0 ? 1 : parallel === true || parallel === undefined ? (0, os_1.cpus)().length : parallel);
     await (0, globalContext_js_1.initGlobalContext_runPrerender)();
     const globalContext = await (0, globalContext_js_1.getGlobalContextInternal)();
@@ -138,7 +142,7 @@ async function runPrerender(options = {}, standaloneTrigger) {
         output: []
     };
     const doNotPrerenderList = [];
-    await collectDoNoPrerenderList(vikeConfig.pageConfigs, doNotPrerenderList, concurrencyLimit, globalContext);
+    await collectDoNoPrerenderList(vikeConfig.pageConfigs, doNotPrerenderList, defaultLocalValue, concurrencyLimit, globalContext);
     await callOnBeforePrerenderStartHooks(prerenderContext, globalContext, concurrencyLimit, doNotPrerenderList);
     await handlePagesWithStaticRoutes(prerenderContext, globalContext, doNotPrerenderList, concurrencyLimit);
     await callOnPrerenderStartHook(prerenderContext, globalContext);
@@ -161,20 +165,21 @@ async function runPrerender(options = {}, standaloneTrigger) {
     const prerenderContextPublic = makePublic(prerenderContext);
     return { viteConfig, prerenderContextPublic };
 }
-async function collectDoNoPrerenderList(pageConfigs, doNotPrerenderList, concurrencyLimit, globalContext) {
+async function collectDoNoPrerenderList(pageConfigs, doNotPrerenderList, defaultLocalValue, concurrencyLimit, globalContext) {
     // V1 design
     pageConfigs.forEach((pageConfig) => {
-        const configValue = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfigLocal)(pageConfig);
-        if (!configValue)
-            return;
-        const { value, configValueFilePathToShowToUser } = configValue;
-        if (value === false) {
-            doNotPrerenderList.push({
-                pageId: pageConfig.pageId,
-                setByConfigName: 'prerender',
-                setByConfigValue: false,
-                setByConfigFile: configValueFilePathToShowToUser
-            });
+        const prerenderConfigLocal = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfigLocal)(pageConfig);
+        const { pageId } = pageConfig;
+        if (!prerenderConfigLocal) {
+            if (!defaultLocalValue) {
+                doNotPrerenderList.push({ pageId });
+            }
+        }
+        else {
+            const { value } = prerenderConfigLocal;
+            if (value === false) {
+                doNotPrerenderList.push({ pageId });
+            }
         }
     });
     // Old design
@@ -207,12 +212,7 @@ async function collectDoNoPrerenderList(pageConfigs, doNotPrerenderList, concurr
             }
             else {
                 // Don't pre-render `pageId`
-                doNotPrerenderList.push({
-                    pageId,
-                    setByConfigFile: p.filePath,
-                    setByConfigName: 'doNotPrerender',
-                    setByConfigValue: doNotPrerender
-                });
+                doNotPrerenderList.push({ pageId });
             }
         }
     });
@@ -565,8 +565,7 @@ function warnContradictoryNoPrerenderList(prerenderedPageContexts, doNotPrerende
             if (!isContradictory)
                 return;
         }
-        const { setByConfigName, setByConfigValue, setByConfigFile } = doNotPrerenderListEntry;
-        (0, utils_js_1.assertWarning)(false, `The ${providedByHook.hookName}() hook defined by ${providedByHook.hookFilePath} returns the URL ${picocolors_1.default.cyan(urlOriginal)}, while ${setByConfigFile} sets the config ${picocolors_1.default.cyan(setByConfigName)} to ${picocolors_1.default.cyan(String(setByConfigValue))}. This is contradictory: either don't set the config ${picocolors_1.default.cyan(setByConfigName)} to ${picocolors_1.default.cyan(String(setByConfigValue))} or remove the URL ${picocolors_1.default.cyan(urlOriginal)} from the list of URLs to be pre-rendered.`, { onlyOnce: true });
+        (0, utils_js_1.assertWarning)(false, `The ${providedByHook.hookName}() hook defined by ${providedByHook.hookFilePath} returns the URL ${picocolors_1.default.cyan(urlOriginal)} matching the route of the page ${picocolors_1.default.cyan(pageId)} which isn't configured to be pre-rendered. This is contradictory: either enable pre-rendering for ${picocolors_1.default.cyan(pageId)} or remove the URL ${picocolors_1.default.cyan(urlOriginal)} from the list of URLs to be pre-rendered.`, { onlyOnce: true });
     });
 }
 async function warnMissingPages(prerenderedPageContexts, globalContext, doNotPrerenderList, partial) {
@@ -813,7 +812,8 @@ prerenderConfig) {
 }
 function makePublic(prerenderContext) {
     const prerenderContextPublic = (0, utils_js_1.makePublicCopy)(prerenderContext, 'prerenderContext', [
-        'pageContexts'
+        'output', // vite-plugin-vercel
+        'pageContexts' // https://vike.dev/i18n#pre-rendering
     ]);
     return prerenderContextPublic;
 }

package/dist/cjs/node/prerender/utils.js

@@ -33,3 +33,4 @@ __exportStar(require("../../utils/isArray.js"), exports);
 __exportStar(require("../../utils/isObject.js"), exports);
 __exportStar(require("../../utils/changeEnumerable.js"), exports);
 __exportStar(require("../../utils/makePublicCopy.js"), exports);
+__exportStar(require("../../utils/isNotNullish.js"), exports);

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

@@ -29,13 +29,19 @@ const errorsMisc = [
         mustMentionNodeModules: false
     }
 ];
+const reactInvalidEelement = 'https://vike.dev/broken-npm-package#react-invalid-component';
 const errorsReact = [
     {
         errMsg: 'Element type is invalid: expected a string (for built-in components) or a class/function (for composite components)',
-        link: 'https://vike.dev/broken-npm-package#react-invalid-component',
+        link: reactInvalidEelement,
         // The stack trace can be user-land while the import is coming from node_modules
         mustMentionNodeModules: false
     },
+    {
+        errMsg: 'Objects are not valid as a React child',
+        link: reactInvalidEelement,
+        mustMentionNodeModules: false
+    },
     {
         // React's "Invalid hook call.", see https://github.com/vikejs/vike/discussions/1637#discussioncomment-9424712
         errMsg: "Cannot read properties of null (reading 'useContext')"

package/dist/cjs/shared/getPageContextUrlComputed.js

@@ -39,7 +39,7 @@ function getUrlParsed(pageContext) {
     //  6. The value of pageContext.urlPathname is now '/login': the pathname of `pageContext.urlLogical`. (While pageContext.urlOriginal is still '/fr-FR/admin'.)
     // Reproduction: https://github.com/vikejs/vike/discussions/1436#discussioncomment-8142023
     // Determine logical URL
-    const assertUrlResolved = (src) => (0, utils_js_1.assert)(urlResolved && typeof urlResolved === 'string', 
+    const assertUrlResolved = (src) => (0, utils_js_1.assert)(typeof urlResolved === 'string', 
     // TODO/eventually: remove debug logs, see:
     // - https://github.com/vikejs/vike/issues/2138#issuecomment-2631713411
     // - https://github.com/vikejs/vike/commit/5c7810f3080ab62536950f26e019bb2a3a517082

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

@@ -29,9 +29,7 @@ function getConfigValue(pageConfig, configName) {
     if (!configDef.cumulative) {
         const configValueSource = sources[0];
         (0, utils_js_1.assert)(configValueSource);
-        (0, utils_js_1.assert)(configValueSource.isOverriden === false);
-        (0, utils_js_1.assert)(sources.slice(1).every((s) => s.isOverriden === true));
-        (0, utils_js_1.assert)('value' in configValueSource);
+        (0, utils_js_1.assert)(configValueSource.valueIsLoaded);
         return {
             type: 'standard',
             value: configValueSource.value,
@@ -52,9 +50,8 @@ function mergeCumulative(configValueSources) {
     const value = [];
     const definedAtData = [];
     configValueSources.forEach((configValueSource) => {
-        (0, utils_js_1.assert)(configValueSource.isOverriden === false);
         (0, utils_js_1.assert)(configValueSource.configEnv.config === true);
-        (0, utils_js_1.assert)('value' in configValueSource);
+        (0, utils_js_1.assert)(configValueSource.valueIsLoaded);
         value.push(configValueSource.value);
         definedAtData.push(getDefinedAtFile(configValueSource));
     });

package/dist/cjs/shared/page-configs/serialize/parsePageConfigs.js

@@ -66,7 +66,9 @@ function parseConfigValuesSerialized_tmp(configValuesSerialized) {
             const { valueSerialized, ...common } = configValueSeriliazed;
             const { value, sideExports } = parseValueSerialized(valueSerialized, configName, () => {
                 (0, utils_js_1.assert)(configValueSeriliazed.type !== 'computed');
-                return configValueSeriliazed.definedAtData;
+                const { definedAtData } = configValueSeriliazed;
+                const definedAtFile = Array.isArray(definedAtData) ? definedAtData[0] : definedAtData;
+                return definedAtFile;
             });
             addSideExports(sideExports);
             configValue = { value, ...common };

package/dist/cjs/shared/page-configs/serialize/serializeConfigValues.js

@@ -5,12 +5,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serializeConfigValues = serializeConfigValues;
 exports.getConfigValuesBase = getConfigValuesBase;
+exports.isJsonValue = isJsonValue;
 const assertSetup_js_1 = require("../../../utils/assertSetup.js");
 const utils_js_1 = require("../../../node/plugin/utils.js");
 const transformPointerImports_js_1 = require("../../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig/transformPointerImports.js");
 const helpers_js_1 = require("../helpers.js");
 const stringify_1 = require("@brillout/json-serializer/stringify");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const getVikeConfig_js_1 = require("../../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js");
+const stringifyOptions = { forbidReactElements: true };
 const REPLACE_ME_BEFORE = '__VIKE__REPLACE_ME_BEFORE__';
 const REPLACE_ME_AFTER = '__VIKE__REPLACE_ME_AFTER__';
 // This file is never loaded on the client-side but we save it under the vike/shared/ directory in order to collocate it with parsePageConfigs()
@@ -47,9 +50,8 @@ function serializeConfigValues(pageConfig, importStatements, filesEnv, isEnvMatc
     return lines;
 }
 function getValueSerializedFromSource(configValueSource, configName, importStatements, filesEnv) {
-    (0, utils_js_1.assert)(configValueSource.isOverriden === false);
     let valueData;
-    if ('value' in configValueSource) {
+    if (configValueSource.valueIsLoaded && !configValueSource.valueIsLoadedWithImport) {
         valueData = getValueSerializedWithJson(configValueSource.value, configName, configValueSource.definedAtFilePath, importStatements, filesEnv, configValueSource.configEnv);
     }
     else {
@@ -101,14 +103,13 @@ function serializeConfigValue(configValueBase, valueData, configName, lines, tab
 }
 function getValueSerializedWithImport(configValueSource, importStatements, filesEnv, configName) {
     (0, utils_js_1.assert)(!configValueSource.valueIsFilePath);
-    const { valueIsImportedAtRuntime, valueIsDefinedByPlusFile, definedAtFilePath, configEnv } = configValueSource;
-    (0, utils_js_1.assert)(valueIsImportedAtRuntime);
+    const { valueIsDefinedByPlusValueFile, definedAtFilePath, configEnv } = configValueSource;
     const { filePathAbsoluteVite, fileExportName } = definedAtFilePath;
-    if (valueIsDefinedByPlusFile)
+    if (valueIsDefinedByPlusValueFile)
         (0, utils_js_1.assert)(fileExportName === undefined);
     const { importName } = addImportStatement(importStatements, filePathAbsoluteVite, fileExportName || '*', filesEnv, configEnv, configName);
     return {
-        type: valueIsDefinedByPlusFile ? 'plus-file' : 'pointer-import',
+        type: valueIsDefinedByPlusValueFile ? 'plus-file' : 'pointer-import',
         valueAsJsCode: importName
     };
 }
@@ -125,7 +126,7 @@ function valueToJson(value, configName, definedAtData, importStatements, filesEn
     try {
         configValueSerialized = (0, stringify_1.stringify)(value, {
             valueName,
-            forbidReactElements: true,
+            ...stringifyOptions,
             // Replace import strings with import variables.
             // - We don't need this anymore and could remove it.
             //   - We temporarily needed it for nested document configs (`config.document.{title,description,favicon}`), but we finally decided to go for flat document configs instead (`config.{title,description,favicon}`).
@@ -152,6 +153,15 @@ function valueToJson(value, configName, definedAtData, importStatements, filesEn
     (0, utils_js_1.assert)(!configValueSerialized.includes(REPLACE_ME_AFTER));
     return configValueSerialized;
 }
+function isJsonValue(value) {
+    try {
+        (0, stringify_1.stringify)(value, stringifyOptions);
+    }
+    catch (err) {
+        return false;
+    }
+    return true;
+}
 function logJsonSerializeError(err, configName, definedAtData) {
     /*
     // import { isJsonSerializerError } from '@brillout/json-serializer/stringify'
@@ -191,7 +201,6 @@ function getConfigValuesBase(pageConfig, isEnvMatch, isEager) {
         if (!configDef.cumulative) {
             const source = sources[0];
             (0, utils_js_1.assert)(source);
-            (0, utils_js_1.assert)(sources.slice(1).every((s) => s.isOverriden === true));
             if (!isEnvMatch(source.configEnv))
                 return 'SKIP';
             const definedAtFile = getDefinedAtFileSource(source);
@@ -202,7 +211,9 @@ function getConfigValuesBase(pageConfig, isEnvMatch, isEager) {
             return { configValueBase, sourceRelevant: source, configName };
         }
         else {
-            const sourcesRelevant = sources.filter((source) => !source.isOverriden && isEnvMatch(source.configEnv));
+            const sourcesRelevant = sources
+                .filter((source) => !(0, getVikeConfig_js_1.isOverriden)(source, configName, pageConfig))
+                .filter((source) => isEnvMatch(source.configEnv));
             if (sourcesRelevant.length === 0)
                 return 'SKIP';
             const definedAtData = [];

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.223';
+exports.PROJECT_VERSION = '0.4.224';

package/dist/cjs/utils/findFile.js

@@ -8,7 +8,7 @@ const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const isArray_js_1 = require("./isArray.js");
 const path_js_1 = require("./path.js");
-// We need to be able to crawl the filesystem, regardless of Vike's `$ git ls-files` command call, because we need to fallback if the user didn't setup Git (e.g. we cannot remove the fast-glob fallback).
+// We need to be able to crawl the filesystem, regardless of Vike's `$ git ls-files` command call, because we need to fallback if the user didn't setup Git (e.g. we cannot remove the tinyglobby fallback).
 function findFile(arg, cwd) {
     (0, path_js_1.assertPosixPath)(cwd);
     const filenames = (0, isArray_js_1.isArray)(arg) ? arg : [arg];

package/dist/cjs/utils/findPackageJson.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.findPackageJson = findPackageJson;
 const findFile_js_1 = require("./findFile.js");
 const module_1 = require("module");
-// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
+// @ts-ignore `file://${__filename}` is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = `file://${__filename}`;
 const require_ = (0, module_1.createRequire)(importMetaUrl);
 function findPackageJson(cwd) {

package/dist/cjs/utils/isFilePathAbsoluteFilesystem.js

@@ -5,9 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertFilePathAbsoluteFilesystem = assertFilePathAbsoluteFilesystem;
 exports.isFilePathAbsolute = isFilePathAbsolute;
-const path_1 = __importDefault(require("path"));
+const node_path_1 = __importDefault(require("node:path"));
 const assert_js_1 = require("./assert.js");
 const path_js_1 = require("./path.js");
+const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
+const assertSetup_js_1 = require("./assertSetup.js");
+(0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
+// Server runtime shouldn't depend on node:path
+(0, assertSetup_js_1.assertIsNotProductionRuntime)();
 /**
  * Asserts that `filePath` is an absolute file path starting from the filesystem root.
  *
@@ -18,6 +23,7 @@ function assertFilePathAbsoluteFilesystem(filePath) {
     // - For Windows users, the assert is correct.
     // - For Linux users assertFilePathAbsoluteFilesystem() will erroneously succeed if `p` is a path absolute from the user root dir.
     //   - But that's okay because the assertion will eventually fail for Windows users.
+    //   - On Linux there doesn't seem to be a way to distinguish between an absolute path starting from the filesystem root or starting from the user root directory, see comment at isFilePathAbsoluteFilesystem()
     (0, assert_js_1.assert)(isFilePathAbsoluteFilesystem(filePath));
     (0, path_js_1.assertPosixPath)(filePath);
 }
@@ -33,11 +39,11 @@ function isFilePathAbsoluteFilesystem(filePath) {
         //   - File path absolute starting from filesystem root, e.g. /home/rom/code/my-app/pages/about/+Page.js
         //   - File path absolute starting from user root dir (Vite's `config.root`), e.g. /pages/about/+Page.js
         // - Checking whether `p` starts with the first directory of process.cwd() (or `userRootDir`) can be erroneous, most notably when using docker: https://github.com/vikejs/vike/issues/703
-        // - Using require.resolve() would be a solution but probably too slow?
+        // - Using require.resolve() or node:fs to check wehther the file/dir exsits would be a solution, but maybe too slow?
         return filePath.startsWith('/');
     }
     else {
-        const yes = path_1.default.win32.isAbsolute(filePath);
+        const yes = node_path_1.default.win32.isAbsolute(filePath);
         // Ensure isFilePathAbsoluteFilesystem() returns `false` if path is absolute starting from the user root dir (see comments above).
         if (yes)
             (0, assert_js_1.assert)(!filePath.startsWith('/'));
@@ -55,5 +61,5 @@ function isFilePathAbsolute(filePath) {
     if (filePath.startsWith('/'))
         return true;
     // Seems to be reliable: https://nodejs.org/api/path.html#pathisabsolutepath
-    return path_1.default.isAbsolute(filePath);
+    return node_path_1.default.isAbsolute(filePath);
 }

package/dist/cjs/utils/path.js

@@ -9,6 +9,7 @@ exports.assertPosixPath = assertPosixPath;
 //   - Robust shim reference: https://github.com/unjs/pathe
 const assert_js_1 = require("./assert.js");
 const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
+// While this path shim also works on the client-side, let's try to not use it on the client-side in order to minimize KBs sent to the browser.
 (0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
 /**********************/
 /****** SHIMS *********/