vike 0.4.144-commit-6aef8a6 → 0.4.144-commit-7f5e99a

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

@@ -1,13 +1,16 @@
 export { prefetch };
 export { addLinkPrefetchHandlers };
-import { assert, assertClientRouting, assertUsage, checkIfClientRouting } from './utils.js';
+import { assert, assertClientRouting, assertUsage, checkIfClientRouting, objectAssign } from './utils.js';
 import { isErrorFetchingStaticAssets, loadPageFilesClientSide } from '../shared/loadPageFilesClientSide.js';
-import { isClientSideRoutable, skipLink } from './skipLink.js';
+import { skipLink } from './skipLink.js';
 import { getPageId } from './getPageId.js';
 import { getPrefetchSettings } from './prefetch/getPrefetchSettings.js';
 import { isAlreadyPrefetched, markAsAlreadyPrefetched } from './prefetch/alreadyPrefetched.js';
-import { disableClientRouting } from './useClientRouter.js';
+import { disableClientRouting } from './installClientRouter.js';
 import { isExternalLink } from './isExternalLink.js';
+import { isClientSideRoutable } from './isClientSideRoutable.js';
+import { createPageContext } from './createPageContext.js';
+import { route } from '../../shared/route/index.js';
 assertClientRouting();
 const linkPrefetchHandlerAdded = new Map();
 /**
@@ -79,13 +82,17 @@ function addLinkPrefetchHandlers(pageContext) {
     });
 }
 async function prefetchIfClientSideRoutable(url) {
+    const pageContext = await createPageContext(url);
+    let pageContextFromRoute;
     try {
-        if (!(await isClientSideRoutable(url)))
-            return;
+        pageContextFromRoute = await route(pageContext);
     }
     catch {
         // If a route() hook has a bug or `throw render()` / `throw redirect()`
         return;
     }
+    objectAssign(pageContext, pageContextFromRoute);
+    if (!(await isClientSideRoutable(pageContext)))
+        return;
     await prefetch(url);
 }

package/dist/esm/client/client-routing-runtime/skipLink.d.ts

@@ -1,3 +1,2 @@
 export { skipLink };
-export { isClientSideRoutable } from './skipLink/isClientSideRoutable.js';
 declare function skipLink(linkTag: HTMLElement): boolean;

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

@@ -1,9 +1,8 @@
 export { skipLink };
-export { isClientSideRoutable } from './skipLink/isClientSideRoutable.js';
 import { getBaseServer } from './getBaseServer.js';
 import { isExternalLink } from './isExternalLink.js';
 import { assert, parseUrl, isBaseServer, isParsable } from './utils.js';
-import { isDisableAutomaticLinkInterception } from './useClientRouter.js';
+import { isDisableAutomaticLinkInterception } from './installClientRouter.js';
 function skipLink(linkTag) {
     const url = linkTag.getAttribute('href');
     if (url === null)

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

@@ -19,10 +19,11 @@ async function executeOnRenderClientHook(pageContext, isClientRouting) {
         }
     }
     if (!hook) {
-        const urlLogical = getUrlLogical(pageContext);
+        const urlToShowToUser = getUrlToShowToUser(pageContext);
+        assert(urlToShowToUser);
         if (pageContext._pageConfigs.length > 0) {
             // V1 design
-            assertUsage(false, `No onRenderClient() hook defined for URL '${urlLogical}', but it's needed, see https://vike.dev/onRenderClient`);
+            assertUsage(false, `No onRenderClient() hook defined for URL '${urlToShowToUser}', but it's needed, see https://vike.dev/onRenderClient`);
         }
         else {
             // TODO/v1-release: remove
@@ -30,11 +31,11 @@ async function executeOnRenderClientHook(pageContext, isClientRouting) {
             const pageClientsFilesLoaded = pageContext._pageFilesLoaded.filter((p) => p.fileType === '.page.client');
             let errMsg;
             if (pageClientsFilesLoaded.length === 0) {
-                errMsg = 'No file `*.page.client.*` found for URL ' + urlLogical;
+                errMsg = 'No file `*.page.client.*` found for URL ' + urlToShowToUser;
             }
             else {
                 errMsg =
-                    'One of the following files should export a `render()` hook: ' +
+                    'One of the following files should export a render() hook: ' +
                         pageClientsFilesLoaded.map((p) => p.filePath).join(' ');
             }
             assertUsage(false, errMsg);
@@ -47,7 +48,7 @@ async function executeOnRenderClientHook(pageContext, isClientRouting) {
     const hookResult = await executeHook(() => renderHook(pageContextForUserConsumption), hookName, hook.hookFilePath);
     assertUsage(hookResult === undefined, `The ${hookName}() hook defined by ${hook.hookFilePath} isn't allowed to return a value`);
 }
-function getUrlLogical(pageContext) {
+function getUrlToShowToUser(pageContext) {
     let url;
     // try/catch to avoid passToClient assertUsage() (although: this may not be needed anymore, since we're now accessing pageContext and not pageContextForUserConsumption)
     try {

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

@@ -14,14 +14,14 @@ function getPageContextProxyForUser(pageContext) {
             const val = pageContext[prop];
             const propName = JSON.stringify(prop);
             assertUsage(val !== notSerializable, `pageContext[${propName}] couldn't be serialized and, therefore, is missing on the client-side. Check the server logs for more information.`);
-            assertPassToClient(pageContext, prop, `pageContext[${propName}] isn't available on the client-side because ${propName} is missing in passToClient, see https://vike.dev/passToClient`);
+            assertIsDefined(pageContext, prop);
             return val;
         }
     });
 }
-function assertPassToClient(pageContext, prop, errMsg) {
-    // We disable assertPassToClient() for the next attempt to read `prop`, because of how Vue's reactivity work. When changing a reactive object:
-    //  - Vue tries to read its old value first. This triggers a `assertPassToClient()` failure if e.g. `pageContextOldReactive.routeParams = pageContextNew.routeParams` and `pageContextOldReactive` has no `routeParams`.
+function assertIsDefined(pageContext, prop) {
+    // We disable assertIsDefined() for the next attempt to read `prop`, because of how Vue's reactivity work. When changing a reactive object:
+    //  - Vue tries to read its old value first. This triggers a `assertIsDefined()` failure if e.g. `pageContextOldReactive.routeParams = pageContextNew.routeParams` and `pageContextOldReactive` has no `routeParams`.
     //  - Vue seems to read __v_raw before reading the property
     if (globalObject.prev === prop || globalObject.prev === '__v_raw')
         return;
@@ -30,17 +30,23 @@ function assertPassToClient(pageContext, prop, errMsg) {
         return;
     if (isExpected(prop))
         return;
+    const propName = JSON.stringify(prop);
+    /* This handling would be the clearest but, unfortunately, it's fundamentally problematic:
+     *  - It would force the pageContext value consumer to be synchronized with the pageContext value provider. For example, if vike-react wants to conditionally do something dependening on wehther some optional pageContext value was provided by some optional vike-react-* integration package.
+     *  - If a pageContext value is set by an optional hook, then it's expected that the value is undefined if the hook doesn't exist.
+    const errMsg = `pageContext[${propName}] is \`undefined\` on the client-side. If it's defined on the server-side then add ${propName} to passToClient (https://vike.dev/passToClient), otherwise make sure your client-side hooks always define it (e.g. set it to \`null\` instead of \`undefined\`).`
+    assertUsage(false, errMsg)
+    */
     if (pageContext._hasPageContextFromServer && !pageContext._hasPageContextFromClient) {
         // We can safely assume that the property is missing in passToClient, because the server-side defines all passToClient properties even if they have an undefined value:
         // ```
         // <script id="vike_pageContext" type="application/json">{"_pageId":"/pages/admin","user":"!undefined","pageProps":"!undefined","title":"!undefined","abortReason":"!undefined","_urlRewrite":null}</script>
         // ```
         // Note how properties have "!undefined" values => we can tell whether an undefined pageContext value exists in passToClient.
-        assertUsage(false, errMsg);
+        assertUsage(false, `pageContext[${propName}] isn't available on the client-side because ${propName} is missing in passToClient, see https://vike.dev/passToClient`);
     }
     else {
-        // Do nothing, not even a warning.
-        // Because we don't know whether the user expects the pageContext value to be undefined. (E.g. a client-side onBeforeRender() hook conditionally setting a pageContext value.)
+        // Do nothing, not even a warning, because we don't know whether the user expects that the pageContext value can be undefined. (E.g. a pageContext value that is defined by an optional hook.)
     }
 }
 const IGNORE_LIST = [

package/dist/esm/node/plugin/plugins/buildConfig.js

@@ -4,7 +4,7 @@ export { analyzeClientEntries };
 import { assert, resolveOutDir, isObject, viteIsSSR, getFilePathAbsolute, addOnBeforeLogHook, removeFileExtention, unique, assertPosixPath, assertUsage, getOutDirs } from '../utils.js';
 import { virtualFileIdImportUserCodeServer } from '../../shared/virtual-files/virtualFileImportUserCode.js';
 import { getVikeConfig } from './importUserCode/v1-design/getVikeConfig.js';
-import { getConfigValue } from '../../../shared/page-configs/utils.js';
+import { getConfigValue } from '../../../shared/page-configs/helpers.js';
 import { findPageFiles } from '../shared/findPageFiles.js';
 import { getConfigVike } from '../../shared/getConfigVike.js';
 import { getVirtualFileIdPageConfigValuesAll } from '../../shared/virtual-files/virtualFilePageConfigValuesAll.js';

package/dist/esm/node/plugin/plugins/commonConfig.js

@@ -13,9 +13,6 @@ function commonConfig() {
     return [
         {
             name: 'vike-commonConfig-1',
-            config: () => ({
-                appType: 'custom'
-            }),
             configResolved(config) {
                 installRequireShim_setUserRootDir(config.root);
             }

package/dist/esm/node/plugin/plugins/devConfig/determineOptimizeDeps.js

@@ -34,18 +34,18 @@ async function getPageDeps(config, pageConfigs, isDev) {
             configValueSourcesRelevant.forEach((configValueSource) => {
                 if (!configValueSource.valueIsImportedAtRuntime)
                     return;
-                const { definedAtInfo, configEnv } = configValueSource;
+                const { definedAt, configEnv } = configValueSource;
                 if (configEnv !== 'client-only' && configEnv !== 'server-and-client')
                     return;
-                if (definedAtInfo.filePathRelativeToUserRootDir !== null) {
-                    const { filePathAbsoluteFilesystem } = definedAtInfo;
+                if (definedAt.filePathRelativeToUserRootDir !== null) {
+                    const { filePathAbsoluteFilesystem } = definedAt;
                     assert(filePathAbsoluteFilesystem);
                     // Surprisingly Vite expects entries to be absolute paths
                     entries.push(filePathAbsoluteFilesystem);
                 }
                 else {
-                    // Adding definedAtInfo.filePathAbsoluteFilesystem doesn't work for npm packages, I guess because of Vite's config.server.fs.allow
-                    const { importPathAbsolute } = definedAtInfo;
+                    // Adding definedAt.filePathAbsoluteFilesystem doesn't work for npm packages, I guess because of Vite's config.server.fs.allow
+                    const { importPathAbsolute } = definedAt;
                     assert(importPathAbsolute);
                     // We need to differentiate between npm package imports and path aliases.
                     // There are path aliases that cannot be distinguished from npm package names.

package/dist/esm/node/plugin/plugins/devConfig/index.js

@@ -21,6 +21,7 @@ function devConfig() {
             apply,
             config() {
                 return {
+                    appType: 'custom',
                     optimizeDeps: {
                         exclude: [
                             // We exclude the vike client to be able to use `import.meta.glob()`

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

@@ -4,7 +4,7 @@ export type { ConfigDefinition };
 export type { ConfigDefinitionInternal };
 export type { ConfigNameGlobal };
 export type { ConfigEffect };
-import type { ConfigEnvInternal, ConfigEnv, ConfigValueSources, DefinedAtFileInfo } from '../../../../../../shared/page-configs/PageConfig.js';
+import type { ConfigEnvInternal, ConfigEnv, ConfigValueSources, DefinedAtFileFullInfo } from '../../../../../../shared/page-configs/PageConfig.js';
 import type { Config, ConfigNameBuiltIn } from '../../../../../../shared/page-configs/Config.js';
 /** The meta definition of a config.
  *
@@ -46,7 +46,7 @@ type ConfigEffect = (config: {
 type ConfigDefinitionInternal = Omit<ConfigDefinition, 'env'> & {
     _computed?: (configValueSources: ConfigValueSources) => unknown;
     _valueIsFilePath?: true;
-    _userEffectDefinedAt?: DefinedAtFileInfo;
+    _userEffectDefinedAt?: DefinedAtFileFullInfo;
     env: ConfigEnvInternal;
 };
 type ConfigDefinitionsBuiltIn = Record<ConfigNameBuiltIn, ConfigDefinitionInternal>;

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

@@ -48,16 +48,17 @@ const configDefinitionsBuiltIn = {
         _valueIsFilePath: true
     },
     clientRouting: {
-        env: 'server-and-client' // TODO: config-only instead?
+        // We could make it 'server-only' (we don't yet because of some legacy V0.4 design code)
+        env: 'server-and-client'
     },
     prerender: {
         env: 'server-only'
     },
     hydrationCanBeAborted: {
-        env: 'client-only' // TODO: config-only instead?
+        env: 'client-only'
     },
     prefetchStaticAssets: {
-        env: 'client-only' // TODO: config-only instead?
+        env: 'client-only'
     },
     extends: {
         env: 'config-only'

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

@@ -14,7 +14,7 @@ import { getViteDevServer } from '../../../../runtime/globalContext.js';
 import { logConfigError, logConfigErrorRecover } from '../../../shared/loggerNotProd.js';
 import { removeSuperfluousViteLog_enable, removeSuperfluousViteLog_disable } from '../../../shared/loggerVite/removeSuperfluousViteLog.js';
 import pc from '@brillout/picocolors';
-import { getConfigDefinedAtString } from '../../../../../shared/page-configs/utils.js';
+import { getConfigDefinedAtString } from '../../../../../shared/page-configs/helpers.js';
 import { assertExportsOfConfigFile, assertExportsOfValueFile } from '../../../../../shared/page-configs/assertExports.js';
 import { getConfigValueSerialized } from './getVirtualFilePageConfigs.js';
 assertIsNotProductionRuntime();
@@ -329,7 +329,7 @@ function getGlobalConfigs(interfaceFilesByLocationId, userRootDir) {
             assert('value' in configValueSource);
             if (configName === 'prerender' && typeof configValueSource.value === 'boolean')
                 return;
-            const { filePathToShowToUser } = configValueSource.definedAtInfo;
+            const { filePathToShowToUser } = configValueSource.definedAt;
             assertWarning(false, `Being able to define config ${pc.cyan(configName)} in ${filePathToShowToUser} is experimental and will likely be removed. Define the config ${pc.cyan(configName)} in Vike's Vite plugin options instead.`, { onlyOnce: true });
             globalVikeConfig[configName] = configValueSource.value;
         }
@@ -411,9 +411,14 @@ function makeOrderDeterministic(interfaceFile1, interfaceFile2) {
 }
 function warnOverridenConfigValues(interfaceFileWinner, interfaceFilesOverriden, configName, configDef, userRootDir) {
     interfaceFilesOverriden.forEach((interfaceFileLoser) => {
+        const configValueSourceLoser_ = getConfigValueSource(configName, interfaceFileLoser, configDef, userRootDir);
         const configValueSourceWinner = getConfigValueSource(configName, interfaceFileWinner, configDef, userRootDir);
-        const configValueSourceLoser = getConfigValueSource(configName, interfaceFileLoser, configDef, userRootDir);
-        assertWarning(false, `${getConfigSourceDefinedAtString(configName, configValueSourceLoser, true)} overriden by another ${getConfigSourceDefinedAtString(configName, configValueSourceWinner, false)}, remove one of the two`, { onlyOnce: false });
+        // prettier-ignore
+        const configLoser_DefinedAt = getConfigDefinedAtString('Config', configName, configValueSourceLoser_);
+        // prettier-ignore
+        const configWinnerDefinedAt = getConfigDefinedAtString('config', configName, configValueSourceWinner);
+        const errMsg = `${configLoser_DefinedAt} is overriden by another ${configWinnerDefinedAt}, remove one of the two`;
+        assertWarning(false, errMsg, { onlyOnce: false });
     });
 }
 function isInterfaceFileUserLand(interfaceFile) {
@@ -428,20 +433,20 @@ function getConfigValueSource(configName, interfaceFile, configDef, userRootDir)
         fileExportPathToShowToUser: ['default', configName]
     };
     if (configDef._valueIsFilePath) {
-        let definedAtInfo;
+        let definedAt;
         let valueFilePath;
         if (interfaceFile.isConfigFile) {
             const { configValue } = conf;
             const import_ = resolveImport(configValue, interfaceFile.filePath, userRootDir, configEnv, configName);
-            const configDefinedAt = getConfigSourceDefinedAtString(configName, { definedAtInfo: definedAtConfigFile });
+            const configDefinedAt = getConfigDefinedAtString('Config', configName, { definedAt: definedAtConfigFile });
             assertUsage(import_, `${configDefinedAt} should be an import`);
             valueFilePath = import_.filePathAbsoluteVite;
-            definedAtInfo = import_;
+            definedAt = import_;
         }
         else {
             assert(interfaceFile.isValueFile);
             valueFilePath = interfaceFile.filePath.filePathAbsoluteVite;
-            definedAtInfo = {
+            definedAt = {
                 ...interfaceFile.filePath,
                 fileExportPathToShowToUser: []
             };
@@ -451,7 +456,7 @@ function getConfigValueSource(configName, interfaceFile, configDef, userRootDir)
             valueIsFilePath: true,
             configEnv,
             valueIsImportedAtRuntime: true,
-            definedAtInfo
+            definedAt
         };
         return configValueSource;
     }
@@ -463,7 +468,7 @@ function getConfigValueSource(configName, interfaceFile, configDef, userRootDir)
             const configValueSource = {
                 configEnv,
                 valueIsImportedAtRuntime: true,
-                definedAtInfo: import_
+                definedAt: import_
             };
             return configValueSource;
         }
@@ -472,7 +477,7 @@ function getConfigValueSource(configName, interfaceFile, configDef, userRootDir)
                 value: configValue,
                 configEnv,
                 valueIsImportedAtRuntime: false,
-                definedAtInfo: definedAtConfigFile
+                definedAt: definedAtConfigFile
             };
             return configValueSource;
         }
@@ -482,7 +487,7 @@ function getConfigValueSource(configName, interfaceFile, configDef, userRootDir)
         const configValueSource = {
             configEnv,
             valueIsImportedAtRuntime: !valueAlreadyLoaded,
-            definedAtInfo: {
+            definedAt: {
                 ...interfaceFile.filePath,
                 fileExportPathToShowToUser: configName === interfaceFile.configName
                     ? []
@@ -615,9 +620,7 @@ function getConfigDefinitions(interfaceFilesRelevant) {
             if (!configMeta)
                 return;
             const meta = configMeta.configValue;
-            assertMetaValue(meta, 
-            // TODO: Maybe we should use the getConfigDefinedAtString() helper?
-            `Config ${pc.cyan('meta')} defined at ${interfaceFile.filePath.filePathToShowToUser}`);
+            assertMetaValue(meta, `Config ${pc.cyan('meta')} defined at ${interfaceFile.filePath.filePathToShowToUser}`);
             // Set configDef._userEffectDefinedAt
             Object.entries(meta).forEach(([configName, configDef]) => {
                 if (!configDef.effect)
@@ -705,7 +708,7 @@ function applyEffectsAll(configValueSources, configDefinitionsRelevant) {
         // Call effect
         const configModFromEffect = configDef.effect({
             configValue: source.value,
-            configDefinedAt: getConfigSourceDefinedAtString(configName, source)
+            configDefinedAt: getConfigDefinedAtString('Config', configName, source)
         });
         if (!configModFromEffect)
             return;
@@ -719,8 +722,8 @@ function applyEffect(configModFromEffect, configValueSources, configDefEffect) {
         if (configName === 'meta') {
             let configDefinedAtString;
             if (configDefEffect._userEffectDefinedAt) {
-                configDefinedAtString = getConfigSourceDefinedAtString(configName, {
-                    definedAtInfo: configDefEffect._userEffectDefinedAt
+                configDefinedAtString = getConfigDefinedAtString('Config', configName, {
+                    definedAt: configDefEffect._userEffectDefinedAt
                 });
             }
             else {
@@ -744,7 +747,7 @@ function applyEffect(configModFromEffect, configValueSources, configDefEffect) {
         else {
             assertUsage(false, notSupported);
             // If we do end implementing being able to set the value of a config:
-            //  - For setting definedAtInfo: we could take the definedAtInfo of the effect config while appending '(effect)' to definedAtInfo.fileExportPathToShowToUser
+            //  - For setting definedAt: we could take the definedAt of the effect config while appending '(effect)' to definedAt.fileExportPathToShowToUser
         }
     });
 }
@@ -874,8 +877,6 @@ async function loadExtendsConfigs(configFileExports, configFilePath, userRootDir
     const extendsConfigFiles = [];
     extendsImportData.map((importData) => {
         const { importPath: importPath } = importData;
-        // TODO
-        //  - validate extends configs
         const filePathAbsoluteFilesystem = resolveImportPath(importData, configFilePath);
         assertImportPath(filePathAbsoluteFilesystem, importData, configFilePath);
         assertExtendsImportPath(importPath, filePathAbsoluteFilesystem, configFilePath);
@@ -1019,10 +1020,10 @@ function getFilesystemRoutingRootEffect(configFilesystemRoutingRoot, configName)
     // Eagerly loaded since it's config-only
     assert('value' in configFilesystemRoutingRoot);
     const { value } = configFilesystemRoutingRoot;
-    const configDefinedAt = getConfigSourceDefinedAtString(configName, configFilesystemRoutingRoot);
+    const configDefinedAt = getConfigDefinedAtString('Config', configName, configFilesystemRoutingRoot);
     assertUsage(typeof value === 'string', `${configDefinedAt} should be a string`);
     assertUsage(value.startsWith('/'), `${configDefinedAt} is ${pc.cyan(value)} but it should start with a leading slash ${pc.cyan('/')}`);
-    const { filePathRelativeToUserRootDir } = configFilesystemRoutingRoot.definedAtInfo;
+    const { filePathRelativeToUserRootDir } = configFilesystemRoutingRoot.definedAt;
     assert(filePathRelativeToUserRootDir);
     const before = getFilesystemRouteString(getLocationId(filePathRelativeToUserRootDir));
     const after = value;
@@ -1086,7 +1087,6 @@ function getConfigValues(configValueSources, configValuesComputed, configDefinit
             configValues[configName] = {
                 value,
                 definedAt: {
-                    isCumulative: true,
                     files: sources.map((source) => getDefinedAtFile(source))
                 }
             };
@@ -1096,21 +1096,19 @@ function getConfigValues(configValueSources, configValuesComputed, configDefinit
 }
 function getDefinedAtFile(configValueSource) {
     return {
-        filePathToShowToUser: configValueSource.definedAtInfo.filePathToShowToUser,
-        fileExportPathToShowToUser: configValueSource.definedAtInfo.fileExportPathToShowToUser
+        filePathToShowToUser: configValueSource.definedAt.filePathToShowToUser,
+        fileExportPathToShowToUser: configValueSource.definedAt.fileExportPathToShowToUser
     };
 }
 function getDefinedAt(configValueSource) {
-    return {
-        file: getDefinedAtFile(configValueSource)
-    };
+    return getDefinedAtFile(configValueSource);
 }
 function mergeCumulative(configName, configValueSources) {
     const valuesArr = [];
     const valuesSet = [];
     let configValueSourcePrevious = null;
     configValueSources.forEach((configValueSource) => {
-        const configDefinedAt = getConfigSourceDefinedAtString(configName, configValueSource);
+        const configDefinedAt = getConfigDefinedAtString('Config', configName, configValueSource);
         const configNameColored = pc.cyan(configName);
         // We could, in principle, also support cumulative values to be defined in +${configName}.js but it ins't completely trivial to implement
         assertUsage('value' in configValueSource, `${configDefinedAt} is only allowed to be defined in a +config.h.js file. (Because the values of ${configNameColored} are cumulative.)`);
@@ -1128,7 +1126,7 @@ function mergeCumulative(configName, configValueSources) {
             if (vals2.length === 0)
                 return;
             assert(configValueSourcePrevious);
-            const configPreviousDefinedAt = getConfigSourceDefinedAtString(configName, configValueSourcePrevious, false);
+            const configPreviousDefinedAt = getConfigDefinedAtString('Config', configName, configValueSourcePrevious);
             assertUsage(false, `${configDefinedAt} sets ${t1} but another ${configPreviousDefinedAt} sets ${t2} which is forbidden: the values must be all arrays or all sets (you cannot mix).`);
         };
         const { value } = configValueSource;
@@ -1159,14 +1157,3 @@ function mergeCumulative(configName, configValueSources) {
     }
     assert(false);
 }
-// TODO: rename and/or refactor
-function getConfigSourceDefinedAtString(configName, { definedAtInfo }, sentenceBegin = true) {
-    return getConfigDefinedAtString(configName, {
-        definedAt: {
-            file: {
-                filePathToShowToUser: definedAtInfo.filePathToShowToUser,
-                fileExportPathToShowToUser: definedAtInfo.fileExportPathToShowToUser
-            }
-        }
-    }, sentenceBegin);
-}

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

@@ -4,7 +4,7 @@ import { getVirtualFileIdPageConfigValuesAll, isVirtualFileIdPageConfigValuesAll
 import { getVikeConfig } from './getVikeConfig.js';
 import { extractAssetsAddQuery } from '../../../../shared/extractAssetsQuery.js';
 import { debug } from './debug.js';
-import { getConfigValue } from '../../../../../shared/page-configs/utils.js';
+import { getConfigValue } from '../../../../../shared/page-configs/helpers.js';
 import { getConfigValueSourcesRelevant } from '../../../shared/getConfigValueSourcesRelevant.js';
 import { isRuntimeEnvMatch } from './isRuntimeEnvMatch.js';
 import { serializeConfigValueImported } from '../../../../../shared/page-configs/serialize/serializeConfigValue.js';

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

@@ -1,14 +1,14 @@
 export { getVirtualFilePageConfigs };
 export { getConfigValueSerialized };
-import { assert, assertUsage, getPropAccessNotation, hasProp, objectEntries } from '../../../utils.js';
+import { assert, assertUsage, getPropAccessNotation, objectEntries } from '../../../utils.js';
 import { getVirtualFileIdPageConfigValuesAll } from '../../../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
 import { debug } from './debug.js';
-import { stringify } from '@brillout/json-serializer/stringify';
+import { isJsonSerializerError, stringify } from '@brillout/json-serializer/stringify';
 import { getConfigEnv } from './helpers.js';
 import pc from '@brillout/picocolors';
 import { getVikeConfig } from './getVikeConfig.js';
 import { isRuntimeEnvMatch } from './isRuntimeEnvMatch.js';
-import { getConfigValueFilePathToShowToUser } from '../../../../../shared/page-configs/utils.js';
+import { getConfigValueFilePathToShowToUser } from '../../../../../shared/page-configs/helpers.js';
 import { serializeConfigValue, serializeConfigValueImported } from '../../../../../shared/page-configs/serialize/serializeConfigValue.js';
 async function getVirtualFilePageConfigs(userRootDir, outDirRoot, isForClientSide, isDev, id, configVike, isClientRouting) {
     const { pageConfigs, pageConfigGlobal } = await getVikeConfig(userRootDir, outDirRoot, isDev, configVike.extensions, true);
@@ -105,15 +105,24 @@ function getConfigValueSerialized(value, configName, definedAt) {
     const valueName = `config${getPropAccessNotation(configName)}`;
     let configValueSerialized;
     try {
-        configValueSerialized = stringify(value, { valueName });
+        configValueSerialized = stringify(value, { valueName, forbidReactElements: true });
     }
     catch (err) {
-        assert(hasProp(err, 'messageCore', 'string'));
+        let serializationErrMsg = '';
+        if (isJsonSerializerError(err)) {
+            serializationErrMsg = err.messageCore;
+        }
+        else {
+            // When a property getter throws an error
+            console.error('Serialization error:');
+            console.error(err);
+            serializationErrMsg = 'see serialization error printed above';
+        }
         const configValueFilePathToShowToUser = getConfigValueFilePathToShowToUser({ definedAt });
         assert(configValueFilePathToShowToUser);
         assertUsage(false, [
             `The value of the config ${pc.cyan(configName)} cannot be defined inside the file ${configValueFilePathToShowToUser}:`,
-            `its value must be defined in an another file and then imported by ${configValueFilePathToShowToUser}. (Because the value isn't serializable: ${err.messageCore}.)`,
+            `its value must be defined in an another file and then imported by ${configValueFilePathToShowToUser}. (Because its value isn't serializable: ${serializationErrMsg}.)`,
             `Only serializable config values can be defined inside +config.h.js files, see https://vike.dev/header-file.`
         ].join(' '));
     }

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

@@ -6,20 +6,7 @@ function getConfigEnv(configValueSources, configName) {
     const configValueSource = getConfigValueSource(configValueSources, configName);
     if (!configValueSource)
         return null;
-    if (configValueSource) {
-        return configValueSource.configEnv;
-    }
-    else {
-        // In case of effect/computed config values, there isn't any configValueSource
-        // TODO: make it work for custom config definitions
-        //  - Ideally set configValueSource also for effect/computed config values?
-        assert(false, 'TODO');
-        /*
-        const configDef = configDefinitionsBuiltIn[configName as keyof typeof configDefinitionsBuiltIn]
-        if (!configDef) return null
-        return configDef.env
-        */
-    }
+    return configValueSource.configEnv;
 }
 function isConfigSet(configValueSources, configName) {
     const configValueSource = getConfigValueSource(configValueSources, configName);

package/dist/esm/node/plugin/plugins/previewConfig.js

@@ -13,6 +13,7 @@ function previewConfig() {
         apply: 'serve',
         config(config) {
             return {
+                appType: 'custom',
                 build: {
                     outDir: resolveOutDir(config)
                 }
@@ -23,12 +24,20 @@ function previewConfig() {
             configVike = await getConfigVike(config);
         },
         configurePreviewServer(server) {
+            /* - Couldn't make `appType: 'mpa'` work as of npm:@brillout/vite@5.0.0-beta.14.0426910c
+               - This ugly hack to set appType for preview won't be need once https://github.com/vitejs/vite/pull/14855 is merged.
+            config.appType = 'mpa'
+            */
             markEnvAsPreview();
             return () => {
                 assertDist();
-                if (!configVike.prerender) {
-                    addSsrMiddleware(server.middlewares);
+                /* We don't use this condition (we wrongfully always use the SSR middleware) because of the regression introduced by https://github.com/vitejs/vite/pull/14756 which stops servering .html files when `appType: 'custom'`.
+                if (!configVike.prerender || configVike.prerender.partial) {
+                  addSsrMiddleware(server.middlewares)
                 }
+                /*/
+                addSsrMiddleware(server.middlewares);
+                //*/
                 addStatic404Middleware(server.middlewares);
             };
         }