vike 0.4.223 → 0.4.224-commit-00ed9fe

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/plugins/previewConfig.js

@@ -11,6 +11,8 @@ const addSsrMiddleware_js_1 = require("../shared/addSsrMiddleware.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const index_js_1 = require("./devConfig/index.js");
 const getOutDirs_js_1 = require("../shared/getOutDirs.js");
+const sirv_1 = __importDefault(require("sirv"));
+const resolvePrerenderConfig_js_1 = require("../../prerender/resolvePrerenderConfig.js");
 function previewConfig() {
     let config;
     // let vikeConfig: VikeConfigObject
@@ -37,23 +39,26 @@ function previewConfig() {
             */
             return () => {
                 assertDist();
-                /* 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 (!vikeConfig.global.config.prerender || vikeConfig.global.config.prerender.partial) {
-                  addSsrMiddleware(server.middlewares, config, true)
+                // We cannot re-use Vite's static middleware: https://github.com/vitejs/vite/pull/14836#issuecomment-1788540300
+                addStaticAssetsMiddleware(server.middlewares);
+                const prerenderConfigGlobal = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfigGlobal)(config._vikeConfigObject);
+                if (!prerenderConfigGlobal.isPrerenderingEnabledForAllPages) {
+                    (0, addSsrMiddleware_js_1.addSsrMiddleware)(server.middlewares, config, true, prerenderConfigGlobal.isPrerenderingEnabled);
                 }
-                /*/
-                (0, addSsrMiddleware_js_1.addSsrMiddleware)(server.middlewares, config, true);
-                //*/
                 addStatic404Middleware(server.middlewares);
             };
         }
     };
     function assertDist() {
-        let { outDirRoot, outDirClient, outDirServer } = (0, getOutDirs_js_1.getOutDirs)(config);
+        const { outDirRoot, outDirClient, outDirServer } = (0, getOutDirs_js_1.getOutDirs)(config);
         [outDirRoot, outDirClient, outDirServer].forEach((outDirAny) => {
             (0, utils_js_1.assertUsage)(fs_1.default.existsSync(outDirAny), `Cannot run ${picocolors_1.default.cyan('$ vike preview')}: your app isn't built (the build directory ${picocolors_1.default.cyan(outDirAny)} is missing). Make sure to run ${picocolors_1.default.cyan('$ vike build')} before running ${picocolors_1.default.cyan('$ vike preview')}.`);
         });
     }
+    function addStaticAssetsMiddleware(middlewares) {
+        const { outDirClient } = (0, getOutDirs_js_1.getOutDirs)(config);
+        middlewares.use((0, sirv_1.default)(outDirClient));
+    }
     function addStatic404Middleware(middlewares) {
         const { outDirClient } = (0, getOutDirs_js_1.getOutDirs)(config);
         middlewares.use(config.base, (_, res, next) => {

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

@@ -7,7 +7,7 @@ exports.addSsrMiddleware = addSsrMiddleware;
 const renderPage_js_1 = require("../../runtime/renderPage.js");
 const utils_js_1 = require("../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-function addSsrMiddleware(middlewares, config, isPreview) {
+function addSsrMiddleware(middlewares, config, isPreview, isPrerenderingEnabled) {
     middlewares.use(async (req, res, next) => {
         if (res.headersSent)
             return next();
@@ -42,6 +42,10 @@ function addSsrMiddleware(middlewares, config, isPreview) {
             // - We purposely don't use next(err) to align behavior: we use our own/copied implementation of buildErrorMessage() regardless of whether the user uses Vite's dev middleware or Vite's standalone dev server
             return next();
         }
+        if (pageContext.httpResponse.statusCode === 404 && isPreview && isPrerenderingEnabled) {
+            // Serve /dist/client/404.html instead
+            return next();
+        }
         const configHeaders = (isPreview && config?.preview?.headers) || config?.server?.headers;
         if (configHeaders) {
             for (const [name, value] of Object.entries(configHeaders))

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.isPrerenderingEnabled &&
+        !(prerenderConfigGlobal || {}).disableAutoRun &&
         !globalObject.isDisabled &&
         vikeConfig.global.config.disableAutoFullBuild !== 'prerender');
 }

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

@@ -1,29 +1,38 @@
 "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,
+        isPrerenderingEnabledForAllPages: vikeConfig.pageConfigs.length > 0 &&
+            vikeConfig.pageConfigs.every((pageConfig) => resolvePrerenderConfigLocal(pageConfig)?.value ?? defaultLocalValue),
+        isPrerenderingEnabled: vikeConfig.pageConfigs.length > 0 &&
+            vikeConfig.pageConfigs.some((pageConfig) => resolvePrerenderConfigLocal(pageConfig)?.value ?? defaultLocalValue)
+    });
+    // TODO/next-major remove
+    if (vikeConfig.pageConfigs.length === 0 && defaultLocalValue)
+        prerenderConfigGlobal.isPrerenderingEnabled = true;
+    return prerenderConfigGlobal;
 }
 function resolvePrerenderConfigLocal(pageConfig) {
     const configValue = (0, getConfigValueBuildTime_js_1.getConfigValueBuildTime)(pageConfig, 'prerender');
@@ -32,11 +41,11 @@ function resolvePrerenderConfigLocal(pageConfig) {
     const values = configValue.value;
     (0, utils_js_1.assert)((0, utils_js_1.isArray)(values));
     const value = values[0];
+    // TODO/now I believe this assert() can fail
     (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,14 @@ 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, isPrerenderingEnabled } = prerenderConfigGlobal;
+    if (!isPrerenderingEnabled) {
         (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`, {
-            onlyOnce: true
-        });
+        // TODO/now: make it assertUsage() and remove dist/server/entry.mjs if pre-rendering is completely disabled
+        (0, utils_js_1.assertWarning)(false, `You're executing ${picocolors_1.default.cyan(standaloneTrigger)} but you didn't enable pre-rendering. Use the ${picocolors_1.default.cyan('prerender')} setting (${picocolors_1.default.underline('https://vike.dev/prerender')}) to enable pre-rendering for at least one page.`, { 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 +140,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 +163,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 +210,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 +563,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 +810,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/html/stream.js

@@ -164,6 +164,13 @@ function getStreamReadableWeb(htmlRender) {
     if (isStreamReadableWeb(htmlRender)) {
         return htmlRender;
     }
+    if (isStreamPipeWeb(htmlRender)) {
+        const streamPipeWeb = getStreamPipeWeb(htmlRender);
+        (0, utils_js_1.assert)(streamPipeWeb);
+        const { readable, writable } = new TransformStream();
+        streamPipeWeb(writable);
+        return readable;
+    }
     return null;
 }
 function pipeToStreamWritableWeb(htmlRender, writable) {

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

@@ -9,20 +9,28 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const globalObject = (0, utils_js_1.getGlobalObject)('createHttpResponse/assertNoInfiniteHttpRedirect.ts', {
     redirectGraph: {}
 });
-function assertNoInfiniteHttpRedirect(urlRedirectTarget, urlLogical) {
+// It's too strict, see https://github.com/vikejs/vike/issues/1270#issuecomment-1820608999
+// - Let's create a new setting `+doNotCatchInfiniteRedirect` if someone complains.
+function assertNoInfiniteHttpRedirect(
+// The exact URL that the user will be redirected to.
+// - It includes the Base URL as well as the locale (i18n) base.
+urlRedirectTarget, 
+// Rationale for checking against `pageContextInit.urlOriginal`: https://github.com/vikejs/vike/pull/2264#issuecomment-2713890263
+pageContextInit) {
     if (!urlRedirectTarget.startsWith('/')) {
-        // We assume that urlRedirectTarget points to an origin that is external (not the same origin), and we can therefore assume that the app doesn't define an infinite loop (in itself).
-        //  - There isn't a reliable way to check whether the redirect points to an external origin or the same origin. For same origins, we assume/hope the user to pass the URL without origin.
+        // We assume that urlRedirectTarget points to an origin that is external (not the same origin), and we can therefore assume that the app doesn't define an infinite loop (at least not in itself).
+        //  - There isn't a reliable way to check whether the redirect points to an external origin or the same origin; we hope/assume the user sets the URL without origin.
         //    ```js
         //    // For same-origin, the user usually/hopefully passes a URL without origin
         //    renderPage({ urlOriginal: '/some/pathname' })
         //    ```
         return;
     }
-    (0, utils_js_1.assert)(urlLogical.startsWith('/'));
+    const urlOriginalNormalized = (0, utils_js_1.removeUrlOrigin)(pageContextInit.urlOriginal).urlModified;
+    (0, utils_js_1.assert)(urlOriginalNormalized.startsWith('/'));
     const graph = copy(globalObject.redirectGraph);
     graph[urlRedirectTarget] ?? (graph[urlRedirectTarget] = new Set());
-    graph[urlRedirectTarget].add(urlLogical);
+    graph[urlRedirectTarget].add(urlOriginalNormalized);
     validate(graph);
     globalObject.redirectGraph = graph;
 }

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

@@ -84,10 +84,8 @@ async function createHttpResponsePageContextJson(pageContextSerialized) {
     const httpResponse = createHttpResponse(200, 'application/json', [], pageContextSerialized, [], null);
     return httpResponse;
 }
-function createHttpResponseRedirect({ url, statusCode }, 
-// The URL we assume the redirect to be logically based on
-urlLogical) {
-    (0, assertNoInfiniteHttpRedirect_js_1.assertNoInfiniteHttpRedirect)(url, urlLogical);
+function createHttpResponseRedirect({ url, statusCode }, pageContextInit) {
+    (0, assertNoInfiniteHttpRedirect_js_1.assertNoInfiniteHttpRedirect)(url, pageContextInit);
     (0, utils_js_1.assert)(url);
     (0, utils_js_1.assert)(statusCode);
     (0, utils_js_1.assert)(300 <= statusCode && statusCode <= 399);

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

@@ -27,15 +27,25 @@ const errorsMisc = [
         errMsg: 'assets.json',
         link: 'https://vike.dev/getGlobalContext',
         mustMentionNodeModules: false
+    },
+    {
+        errMsg: 'ERR_UNKNOWN_FILE_EXTENSION',
+        link: 'https://vike.dev/broken-npm-package#err-unknown-file-extension'
     }
 ];
+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')"
@@ -71,7 +81,8 @@ const errorsCjsEsm = [
     { errMsg: 'exports is not defined' },
     { errMsg: 'module is not defined' },
     { errMsg: 'not defined in ES' },
-    { errMsg: "Unexpected token 'export'" }
+    { errMsg: "Unexpected token 'export'" },
+    { errMsg: 'Failed to resolve entry for package' }
 ];
 function logErrorHint(error) {
     /* Collect errors for ./logErrorHint.spec.ts

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

@@ -346,7 +346,7 @@ async function normalizeUrl(pageContextInit, globalContext, httpRequestId) {
     if (!urlNormalized)
         return null;
     (0, loggerRuntime_js_1.logRuntimeInfo)?.(`URL normalized from ${picocolors_1.default.cyan(urlOriginal)} to ${picocolors_1.default.cyan(urlNormalized)} (https://vike.dev/url-normalization)`, httpRequestId, 'info');
-    const httpResponse = (0, createHttpResponse_js_1.createHttpResponseRedirect)({ url: urlNormalized, statusCode: 301 }, pageContextInit.urlOriginal);
+    const httpResponse = (0, createHttpResponse_js_1.createHttpResponseRedirect)({ url: urlNormalized, statusCode: 301 }, pageContextInit);
     const pageContextHttpResponse = createPageContext(pageContextInit);
     (0, utils_js_1.objectAssign)(pageContextHttpResponse, { httpResponse });
     return pageContextHttpResponse;
@@ -388,7 +388,7 @@ async function getPermanentRedirect(pageContextInit, globalContext, httpRequestI
         (0, utils_js_1.assert)(urlTarget !== pageContextInit.urlOriginal);
     }
     (0, loggerRuntime_js_1.logRuntimeInfo)?.(`Permanent redirection defined by config.redirects (https://vike.dev/redirects)`, httpRequestId, 'info');
-    const httpResponse = (0, createHttpResponse_js_1.createHttpResponseRedirect)({ url: urlTarget, statusCode: 301 }, urlWithoutBase);
+    const httpResponse = (0, createHttpResponse_js_1.createHttpResponseRedirect)({ url: urlTarget, statusCode: 301 }, pageContextInit);
     const pageContextHttpResponse = createPageContext(pageContextInit);
     (0, utils_js_1.objectAssign)(pageContextHttpResponse, { httpResponse });
     return pageContextHttpResponse;
@@ -396,7 +396,9 @@ async function getPermanentRedirect(pageContextInit, globalContext, httpRequestI
 function normalize(url) {
     return url || '/';
 }
-async function handleAbortError(errAbort, pageContextsFromRewrite, pageContextInit, 
+async function handleAbortError(errAbort, pageContextsFromRewrite, 
+// The original `pageContextInit` object passed to `renderPage(pageContextInit)`
+pageContextInit, 
 // handleAbortError() creates a new pageContext object and we don't merge pageContextNominalPageInit to it: we only use some pageContextNominalPageInit information.
 pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit, globalContext) {
     (0, abort_js_1.logAbortErrorHandled)(errAbort, globalContext.isProduction, pageContextNominalPageInit);
@@ -434,13 +436,7 @@ pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit, globalConte
     if (pageContextAbort._urlRedirect) {
         const pageContextReturn = createPageContext(pageContextInit);
         (0, utils_js_1.objectAssign)(pageContextReturn, pageContextAbort);
-        const httpResponse = (0, createHttpResponse_js_1.createHttpResponseRedirect)(pageContextAbort._urlRedirect, (() => {
-            const { pathname, searchOriginal } = pageContextNominalPageInit.urlParsed;
-            const urlLogical = (0, utils_js_1.createUrlFromComponents)(null, pathname, searchOriginal, 
-            // The server-side doesn't have access to the hash
-            null);
-            return urlLogical;
-        })());
+        const httpResponse = (0, createHttpResponse_js_1.createHttpResponseRedirect)(pageContextAbort._urlRedirect, pageContextInit);
         (0, utils_js_1.objectAssign)(pageContextReturn, { httpResponse });
         return { pageContextReturn };
     }

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