vike 0.4.250-commit-6161324 → 0.4.250-commit-2686732

package/dist/node/prerender/context.d.ts

@@ -4,7 +4,7 @@ export { wasPrerenderRun };
 export { setWasPrerenderRun };
 import type { VikeConfigInternal } from '../vite/shared/resolveVikeConfigInternal.js';
 import type { PrerenderTrigger } from './runPrerender.js';
-declare function isPrerenderAutoRunEnabled(vikeConfig: VikeConfigInternal): boolean;
+declare function isPrerenderAutoRunEnabled(vikeConfig: VikeConfigInternal): Promise<boolean>;
 declare function temp_disablePrerenderAutoRun(): void;
 declare function wasPrerenderRun(): false | PrerenderTrigger;
 declare function setWasPrerenderRun(trigger: PrerenderTrigger): void;

package/dist/node/prerender/context.js

@@ -5,8 +5,8 @@ export { setWasPrerenderRun };
 import { getGlobalObject } from '../../utils/getGlobalObject.js';
 import { resolvePrerenderConfigGlobal } from './resolvePrerenderConfig.js';
 const globalObject = getGlobalObject('prerender/context.ts', {});
-function isPrerenderAutoRunEnabled(vikeConfig) {
-    const prerenderConfigGlobal = resolvePrerenderConfigGlobal(vikeConfig);
+async function isPrerenderAutoRunEnabled(vikeConfig) {
+    const prerenderConfigGlobal = await resolvePrerenderConfigGlobal(vikeConfig);
     return (prerenderConfigGlobal.isPrerenderingEnabled &&
         !(prerenderConfigGlobal || {}).disableAutoRun &&
         !globalObject.isDisabled &&

package/dist/node/prerender/resolvePrerenderConfig.d.ts

@@ -2,7 +2,7 @@ export { resolvePrerenderConfigGlobal };
 export { resolvePrerenderConfigLocal };
 import { VikeConfigInternal } from '../vite/shared/resolveVikeConfigInternal.js';
 import type { PageConfigBuildTime } from '../../types/PageConfig.js';
-declare function resolvePrerenderConfigGlobal(vikeConfig: Pick<VikeConfigInternal, 'config' | '_pageConfigs' | '_from'>): {
+declare function resolvePrerenderConfigGlobal(vikeConfig: Pick<VikeConfigInternal, 'config' | '_pageConfigs' | '_from'>): Promise<{
     partial: boolean;
     redirects: boolean | null;
     noExtraDir: boolean | null;
@@ -13,7 +13,7 @@ declare function resolvePrerenderConfigGlobal(vikeConfig: Pick<VikeConfigInterna
     defaultLocalValue: boolean;
     isPrerenderingEnabledForAllPages: boolean;
     isPrerenderingEnabled: boolean;
-};
-declare function resolvePrerenderConfigLocal(pageConfig: PageConfigBuildTime): {
+}>;
+declare function resolvePrerenderConfigLocal(pageConfig: PageConfigBuildTime): Promise<{
     value: boolean;
-} | null;
+} | null>;

package/dist/node/prerender/resolvePrerenderConfig.js

@@ -3,11 +3,14 @@ export { resolvePrerenderConfigLocal };
 import { assert, assertUsage, isArray, isObject, objectAssign } from './utils.js';
 import { getConfigValueBuildTime } from '../../shared-server-client/page-configs/getConfigValueBuildTime.js';
 import { getConfigDefinedAt } from '../../shared-server-client/page-configs/getConfigDefinedAt.js';
-// When setting +prerender to an object => it also enables pre-rendering
+import { isCallable } from '../../utils/isCallable.js';
+// +prerender is callable but getGlobalContext() cannot be used (see https://github.com/vikejs/vike/issues/3002#issuecomment-3703878380) but it's still useful (see https://github.com/vikejs/vike/issues/3002#issuecomment-3704141813)
+// When setting +prerender to an object => it activates pre-rendering
 const defaultValueForObject = true;
-function resolvePrerenderConfigGlobal(vikeConfig) {
+async function resolvePrerenderConfigGlobal(vikeConfig) {
     const prerenderConfigs = vikeConfig.config.prerender || [];
-    const prerenderSettings = prerenderConfigs.filter(isObject2);
+    const prerenderConfigsResolved = await Promise.all(prerenderConfigs.map((config) => (isCallable(config) ? config() : config)));
+    const prerenderSettings = prerenderConfigsResolved.filter(isObject2);
     const prerenderConfigGlobal = {
         partial: pickFirst(prerenderSettings.map((c) => c.partial)) ?? false,
         redirects: pickFirst(prerenderSettings.map((c) => c.redirects)) ?? null,
@@ -18,7 +21,7 @@ function resolvePrerenderConfigGlobal(vikeConfig) {
     };
     let defaultLocalValue = false;
     {
-        const valueFirst = prerenderConfigs.filter((p) => !isObject(p) || p.enable !== null)[0];
+        const valueFirst = prerenderConfigsResolved.filter((p) => !isObject(p) || p.enable !== null)[0];
         if (valueFirst === true || (isObject(valueFirst) && (valueFirst.enable ?? defaultValueForObject))) {
             defaultLocalValue = true;
         }
@@ -31,28 +34,31 @@ function resolvePrerenderConfigGlobal(vikeConfig) {
             defaultLocalValue = true;
         }
     }
+    const pageConfigs = vikeConfig._pageConfigs;
+    const prerenderConfigLocalList = await Promise.all(pageConfigs.map(resolvePrerenderConfigLocal));
+    const isEnable = (prerenderConfigLocal) => prerenderConfigLocal?.value ?? defaultLocalValue;
     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),
+        isPrerenderingEnabledForAllPages: pageConfigs.length > 0 && prerenderConfigLocalList.every(isEnable),
+        isPrerenderingEnabled: pageConfigs.length > 0 && prerenderConfigLocalList.some(isEnable),
     });
     // TO-DO/next-major-release: remove
     if (vikeConfig._pageConfigs.length === 0 && defaultLocalValue)
         prerenderConfigGlobal.isPrerenderingEnabled = true;
     return prerenderConfigGlobal;
 }
-function resolvePrerenderConfigLocal(pageConfig) {
+async function resolvePrerenderConfigLocal(pageConfig) {
     const configValue = getConfigValueBuildTime(pageConfig, 'prerender');
     if (!configValue)
         return null;
     const values = configValue.value;
     assert(isArray(values));
-    const value = values[0];
+    let value = values[0];
+    if (isCallable(value))
+        value = await value();
     assert(isArray(configValue.definedAtData));
     const configDefinedAt = getConfigDefinedAt('Config', 'prerender', configValue.definedAtData);
-    assertUsage(typeof value === 'boolean', `${configDefinedAt} must be a boolean (it isn't defined at a global location)`);
+    assertUsage(typeof value === 'boolean', `${configDefinedAt} must be a boolean (or a function that returns a boolean) because it's defined as a page setting (not as a global setting)`);
     const prerenderConfigLocal = { value };
     return prerenderConfigLocal;
 }

package/dist/node/prerender/runPrerender.js

@@ -45,7 +45,7 @@ async function runPrerender(options = {}, trigger) {
     const viteConfig = await resolveViteConfig(options.viteConfig || {}, 'build', 'production');
     const vikeConfig = await getVikeConfigInternal();
     const { outDirServer } = getOutDirs(viteConfig, undefined);
-    const prerenderConfigGlobal = resolvePrerenderConfigGlobal(vikeConfig);
+    const prerenderConfigGlobal = await resolvePrerenderConfigGlobal(vikeConfig);
     const { partial, noExtraDir, parallel, defaultLocalValue, isPrerenderingEnabled } = prerenderConfigGlobal;
     if (!isPrerenderingEnabled) {
         assert(trigger !== 'auto-run');
@@ -117,8 +117,8 @@ async function runPrerender(options = {}, trigger) {
 }
 async function collectDoNoPrerenderList(pageConfigs, doNotPrerenderList, defaultLocalValue, concurrencyLimit, globalContext) {
     // V1 design
-    pageConfigs.forEach((pageConfig) => {
-        const prerenderConfigLocal = resolvePrerenderConfigLocal(pageConfig);
+    await Promise.all(pageConfigs.map(async (pageConfig) => {
+        const prerenderConfigLocal = await resolvePrerenderConfigLocal(pageConfig);
         const { pageId } = pageConfig;
         if (!prerenderConfigLocal) {
             if (!defaultLocalValue) {
@@ -131,7 +131,7 @@ async function collectDoNoPrerenderList(pageConfigs, doNotPrerenderList, default
                 doNotPrerenderList.push({ pageId });
             }
         }
-    });
+    }));
     // Old design
     // TO-DO/next-major-release: remove
     await Promise.all(globalContext._pageFilesAll

package/dist/node/vite/onLoad.js

@@ -4,11 +4,12 @@ import { assertIsNotProductionRuntime, markSetup_vikeVitePlugin } from '../../ut
 import { assertNodeVersion } from '../../utils/assertNodeVersion.js';
 import { version as viteVersion } from 'vite';
 import { assertViteVersion } from '../../utils/assertViteVersion.js';
+import { installUncaughtErrorHandlers } from '../../utils/installUncaughtErrorHandlers.js';
 function onLoad() {
     markSetup_vikeVitePlugin();
     assertIsNotBrowser();
     assertNodeVersion();
     assertViteVersion(viteVersion);
-    // Ensure we don't bloat the server runtime with heavy dependencies such Vite and esbuild
-    assertIsNotProductionRuntime();
+    assertIsNotProductionRuntime(); // Don't bloat server with heavy dependencies like Vite and esbuild
+    installUncaughtErrorHandlers();
 }

package/dist/node/vite/plugins/build/pluginBuildApp.js

@@ -129,7 +129,7 @@ async function triggerPrerendering(config, viteEnv, bundle) {
     //  - Issue & reproduction: https://github.com/vikejs/vike/issues/1154#issuecomment-1965954636
     if (!bundle[getManifestFilePathRelative(config.build.manifest)])
         return;
-    if (!isPrerenderAutoRunEnabled(vikeConfig))
+    if (!(await isPrerenderAutoRunEnabled(vikeConfig)))
         return;
     const configInline = getFullBuildInlineConfig(config);
     const res = await runPrerenderFromAutoRun(configInline);

package/dist/node/vite/plugins/build/pluginModuleBanner.js

@@ -6,7 +6,8 @@ import { getMagicString } from '../../shared/getMagicString.js';
 // - Terser removes legal comments, but I guess users use terser to minify JavaScript so I guess it's a good thing that comment is removed.
 // - Rollup's banner feature doesn't work with Vite: https://github.com/vitejs/vite/issues/8412
 //   - But, anyways, we want to prepend the banner at the beginning of each module, not at the beginning of each file (I believe that's what Rollup's banner feature does).
-// - Potential alternative: https://github.com/vitejs/vite/issues/21228#issuecomment-3627899741
+// - Potential alternative: Rolldown's `postBanner` https://x.com/voidzerodev/status/2001683010446299613
+// - Potential alternative: Rolldown's `//#region` https://github.com/vitejs/vite/issues/21228#issuecomment-3627899741
 function pluginModuleBanner() {
     let config;
     let isEnabled = false;

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

@@ -164,7 +164,7 @@ async function resolveVikeConfigInternal_withErrorHandling(userRootDir, isDev, v
         }
         else {
             logErrorServerDev(err, null);
-            resolve(getVikeConfigDummy(esbuildCache));
+            resolve(await getVikeConfigDummy(esbuildCache));
         }
     }
 }
@@ -178,7 +178,7 @@ async function resolveVikeConfigInternal(userRootDir, vikeVitePluginOptions, esb
     temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, userRootDir);
     setCliAndApiOptions(pageConfigGlobal, configDefinitionsResolved);
     const globalConfigPublic = resolveGlobalConfig(pageConfigGlobal, pageConfigs);
-    const prerenderContext = resolvePrerenderContext({
+    const prerenderContext = await resolvePrerenderContext({
         config: globalConfigPublic.config,
         _from: globalConfigPublic._from,
         _pageConfigs: pageConfigs,
@@ -1092,8 +1092,8 @@ function isGlobalLocation(locationId, plusFilesByLocationId) {
         .map(([locationId]) => locationId);
     return locationIdsPage.every((locId) => isInherited(locationId, locId));
 }
-function resolvePrerenderContext(vikeConfig) {
-    const { isPrerenderingEnabled, isPrerenderingEnabledForAllPages } = resolvePrerenderConfigGlobal(vikeConfig);
+async function resolvePrerenderContext(vikeConfig) {
+    const { isPrerenderingEnabled, isPrerenderingEnabledForAllPages } = await resolvePrerenderConfigGlobal(vikeConfig);
     globalObject.prerenderContext ?? (globalObject.prerenderContext = {
         isPrerenderingEnabled: false,
         isPrerenderingEnabledForAllPages: false,
@@ -1121,14 +1121,14 @@ function restartViteDevServer() {
     })();
     swallowViteLogForceOptimization_disable();
 }
-function getVikeConfigDummy(esbuildCache) {
+async function getVikeConfigDummy(esbuildCache) {
     const pageConfigsDummy = [];
     const pageConfigGlobalDummy = {
         configValueSources: {},
         configDefinitions: {},
     };
     const globalConfigPublicDummy = resolveGlobalConfig(pageConfigGlobalDummy, pageConfigsDummy);
-    const prerenderContextDummy = resolvePrerenderContext({
+    const prerenderContextDummy = await resolvePrerenderContext({
         config: globalConfigPublicDummy.config,
         _from: globalConfigPublicDummy._from,
         _pageConfigs: pageConfigsDummy,

package/dist/server/onLoad.js

@@ -4,9 +4,11 @@ import { assertNodeVersion } from '../utils/assertNodeVersion.js';
 import { setAssertAlwaysShowStackTrace } from '../utils/assert.js';
 import { installRequireShim } from '@brillout/require-shim';
 import { isDebugError } from '../utils/debug.js';
+import { installUncaughtErrorHandlers } from '../utils/installUncaughtErrorHandlers.js';
 function onLoad() {
     assertIsNotBrowser();
     assertNodeVersion();
+    installUncaughtErrorHandlers();
     if (isDebugError()) {
         // Is also executed upon `$ vike build` because node/vite/utils.ts imports server/utils.ts
         Error.stackTraceLimit = Infinity;

package/dist/types/Config.d.ts

@@ -265,76 +265,7 @@ type ConfigBuiltIn = {
      *
      * @default false
      */
-    prerender?: boolean | ImportStringList | {
-        /**
-         * Allow only some of your pages to be pre-rendered.
-         *
-         * This setting doesn't affect the pre-rendering process: it merely suppresses the warnings when some of your pages cannot be pre-rendered.
-         *
-         * https://vike.dev/prerender#partial
-         *
-         * @default false
-         */
-        partial?: boolean;
-        /**
-         * Whether +redirects should be pre-rendered to HTML documents that redirect the user.
-         *
-         * https://vike.dev/prerender#redirects
-         */
-        redirects?: boolean;
-        /**
-         * Don't create a new directory for each HTML file.
-         *
-         * For example, generate `dist/client/about.html` instead of `dist/client/about/index.html`.
-         *
-         * https://vike.dev/prerender#noextradir
-         *
-         * @default false
-         */
-        noExtraDir?: boolean;
-        /**
-         * Number of concurrent pre-render jobs.
-         *
-         * Set to `false` to disable concurrency.
-         *
-         * https://vike.dev/prerender#parallel
-         *
-         * @default os.cpus().length
-         */
-        parallel?: boolean | number;
-        /**
-         * Disable the automatic initiation of the pre-rendering process when running `$ vike build`.
-         *
-         * Use this if you want to programmatically initiate the pre-rendering process instead.
-         *
-         * https://vike.dev/prerender#disableautorun
-         *
-         * @default false
-         */
-        disableAutoRun?: boolean;
-        /**
-         * Whether to enable pre-rendering.
-         *
-         * Setting `enable: null` enables you to set prerender settings without enabling pre-rendering by default.
-         *
-         * This is useful, for example, if you want pre-rendering to stay opt-in instead of opt-out while setting pre-render settings globally.
-         *
-         * https://vike.dev/prerender#enable
-         *
-         * @default true
-         */
-        enable?: boolean | null;
-        /**
-         * If you pre-render all your pages then Vike removes the `dist/server/` directory after pre-rendering has finished.
-         *
-         * If you set this setting to `true` then Vike won't remove the `dist/server/` directory.
-         *
-         * https://vike.dev/prerender#keepDistServer
-         *
-         * @default false
-         */
-        keepDistServer?: boolean;
-    };
+    prerender?: PrerenderSetting | (() => PrerenderSetting | Promise<PrerenderSetting>) | ImportStringList;
     /**
      * Install Vike extensions.
      *
@@ -604,6 +535,76 @@ type ConfigBuiltIn = {
      */
     staticReplace?: StaticReplace[];
 };
+type PrerenderSetting = boolean | {
+    /**
+     * Allow only some of your pages to be pre-rendered.
+     *
+     * This setting doesn't affect the pre-rendering process: it merely suppresses the warnings when some of your pages cannot be pre-rendered.
+     *
+     * https://vike.dev/prerender#partial
+     *
+     * @default false
+     */
+    partial?: boolean;
+    /**
+     * Whether +redirects should be pre-rendered to HTML documents that redirect the user.
+     *
+     * https://vike.dev/prerender#redirects
+     */
+    redirects?: boolean;
+    /**
+     * Don't create a new directory for each HTML file.
+     *
+     * For example, generate `dist/client/about.html` instead of `dist/client/about/index.html`.
+     *
+     * https://vike.dev/prerender#noextradir
+     *
+     * @default false
+     */
+    noExtraDir?: boolean;
+    /**
+     * Number of concurrent pre-render jobs.
+     *
+     * Set to `false` to disable concurrency.
+     *
+     * https://vike.dev/prerender#parallel
+     *
+     * @default os.cpus().length
+     */
+    parallel?: boolean | number;
+    /**
+     * Disable the automatic initiation of the pre-rendering process when running `$ vike build`.
+     *
+     * Use this if you want to programmatically initiate the pre-rendering process instead.
+     *
+     * https://vike.dev/prerender#disableautorun
+     *
+     * @default false
+     */
+    disableAutoRun?: boolean;
+    /**
+     * Whether to enable pre-rendering.
+     *
+     * Setting `enable: null` enables you to set prerender settings without enabling pre-rendering by default.
+     *
+     * This is useful, for example, if you want pre-rendering to stay opt-in instead of opt-out while setting pre-render settings globally.
+     *
+     * https://vike.dev/prerender#enable
+     *
+     * @default true
+     */
+    enable?: boolean | null;
+    /**
+     * If you pre-render all your pages then Vike removes the `dist/server/` directory after pre-rendering has finished.
+     *
+     * If you set this setting to `true` then Vike won't remove the `dist/server/` directory.
+     *
+     * https://vike.dev/prerender#keepDistServer
+     *
+     * @default false
+     */
+    keepDistServer?: boolean;
+};
 type ConfigBuiltInResolved = {
     passToClient?: string[][];
     redirects?: Record<string, string>[];

package/dist/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.250-commit-6161324";
+export declare const PROJECT_VERSION: "0.4.250-commit-2686732";

package/dist/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.250-commit-6161324';
+export const PROJECT_VERSION = '0.4.250-commit-2686732';

package/dist/utils/installUncaughtErrorHandlers.d.ts

@@ -0,0 +1,2 @@
+export { installUncaughtErrorHandlers };
+declare function installUncaughtErrorHandlers(): void;

package/dist/utils/installUncaughtErrorHandlers.js

@@ -0,0 +1,20 @@
+export { installUncaughtErrorHandlers };
+import { getGlobalObject } from './getGlobalObject.js';
+const globalObject = getGlobalObject('./installUncaughtErrorHandlers.ts', {
+    installed: false,
+});
+// Avoid server shutdown upon uncaught errors, e.g. `setTimeout(() => throw new Error('Uncaught error'), 10)`
+// If in the future we want to call +onError then let's use different handlers
+function installUncaughtErrorHandlers() {
+    if (globalObject.installed)
+        return;
+    globalObject.installed = true;
+    if (typeof process === 'undefined')
+        return;
+    process?.addListener?.('uncaughtException', (err) => {
+        console.error(err);
+    });
+    process?.addListener?.('unhandledRejection', (err) => {
+        console.error(err);
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.250-commit-6161324",
+  "version": "0.4.250-commit-2686732",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -124,7 +124,7 @@
     "@brillout/json-serializer": "^0.5.21",
     "@brillout/picocolors": "^1.0.30",
     "@brillout/require-shim": "^0.1.2",
-    "@brillout/vite-plugin-server-entry": "^0.7.15",
+    "@brillout/vite-plugin-server-entry": "^0.7.17",
     "cac": "^6.0.0",
     "es-module-lexer": "^1.0.0",
     "esbuild": ">=0.19.0",