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

package/dist/cjs/__internal/index.js

@@ -1,9 +1,7 @@
 "use strict";
-// Internal functions of vike needed by other plugins are exported via this file
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPagesAndRoutes = exports.route = void 0;
 const index_js_1 = require("../shared/route/index.js");
-Object.defineProperty(exports, "route", { enumerable: true, get: function () { return index_js_1.route; } });
 const globalContext_js_1 = require("../node/runtime/globalContext.js");
 const nodeEnv_js_1 = require("../utils/nodeEnv.js");
 const assert_js_1 = require("../utils/assert.js");
@@ -29,3 +27,9 @@ async function getPagesAndRoutes() {
     };
 }
 exports.getPagesAndRoutes = getPagesAndRoutes;
+async function route(pageContext) {
+    const pageContextFromRoute = await (0, index_js_1.route)(pageContext);
+    // Old interface
+    return { pageContextAddendum: pageContextFromRoute };
+}
+exports.route = route;

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

@@ -7,7 +7,7 @@ exports.analyzeClientEntries = exports.assertRollupInput = exports.buildConfig =
 const utils_js_1 = require("../utils.js");
 const virtualFileImportUserCode_js_1 = require("../../shared/virtual-files/virtualFileImportUserCode.js");
 const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
-const utils_js_2 = require("../../../shared/page-configs/utils.js");
+const helpers_js_1 = require("../../../shared/page-configs/helpers.js");
 const findPageFiles_js_1 = require("../shared/findPageFiles.js");
 const getConfigVike_js_1 = require("../../shared/getConfigVike.js");
 const virtualFilePageConfigValuesAll_js_1 = require("../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
@@ -112,7 +112,7 @@ function analyzeClientEntries(pageConfigs, config) {
     let clientEntries = {};
     let clientFilePaths = [];
     pageConfigs.forEach((pageConfig) => {
-        const configValue = (0, utils_js_2.getConfigValue)(pageConfig, 'clientRouting', 'boolean');
+        const configValue = (0, helpers_js_1.getConfigValue)(pageConfig, 'clientRouting', 'boolean');
         if (configValue?.value) {
             hasClientRouting = true;
         }

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

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

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

@@ -37,18 +37,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;
                     (0, utils_js_1.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;
                     (0, utils_js_1.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/cjs/node/plugin/plugins/devConfig/index.js

@@ -23,6 +23,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/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js

@@ -49,16 +49,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/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js

@@ -16,7 +16,7 @@ const globalContext_js_1 = require("../../../../runtime/globalContext.js");
 const loggerNotProd_js_1 = require("../../../shared/loggerNotProd.js");
 const removeSuperfluousViteLog_js_1 = require("../../../shared/loggerVite/removeSuperfluousViteLog.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const utils_js_2 = require("../../../../../shared/page-configs/utils.js");
+const helpers_js_1 = require("../../../../../shared/page-configs/helpers.js");
 const assertExports_js_1 = require("../../../../../shared/page-configs/assertExports.js");
 const getVirtualFilePageConfigs_js_1 = require("./getVirtualFilePageConfigs.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
@@ -334,7 +334,7 @@ function getGlobalConfigs(interfaceFilesByLocationId, userRootDir) {
             (0, utils_js_1.assert)('value' in configValueSource);
             if (configName === 'prerender' && typeof configValueSource.value === 'boolean')
                 return;
-            const { filePathToShowToUser } = configValueSource.definedAtInfo;
+            const { filePathToShowToUser } = configValueSource.definedAt;
             (0, utils_js_1.assertWarning)(false, `Being able to define config ${picocolors_1.default.cyan(configName)} in ${filePathToShowToUser} is experimental and will likely be removed. Define the config ${picocolors_1.default.cyan(configName)} in Vike's Vite plugin options instead.`, { onlyOnce: true });
             globalVikeConfig[configName] = configValueSource.value;
         }
@@ -416,9 +416,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);
-        (0, utils_js_1.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 = (0, helpers_js_1.getConfigDefinedAtString)('Config', configName, configValueSourceLoser_);
+        // prettier-ignore
+        const configWinnerDefinedAt = (0, helpers_js_1.getConfigDefinedAtString)('config', configName, configValueSourceWinner);
+        const errMsg = `${configLoser_DefinedAt} is overriden by another ${configWinnerDefinedAt}, remove one of the two`;
+        (0, utils_js_1.assertWarning)(false, errMsg, { onlyOnce: false });
     });
 }
 function isInterfaceFileUserLand(interfaceFile) {
@@ -433,20 +438,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 = (0, helpers_js_1.getConfigDefinedAtString)('Config', configName, { definedAt: definedAtConfigFile });
             (0, utils_js_1.assertUsage)(import_, `${configDefinedAt} should be an import`);
             valueFilePath = import_.filePathAbsoluteVite;
-            definedAtInfo = import_;
+            definedAt = import_;
         }
         else {
             (0, utils_js_1.assert)(interfaceFile.isValueFile);
             valueFilePath = interfaceFile.filePath.filePathAbsoluteVite;
-            definedAtInfo = {
+            definedAt = {
                 ...interfaceFile.filePath,
                 fileExportPathToShowToUser: []
             };
@@ -456,7 +461,7 @@ function getConfigValueSource(configName, interfaceFile, configDef, userRootDir)
             valueIsFilePath: true,
             configEnv,
             valueIsImportedAtRuntime: true,
-            definedAtInfo
+            definedAt
         };
         return configValueSource;
     }
@@ -468,7 +473,7 @@ function getConfigValueSource(configName, interfaceFile, configDef, userRootDir)
             const configValueSource = {
                 configEnv,
                 valueIsImportedAtRuntime: true,
-                definedAtInfo: import_
+                definedAt: import_
             };
             return configValueSource;
         }
@@ -477,7 +482,7 @@ function getConfigValueSource(configName, interfaceFile, configDef, userRootDir)
                 value: configValue,
                 configEnv,
                 valueIsImportedAtRuntime: false,
-                definedAtInfo: definedAtConfigFile
+                definedAt: definedAtConfigFile
             };
             return configValueSource;
         }
@@ -487,7 +492,7 @@ function getConfigValueSource(configName, interfaceFile, configDef, userRootDir)
         const configValueSource = {
             configEnv,
             valueIsImportedAtRuntime: !valueAlreadyLoaded,
-            definedAtInfo: {
+            definedAt: {
                 ...interfaceFile.filePath,
                 fileExportPathToShowToUser: configName === interfaceFile.configName
                     ? []
@@ -620,9 +625,7 @@ function getConfigDefinitions(interfaceFilesRelevant) {
             if (!configMeta)
                 return;
             const meta = configMeta.configValue;
-            assertMetaValue(meta, 
-            // TODO: Maybe we should use the getConfigDefinedAtString() helper?
-            `Config ${picocolors_1.default.cyan('meta')} defined at ${interfaceFile.filePath.filePathToShowToUser}`);
+            assertMetaValue(meta, `Config ${picocolors_1.default.cyan('meta')} defined at ${interfaceFile.filePath.filePathToShowToUser}`);
             // Set configDef._userEffectDefinedAt
             Object.entries(meta).forEach(([configName, configDef]) => {
                 if (!configDef.effect)
@@ -710,7 +713,7 @@ function applyEffectsAll(configValueSources, configDefinitionsRelevant) {
         // Call effect
         const configModFromEffect = configDef.effect({
             configValue: source.value,
-            configDefinedAt: getConfigSourceDefinedAtString(configName, source)
+            configDefinedAt: (0, helpers_js_1.getConfigDefinedAtString)('Config', configName, source)
         });
         if (!configModFromEffect)
             return;
@@ -724,8 +727,8 @@ function applyEffect(configModFromEffect, configValueSources, configDefEffect) {
         if (configName === 'meta') {
             let configDefinedAtString;
             if (configDefEffect._userEffectDefinedAt) {
-                configDefinedAtString = getConfigSourceDefinedAtString(configName, {
-                    definedAtInfo: configDefEffect._userEffectDefinedAt
+                configDefinedAtString = (0, helpers_js_1.getConfigDefinedAtString)('Config', configName, {
+                    definedAt: configDefEffect._userEffectDefinedAt
                 });
             }
             else {
@@ -749,7 +752,7 @@ function applyEffect(configModFromEffect, configValueSources, configDefEffect) {
         else {
             (0, utils_js_1.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
         }
     });
 }
@@ -879,8 +882,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);
@@ -1024,10 +1025,10 @@ function getFilesystemRoutingRootEffect(configFilesystemRoutingRoot, configName)
     // Eagerly loaded since it's config-only
     (0, utils_js_1.assert)('value' in configFilesystemRoutingRoot);
     const { value } = configFilesystemRoutingRoot;
-    const configDefinedAt = getConfigSourceDefinedAtString(configName, configFilesystemRoutingRoot);
+    const configDefinedAt = (0, helpers_js_1.getConfigDefinedAtString)('Config', configName, configFilesystemRoutingRoot);
     (0, utils_js_1.assertUsage)(typeof value === 'string', `${configDefinedAt} should be a string`);
     (0, utils_js_1.assertUsage)(value.startsWith('/'), `${configDefinedAt} is ${picocolors_1.default.cyan(value)} but it should start with a leading slash ${picocolors_1.default.cyan('/')}`);
-    const { filePathRelativeToUserRootDir } = configFilesystemRoutingRoot.definedAtInfo;
+    const { filePathRelativeToUserRootDir } = configFilesystemRoutingRoot.definedAt;
     (0, utils_js_1.assert)(filePathRelativeToUserRootDir);
     const before = (0, filesystemRouting_js_1.getFilesystemRouteString)((0, filesystemRouting_js_1.getLocationId)(filePathRelativeToUserRootDir));
     const after = value;
@@ -1092,7 +1093,6 @@ function getConfigValues(configValueSources, configValuesComputed, configDefinit
             configValues[configName] = {
                 value,
                 definedAt: {
-                    isCumulative: true,
                     files: sources.map((source) => getDefinedAtFile(source))
                 }
             };
@@ -1102,21 +1102,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 = (0, helpers_js_1.getConfigDefinedAtString)('Config', configName, configValueSource);
         const configNameColored = picocolors_1.default.cyan(configName);
         // We could, in principle, also support cumulative values to be defined in +${configName}.js but it ins't completely trivial to implement
         (0, utils_js_1.assertUsage)('value' in configValueSource, `${configDefinedAt} is only allowed to be defined in a +config.h.js file. (Because the values of ${configNameColored} are cumulative.)`);
@@ -1134,7 +1132,7 @@ function mergeCumulative(configName, configValueSources) {
             if (vals2.length === 0)
                 return;
             (0, utils_js_1.assert)(configValueSourcePrevious);
-            const configPreviousDefinedAt = getConfigSourceDefinedAtString(configName, configValueSourcePrevious, false);
+            const configPreviousDefinedAt = (0, helpers_js_1.getConfigDefinedAtString)('Config', configName, configValueSourcePrevious);
             (0, utils_js_1.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;
@@ -1165,14 +1163,3 @@ function mergeCumulative(configName, configValueSources) {
     }
     (0, utils_js_1.assert)(false);
 }
-// TODO: rename and/or refactor
-function getConfigSourceDefinedAtString(configName, { definedAtInfo }, sentenceBegin = true) {
-    return (0, utils_js_2.getConfigDefinedAtString)(configName, {
-        definedAt: {
-            file: {
-                filePathToShowToUser: definedAtInfo.filePathToShowToUser,
-                fileExportPathToShowToUser: definedAtInfo.fileExportPathToShowToUser
-            }
-        }
-    }, sentenceBegin);
-}

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

@@ -6,7 +6,7 @@ const virtualFilePageConfigValuesAll_js_1 = require("../../../../shared/virtual-
 const getVikeConfig_js_1 = require("./getVikeConfig.js");
 const extractAssetsQuery_js_1 = require("../../../../shared/extractAssetsQuery.js");
 const debug_js_1 = require("./debug.js");
-const utils_js_2 = require("../../../../../shared/page-configs/utils.js");
+const helpers_js_1 = require("../../../../../shared/page-configs/helpers.js");
 const getConfigValueSourcesRelevant_js_1 = require("../../../shared/getConfigValueSourcesRelevant.js");
 const isRuntimeEnvMatch_js_1 = require("./isRuntimeEnvMatch.js");
 const serializeConfigValue_js_1 = require("../../../../../shared/page-configs/serialize/serializeConfigValue.js");
@@ -29,7 +29,7 @@ async function getVirtualFilePageConfigValuesAll(id, userRootDir, outDirRoot, is
 }
 exports.getVirtualFilePageConfigValuesAll = getVirtualFilePageConfigValuesAll;
 function getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, includeAssetsImportedByServer, isDev) {
-    const configValue = (0, utils_js_2.getConfigValue)(pageConfig, 'clientRouting', 'boolean');
+    const configValue = (0, helpers_js_1.getConfigValue)(pageConfig, 'clientRouting', 'boolean');
     const isClientRouting = configValue?.value ?? false;
     const lines = [];
     const importStatements = [];

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

@@ -12,7 +12,7 @@ const helpers_js_1 = require("./helpers.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const getVikeConfig_js_1 = require("./getVikeConfig.js");
 const isRuntimeEnvMatch_js_1 = require("./isRuntimeEnvMatch.js");
-const utils_js_2 = require("../../../../../shared/page-configs/utils.js");
+const helpers_js_2 = require("../../../../../shared/page-configs/helpers.js");
 const serializeConfigValue_js_1 = require("../../../../../shared/page-configs/serialize/serializeConfigValue.js");
 async function getVirtualFilePageConfigs(userRootDir, outDirRoot, isForClientSide, isDev, id, configVike, isClientRouting) {
     const { pageConfigs, pageConfigGlobal } = await (0, getVikeConfig_js_1.getVikeConfig)(userRootDir, outDirRoot, isDev, configVike.extensions, true);
@@ -110,15 +110,24 @@ function getConfigValueSerialized(value, configName, definedAt) {
     const valueName = `config${(0, utils_js_1.getPropAccessNotation)(configName)}`;
     let configValueSerialized;
     try {
-        configValueSerialized = (0, stringify_1.stringify)(value, { valueName });
+        configValueSerialized = (0, stringify_1.stringify)(value, { valueName, forbidReactElements: true });
     }
     catch (err) {
-        (0, utils_js_1.assert)((0, utils_js_1.hasProp)(err, 'messageCore', 'string'));
-        const configValueFilePathToShowToUser = (0, utils_js_2.getConfigValueFilePathToShowToUser)({ definedAt });
+        let serializationErrMsg = '';
+        if ((0, stringify_1.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 = (0, helpers_js_2.getConfigValueFilePathToShowToUser)({ definedAt });
         (0, utils_js_1.assert)(configValueFilePathToShowToUser);
         (0, utils_js_1.assertUsage)(false, [
             `The value of the config ${picocolors_1.default.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/cjs/node/plugin/plugins/importUserCode/v1-design/helpers.js

@@ -7,20 +7,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?
-        (0, utils_js_1.assert)(false, 'TODO');
-        /*
-        const configDef = configDefinitionsBuiltIn[configName as keyof typeof configDefinitionsBuiltIn]
-        if (!configDef) return null
-        return configDef.env
-        */
-    }
+    return configValueSource.configEnv;
 }
 exports.getConfigEnv = getConfigEnv;
 function isConfigSet(configValueSources, configName) {

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

@@ -18,6 +18,7 @@ function previewConfig() {
         apply: 'serve',
         config(config) {
             return {
+                appType: 'custom',
                 build: {
                     outDir: (0, utils_js_1.resolveOutDir)(config)
                 }
@@ -28,12 +29,20 @@ function previewConfig() {
             configVike = await (0, getConfigVike_js_1.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'
+            */
             (0, utils_js_1.markEnvAsPreview)();
             return () => {
                 assertDist();
-                if (!configVike.prerender) {
-                    (0, addSsrMiddleware_js_1.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)
                 }
+                /*/
+                (0, addSsrMiddleware_js_1.addSsrMiddleware)(server.middlewares);
+                //*/
                 addStatic404Middleware(server.middlewares);
             };
         }

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

@@ -41,7 +41,7 @@ const getConfigVike_js_1 = require("../shared/getConfigVike.js");
 const getPageFiles_js_1 = require("../../shared/getPageFiles.js");
 const getPageContextRequestUrl_js_1 = require("../../shared/getPageContextRequestUrl.js");
 const resolveRouteString_js_1 = require("../../shared/route/resolveRouteString.js");
-const utils_js_2 = require("../../shared/page-configs/utils.js");
+const helpers_js_1 = require("../../shared/page-configs/helpers.js");
 const loadConfigValues_js_1 = require("../../shared/page-configs/loadConfigValues.js");
 const error_page_js_1 = require("../../shared/error-page.js");
 const addUrlComputedProps_js_1 = require("../../shared/addUrlComputedProps.js");
@@ -113,9 +113,9 @@ async function runPrerender(options, manuallyTriggered) {
 async function collectDoNoPrerenderList(renderContext, doNotPrerenderList, concurrencyLimit) {
     renderContext.pageConfigs.forEach((pageConfig) => {
         const configName = 'prerender';
-        const configValue = (0, utils_js_2.getConfigValue)(pageConfig, configName, 'boolean');
+        const configValue = (0, helpers_js_1.getConfigValue)(pageConfig, configName, 'boolean');
         if (configValue?.value === false) {
-            const configValueFilePathToShowToUser = (0, utils_js_2.getConfigValueFilePathToShowToUser)(configValue);
+            const configValueFilePathToShowToUser = (0, helpers_js_1.getConfigValueFilePathToShowToUser)(configValue);
             (0, utils_js_1.assert)(configValueFilePathToShowToUser);
             doNotPrerenderList.push({
                 pageId: pageConfig.pageId,
@@ -173,11 +173,11 @@ async function callOnBeforePrerenderStartHooks(prerenderContext, renderContext,
     await Promise.all(renderContext.pageConfigs.map((pageConfig) => concurrencyLimit(async () => {
         const hookName = 'onBeforePrerenderStart';
         const pageConfigLoaded = await (0, loadConfigValues_js_1.loadConfigValues)(pageConfig, false);
-        const configValue = (0, utils_js_2.getConfigValue)(pageConfigLoaded, hookName);
+        const configValue = (0, helpers_js_1.getConfigValue)(pageConfigLoaded, hookName);
         if (!configValue)
             return;
         const hookFn = configValue.value;
-        const hookFilePath = (0, utils_js_2.getHookFilePathToShowToUser)(configValue);
+        const hookFilePath = (0, helpers_js_1.getHookFilePathToShowToUser)(configValue);
         (0, utils_js_1.assert)(hookFilePath);
         (0, getHook_js_1.assertHookFn)(hookFn, { hookName, hookFilePath });
         onBeforePrerenderStartHooks.push({
@@ -313,8 +313,8 @@ async function callOnPrerenderStartHook(prerenderContext, renderContext) {
         const configValue = pageConfigGlobal.configValues.onPrerenderStart;
         if (configValue?.value) {
             const { value: hookFn } = configValue;
-            // config.onPrerenderStart isn't a computed nor a cumulative config => definedAtInfo should always be defined
-            const hookFilePath = (0, utils_js_2.getHookFilePathToShowToUser)(configValue);
+            // config.onPrerenderStart isn't a computed nor a cumulative config => definedAt should always be defined
+            const hookFilePath = (0, helpers_js_1.getHookFilePathToShowToUser)(configValue);
             (0, utils_js_1.assert)(hookFilePath);
             onPrerenderStartHook = {
                 hookFn,
@@ -371,7 +371,7 @@ async function callOnPrerenderStartHook(prerenderContext, renderContext) {
             enumerable: false,
             configurable: true
         });
-        (0, utils_js_1.assert)((0, utils_js_1.hasPropertyGetter)(pageContext, 'url'));
+        (0, utils_js_1.assert)((0, utils_js_1.isPropertyGetter)(pageContext, 'url'));
         (0, utils_js_1.assert)(pageContext.urlOriginal);
         pageContext._urlOriginalBeforeHook = pageContext.urlOriginal;
     });
@@ -410,7 +410,7 @@ async function callOnPrerenderStartHook(prerenderContext, renderContext) {
     prerenderContext.pageContexts = result.prerenderContext.pageContexts;
     prerenderContext.pageContexts.forEach((pageContext) => {
         // TODO/v1-release: remove
-        if (!(0, utils_js_1.hasPropertyGetter)(pageContext, 'url') && pageContext.url) {
+        if (pageContext.url && !(0, utils_js_1.isPropertyGetter)(pageContext, 'url')) {
             (0, utils_js_1.assertWarning)(false, msgPrefix +
                 ' provided pageContext.url but it should provide pageContext.urlOriginal instead, see https://vike.dev/migration/0.4.23', { onlyOnce: true });
             pageContext.urlOriginal = pageContext.url;
@@ -435,10 +435,9 @@ async function routeAndPrerender(prerenderContext, htmlFiles, prerenderPageIds,
     await Promise.all(prerenderContext.pageContexts.map((pageContext) => concurrencyLimit(async () => {
         const { urlOriginal } = pageContext;
         (0, utils_js_1.assert)(urlOriginal);
-        const routeResult = await (0, index_js_1.route)(pageContext);
-        (0, utils_js_1.assert)((0, utils_js_1.hasProp)(routeResult.pageContextAddendum, '_pageId', 'null') ||
-            (0, utils_js_1.hasProp)(routeResult.pageContextAddendum, '_pageId', 'string'));
-        if (routeResult.pageContextAddendum._pageId === null) {
+        const pageContextFromRoute = await (0, index_js_1.route)(pageContext);
+        (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageContextFromRoute, '_pageId', 'null') || (0, utils_js_1.hasProp)(pageContextFromRoute, '_pageId', 'string'));
+        if (pageContextFromRoute._pageId === null) {
             let hookName;
             let hookFilePath;
             if (pageContext._providedByHook) {
@@ -455,13 +454,13 @@ async function routeAndPrerender(prerenderContext, htmlFiles, prerenderPageIds,
             }
             else {
                 // `prerenderHookFile` is `null` when the URL was deduced by the Filesytem Routing of `.page.js` files. The `onBeforeRoute()` can override Filesystem Routing; it is therefore expected that the deduced URL may not match any page.
-                (0, utils_js_1.assert)(routeResult.pageContextAddendum._routingProvidedByOnBeforeRouteHook);
+                (0, utils_js_1.assert)(pageContextFromRoute._routingProvidedByOnBeforeRouteHook);
                 // Abort since the URL doesn't correspond to any page
                 return;
             }
         }
-        (0, utils_js_1.assert)(routeResult.pageContextAddendum._pageId);
-        (0, utils_js_1.objectAssign)(pageContext, routeResult.pageContextAddendum);
+        (0, utils_js_1.assert)(pageContextFromRoute._pageId);
+        (0, utils_js_1.objectAssign)(pageContext, pageContextFromRoute);
         const { _pageId: pageId } = pageContext;
         (0, utils_js_1.objectAssign)(pageContext, await (0, loadPageFilesServerSide_js_1.loadPageFilesServerSide)(pageContext));
         let usesClientRouter;
@@ -469,7 +468,7 @@ async function routeAndPrerender(prerenderContext, htmlFiles, prerenderPageIds,
             if (pageContext._pageConfigs.length > 0) {
                 const pageConfig = pageContext._pageConfigs.find((p) => p.pageId === pageId);
                 (0, utils_js_1.assert)(pageConfig);
-                usesClientRouter = (0, utils_js_2.getConfigValue)(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
+                usesClientRouter = (0, helpers_js_1.getConfigValue)(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
             }
             else {
                 usesClientRouter = globalContext.pluginManifest.usesClientRouter;

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

@@ -23,7 +23,7 @@ __exportStar(require("../../utils/objectAssign.js"), exports);
 __exportStar(require("../../utils/isObjectWithKeys.js"), exports);
 __exportStar(require("../../utils/isCallable.js"), exports);
 __exportStar(require("../../utils/getOutDirs.js"), exports);
-__exportStar(require("../../utils/hasPropertyGetter.js"), exports);
+__exportStar(require("../../utils/isPropertyGetter.js"), exports);
 __exportStar(require("../../utils/filesystemPathHandling.js"), exports);
 __exportStar(require("../../utils/urlToFile.js"), exports);
 __exportStar(require("../../shared/hooks/executeHook.js"), exports);

package/dist/cjs/node/runtime/html/serializePageContextClientSide.js

@@ -50,19 +50,33 @@ function serializePageContextClientSide(pageContext) {
             catch (err) {
                 hasWarned = true;
                 propsNonSerializable.push(prop);
-                (0, utils_js_1.assert)((0, utils_js_1.hasProp)(err, 'messageCore', 'string'));
-                (0, utils_js_1.assertWarning)(false, [
+                let msg = [
                     `${varName} cannot be serialized and, therefore, cannot be passed to the client.`,
-                    `Make sure that ${varName} is serializable, or remove ${h(propName)} from ${h('passToClient')}.`,
-                    `Serialization error: ${err.messageCore}.`
-                ].join(' '), { onlyOnce: false });
+                    `Make sure that ${varName} is serializable, or remove ${h(propName)} from ${h('passToClient')}.`
+                ].join(' ');
+                if ((0, stringify_1.isJsonSerializerError)(err)) {
+                    msg = `${msg} Serialization error: ${err.messageCore}.`;
+                }
+                else {
+                    // When a property getter throws an error
+                    console.warn('Serialization error:');
+                    console.warn(err);
+                    msg = `${msg} The serialization failed because of the error printed above.`;
+                }
+                // We warn (instead of throwing an error) since Vike's client runtime throws an error (with `assertUsage()`) if the user's client code tries to access the property that cannot be serialized
+                (0, utils_js_1.assertWarning)(false, msg, { onlyOnce: false });
             }
         });
         (0, utils_js_1.assert)(hasWarned);
         propsNonSerializable.forEach((prop) => {
             pageContextClient[prop] = notSerializable_js_1.notSerializable;
         });
-        pageContextSerialized = serialize(pageContextClient);
+        try {
+            pageContextSerialized = serialize(pageContextClient);
+        }
+        catch (err) {
+            (0, utils_js_1.assert)(false);
+        }
     }
     return pageContextSerialized;
 }

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

@@ -21,7 +21,7 @@ const preparePageContextForUserConsumptionServerSide_js_1 = require("./preparePa
 const executeGuardHook_js_1 = require("../../../shared/route/executeGuardHook.js");
 const loadPageRoutes_js_1 = require("../../../shared/route/loadPageRoutes.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const utils_js_2 = require("../../../shared/page-configs/utils.js");
+const helpers_js_1 = require("../../../shared/page-configs/helpers.js");
 async function renderPageAlreadyRouted(pageContext) {
     // pageContext._pageId can either be the:
     //  - ID of the page matching the routing, or the
@@ -173,7 +173,7 @@ function assertNonMixedDesign(pageFilesAll, pageConfigs) {
     const indent = '- ';
     const v1Files = (0, utils_js_1.unique)(pageConfigs
         .map((p) => Object.values(p.configValues)
-        .map(utils_js_2.getConfigValueFilePathToShowToUser)
+        .map(helpers_js_1.getConfigValueFilePathToShowToUser)
         .filter(utils_js_1.isNotNullish)
         .map((filePathToShowToUser) => indent + filePathToShowToUser))
         .flat(2));

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

@@ -246,8 +246,8 @@ async function renderPageNominal(pageContext) {
     }
     // Route
     {
-        const routeResult = await (0, index_js_1.route)(pageContext);
-        (0, utils_js_1.objectAssign)(pageContext, routeResult.pageContextAddendum);
+        const pageContextFromRoute = await (0, index_js_1.route)(pageContext);
+        (0, utils_js_1.objectAssign)(pageContext, pageContextFromRoute);
         (0, utils_js_1.objectAssign)(pageContext, { is404: pageContext._pageId ? null : true });
         if (pageContext._pageId === null) {
             const errorPageId = (0, error_page_js_1.getErrorPageId)(pageContext._pageFilesAll, pageContext._pageConfigs);

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

@@ -44,7 +44,7 @@ __exportStar(require("../../utils/capitalizeFirstLetter.js"), exports);
 __exportStar(require("../../utils/debugGlob.js"), exports);
 __exportStar(require("../../utils/isEquivalentError.js"), exports);
 __exportStar(require("../../utils/styleFileRE.js"), exports);
-__exportStar(require("../../utils/hasPropertyGetter.js"), exports);
+__exportStar(require("../../utils/isPropertyGetter.js"), exports);
 __exportStar(require("../../utils/debug.js"), exports);
 __exportStar(require("../../utils/urlToFile.js"), exports);
 __exportStar(require("../../utils/getGlobalObject.js"), exports);