vike 0.4.250 → 0.4.251-commit-9c5fb90

package/dist/node/api/preview.js

@@ -1,9 +1,12 @@
+import './assertEnvApi.js';
 export { preview };
 import { prepareViteApiCall } from './prepareViteApiCall.js';
 import { preview as previewVite } from 'vite';
 import { importServerProductionIndex } from '@brillout/vite-plugin-server-entry/runtime';
 import { getOutDirs } from '../vite/shared/getOutDirs.js';
-import { assertUsage, assertWarning, onSetupPreview, isCallable } from './utils.js';
+import { assertUsage, assertWarning } from '../../utils/assert.js';
+import { onSetupPreview } from '../../utils/assertSetup.js';
+import { isCallable } from '../../utils/isCallable.js';
 import pc from '@brillout/picocolors';
 import path from 'node:path';
 import { getVikeConfigInternal } from '../vite/shared/resolveVikeConfigInternal.js';

package/dist/node/api/resolveViteConfigFromUser.d.ts

@@ -1,3 +1,4 @@
+import './assertEnvApi.js';
 export { resolveViteConfigFromUser };
 export { isOnlyResolvingUserConfig };
 export { getVikeConfigInternalEarly };

package/dist/node/api/resolveViteConfigFromUser.js

@@ -1,3 +1,4 @@
+import './assertEnvApi.js';
 export { resolveViteConfigFromUser };
 export { isOnlyResolvingUserConfig };
 export { getVikeConfigInternalEarly };
@@ -7,7 +8,10 @@ export { normalizeViteRoot };
 import { loadConfigFromFile, mergeConfig, resolveConfig } from 'vite';
 import { getVikeConfigInternal, getVikeConfigFromCliOrEnv, setVikeConfigContext, isVikeConfigContextSet, } from '../vite/shared/resolveVikeConfigInternal.js';
 import path from 'node:path';
-import { assert, assertUsage, assertWarning, getGlobalObject, pick, toPosixPath } from './utils.js';
+import { assert, assertUsage, assertWarning } from '../../utils/assert.js';
+import { getGlobalObject } from '../../utils/getGlobalObject.js';
+import { pick } from '../../utils/pick.js';
+import { toPosixPath } from '../../utils/path.js';
 import pc from '@brillout/picocolors';
 import { getEnvVarObject } from '../vite/shared/getEnvVarObject.js';
 import { getVikeApiOperation, isVikeCliOrApi } from '../../shared-server-node/api-context.js';

package/dist/node/cli/assertEnvCli.d.ts

@@ -0,0 +1 @@
+import '../../utils/trackLogs.js';

package/dist/node/cli/{onLoad.js → assertEnvCli.js}

@@ -1,7 +1,8 @@
-export { onLoad };
+import '../../utils/trackLogs.js'; // should be loaded ASAP
 import { assertIsNotBrowser } from '../../utils/assertIsNotBrowser.js';
 import { assertIsNotProductionRuntime } from '../../utils/assertSetup.js';
-function onLoad() {
+assertEnv();
+function assertEnv() {
     assertIsNotBrowser();
     assertIsNotProductionRuntime();
 }

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

@@ -1,3 +1,4 @@
+import './assertEnvCli.js';
 export { isVikeCli };
 export { setContextCliCommand };
 export { getCliOptions };

package/dist/node/cli/context.js

@@ -1,7 +1,9 @@
+import './assertEnvCli.js';
 export { isVikeCli };
 export { setContextCliCommand };
 export { getCliOptions };
-import { assert, getGlobalObject } from './utils.js';
+import { assert } from '../../utils/assert.js';
+import { getGlobalObject } from '../../utils/getGlobalObject.js';
 const globalObject = getGlobalObject('cli/context.ts', {});
 function getCliOptions() {
     return globalObject.cliCommand?.cliOptions ?? null;

package/dist/node/cli/entry.d.ts

@@ -1 +1 @@
-export {};
+import './assertEnvCli.js';

package/dist/node/cli/entry.js

@@ -1,3 +1,4 @@
+import './assertEnvCli.js';
 import { dev, build, preview } from '../api/index.js';
 import pc from '@brillout/picocolors';
 import { parseCli } from './parseCli.js';

package/dist/node/cli/index.d.ts

@@ -1 +1,2 @@
+import './assertEnvCli.js';
 export { prerender } from '../api/prerender.js';

package/dist/node/cli/index.js

@@ -1,5 +1,6 @@
+import './assertEnvCli.js';
 // TO-DO/next-major-release: remove this file
 export { prerender } from '../api/prerender.js';
-import { assertWarning } from './utils.js';
+import { assertWarning } from '../../utils/assert.js';
 import pc from '@brillout/picocolors';
 assertWarning(false, `${pc.cyan("import { prerender } from 'vike/cli'")} is deprecated in favor of ${pc.cyan("import { prerender } from 'vike/api'")}`, { onlyOnce: true });

package/dist/node/cli/parseCli.d.ts

@@ -1,3 +1,4 @@
+import './assertEnvCli.js';
 export { parseCli };
 export type { Command };
 export type { CliOptions };

package/dist/node/cli/parseCli.js

@@ -1,6 +1,9 @@
+import './assertEnvCli.js';
 export { parseCli };
 import pc from '@brillout/picocolors';
-import { assert, includes, PROJECT_VERSION } from './utils.js';
+import { assert } from '../../utils/assert.js';
+import { includes } from '../../utils/includes.js';
+import { PROJECT_VERSION } from '../../utils/PROJECT_VERSION.js';
 import { parseJson5 } from '../vite/shared/getEnvVarObject.js';
 const commands = [
     { name: 'dev', desc: 'Start development server' },

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

@@ -1,13 +1,19 @@
 export { resolvePrerenderConfigGlobal };
 export { resolvePrerenderConfigLocal };
-import { assert, assertUsage, isArray, isObject, objectAssign } from './utils.js';
+import { assert, assertUsage } from '../../utils/assert.js';
+import { isArray } from '../../utils/isArray.js';
+import { isObject } from '../../utils/isObject.js';
+import { objectAssign } from '../../utils/objectAssign.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 +24,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 +37,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.d.ts

@@ -72,10 +72,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
     isClientSide: false;
     isPrerendering: boolean;
     _requestId: number;
-} & Pick<import("../../types/PageContext.js").PageContextInternalServer, "urlOriginal" | "headersOriginal"> & {
-    url?: string;
-    headers?: Record<string, string>;
-} & {
+} & import("../../types/PageContext.js").PageContextInit & {
     _globalContext: ({
         _globalConfigPublic: {
             pages: {
@@ -170,7 +167,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
     _pageFilesAll: PageFile[];
     _baseServer: string;
     _baseAssets: string;
-    _pageContextInit: import("../../server/runtime/renderPageServer.js").PageContextInit;
+    _pageContextInit: import("../../types/PageContext.js").PageContextInit;
     _urlHandler: ((url: string) => string) | null;
     isClientSideNavigation: boolean;
 } & {

package/dist/node/prerender/runPrerender.js

@@ -4,9 +4,24 @@ export { runPrerender };
 // - The prerenderContext is used by vike-vercel
 import path from 'node:path';
 import { route } from '../../shared-server-client/route/index.js';
-import { assert, assertUsage, assertWarning, hasProp, objectAssign, isObjectWithKeys, isCallable, isPropertyGetter, assertPosixPath, urlToFile, isPlainObject, pLimit, isArray, onSetupPrerender, PROJECT_VERSION, preservePropertyGetters, changeEnumerable, escapeHtml, } from './utils.js';
+import { PROJECT_VERSION } from '../../utils/PROJECT_VERSION.js';
+import { assert, assertUsage, assertWarning } from '../../utils/assert.js';
+import { onSetupPrerender } from '../../utils/assertSetup.js';
+import { changeEnumerable } from '../../utils/changeEnumerable.js';
+import { escapeHtml } from '../../utils/escapeHtml.js';
+import { hasProp } from '../../utils/hasProp.js';
+import { isArray } from '../../utils/isArray.js';
+import { isCallable } from '../../utils/isCallable.js';
+import { isObjectWithKeys } from '../../utils/isObjectWithKeys.js';
+import { isPlainObject } from '../../utils/isPlainObject.js';
+import { isPropertyGetter } from '../../utils/isPropertyGetter.js';
+import { objectAssign } from '../../utils/objectAssign.js';
+import { pLimit } from '../../utils/pLimit.js';
+import { preservePropertyGetters } from '../../utils/preservePropertyGetters.js';
+import { assertPosixPath } from '../../utils/path.js';
+import { urlToFile } from '../../utils/urlToFile.js';
 import { prerenderPage } from '../../server/runtime/renderPageServer/renderPageServerAfterRoute.js';
-import { createPageContextServerSide } from '../../server/runtime/renderPageServer/createPageContextServerSide.js';
+import { createPageContextServer } from '../../server/runtime/renderPageServer/createPageContextServer.js';
 import pc from '@brillout/picocolors';
 import { cpus } from 'node:os';
 import { getGlobalContextServerInternal, initGlobalContext_runPrerender, setGlobalContext_isPrerendering, setGlobalContext_prerenderContext, } from '../../server/runtime/globalContext.js';
@@ -22,14 +37,14 @@ import { loadPageConfigsLazyServerSide } from '../../server/runtime/renderPageSe
 import { getHookFromPageConfig, getHookFromPageConfigGlobal, getHookTimeoutDefault, getHook_setIsPrerenderering, } from '../../shared-server-client/hooks/getHook.js';
 import { noRouteMatch } from '../../shared-server-client/route/noRouteMatch.js';
 import { getVikeConfigInternal } from '../vite/shared/resolveVikeConfigInternal.js';
-import { execHookDirectWithoutPageContext, isUserHookError } from '../../shared-server-client/hooks/execHook.js';
+import { execHookSingleWithoutPageContext, isUserHookError } from '../../shared-server-client/hooks/execHook.js';
 import { setWasPrerenderRun } from './context.js';
 import { resolvePrerenderConfigGlobal, resolvePrerenderConfigLocal } from './resolvePrerenderConfig.js';
 import { getOutDirs } from '../vite/shared/getOutDirs.js';
 import fs from 'node:fs';
-import { getProxyForPublicUsage } from '../../shared-server-client/getProxyForPublicUsage.js';
+import { getPublicProxy } from '../../shared-server-client/getPublicProxy.js';
 import { getStaticRedirectsForPrerender } from '../../server/runtime/renderPageServer/resolveRedirects.js';
-import { updateType } from '../../server/utils.js';
+import { updateType } from '../../utils/updateType.js';
 const docLink = 'https://vike.dev/i18n#pre-rendering';
 async function runPrerender(options = {}, trigger) {
     setWasPrerenderRun(trigger);
@@ -45,7 +60,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');
@@ -107,7 +122,7 @@ async function runPrerender(options = {}, trigger) {
         console.log(`${pc.green(`✓`)} ${prerenderedCount} HTML documents pre-rendered.`);
     }
     await warnMissingPages(prerenderContext._prerenderedPageContexts, globalContext, doNotPrerenderList, partial);
-    const prerenderContextPublic = preparePrerenderContextForPublicUsage(prerenderContext);
+    const prerenderContextPublic = getPrerenderContextPublic(prerenderContext);
     objectAssign(vikeConfig.prerenderContext, prerenderContextPublic, true);
     setGlobalContext_prerenderContext(prerenderContextPublic);
     if (prerenderConfigGlobal.isPrerenderingEnabledForAllPages && !prerenderConfigGlobal.keepDistServer) {
@@ -117,8 +132,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 +146,7 @@ async function collectDoNoPrerenderList(pageConfigs, doNotPrerenderList, default
                 doNotPrerenderList.push({ pageId });
             }
         }
-    });
+    }));
     // Old design
     // TO-DO/next-major-release: remove
     await Promise.all(globalContext._pageFilesAll
@@ -218,7 +233,7 @@ async function callOnBeforePrerenderStartHooks(prerenderContext, globalContext,
         if (doNotPrerenderList.find((p) => p.pageId === pageId))
             return;
         const { hookName, hookFilePath } = hook;
-        const prerenderResult = await execHookDirectWithoutPageContext(() => hook.hookFn(), hook);
+        const prerenderResult = await execHookSingleWithoutPageContext(hook, globalContext, () => hook.hookFn());
         const result = normalizeOnPrerenderHookResult(prerenderResult, hookFilePath, hookName);
         // Handle result
         await Promise.all(result.map(async ({ url, pageContext }) => {
@@ -297,7 +312,7 @@ async function createPageContextPrerendering(urlOriginal, prerenderContext, glob
         urlOriginal,
         ...prerenderContext._pageContextInit,
     };
-    const pageContext = createPageContextServerSide(pageContextInit, globalContext, {
+    const pageContext = createPageContextServer(pageContextInit, globalContext, {
         isPrerendering: true,
         requestId,
     });
@@ -445,8 +460,8 @@ async function callOnPrerenderStartHook(prerenderContext, globalContext, concurr
         // https://vike.dev/i18n#pre-rendering
         preservePropertyGetters(pageContext);
     });
-    const prerenderContextPublic = preparePrerenderContextForPublicUsage(prerenderContext);
-    let result = await execHookDirectWithoutPageContext(() => hookFn(prerenderContextPublic), onPrerenderStartHook);
+    const prerenderContextPublic = getPrerenderContextPublic(prerenderContext);
+    let result = await execHookSingleWithoutPageContext(onPrerenderStartHook, globalContext, () => hookFn(prerenderContextPublic));
     // Before applying result
     prerenderContext.pageContexts.forEach((pageContext) => {
         ;
@@ -681,7 +696,7 @@ function assertIsNotAbort(err, urlOriginal) {
     assert(abortCall);
     assertUsage(false, `${pc.cyan(abortCall)} thrown${thrownBy} while pre-rendering ${urlOriginal} but ${pc.cyan(abortCaller)} isn't supported for pre-rendered pages`);
 }
-function preparePrerenderContextForPublicUsage(prerenderContext) {
+function getPrerenderContextPublic(prerenderContext) {
     // TO-DO/next-major-release: remove
     if (!('prerenderPageContexts' in prerenderContext)) {
         Object.defineProperty(prerenderContext, 'prerenderPageContexts', {
@@ -696,11 +711,11 @@ function preparePrerenderContextForPublicUsage(prerenderContext) {
         });
     }
     // Required because of https://vike.dev/i18n#pre-rendering
-    // - Thus, we have to let users access the original pageContext object => we cannot use ES proxies and we cannot use preparePageContextForPublicUsage()
+    // - Thus, we have to let users access the original pageContext object => we cannot use ES proxies and we cannot use getPageContextPublicShared()
     prerenderContext.pageContexts.forEach((pageContext) => {
         changeEnumerable(pageContext, '_isOriginalObject', true);
     });
-    const prerenderContextPublic = getProxyForPublicUsage(prerenderContext, 'prerenderContext');
+    const prerenderContextPublic = getPublicProxy(prerenderContext, 'prerenderContext');
     return prerenderContextPublic;
 }
 async function prerenderRedirects(globalContext, onComplete, showWarningUponDynamicRedirects) {

package/dist/node/prerender/runPrerenderEntry.js

@@ -2,7 +2,7 @@ export { runPrerenderFromAPI };
 export { runPrerenderFromCLIPrerenderCommand };
 export { runPrerenderFromAutoRun };
 export { runPrerender_forceExit };
-import { assert } from './utils.js';
+import { assert } from '../../utils/assert.js';
 import { prepareViteApiCall } from '../api/prepareViteApiCall.js';
 import { isVikeCli } from '../cli/context.js';
 import { isViteCli } from '../vite/shared/isViteCli.js';

package/dist/node/vite/assertEnvVite.d.ts

@@ -0,0 +1 @@
+import '../../utils/trackLogs.js';

package/dist/node/vite/{onLoad.js → assertEnvVite.js}

@@ -1,14 +1,19 @@
-export { onLoad };
+import '../../utils/trackLogs.js'; // should be loaded ASAP
 import { assertIsNotBrowser } from '../../utils/assertIsNotBrowser.js';
 import { assertIsNotProductionRuntime, markSetup_vikeVitePlugin } from '../../utils/assertSetup.js';
 import { assertNodeVersion } from '../../utils/assertNodeVersion.js';
 import { version as viteVersion } from 'vite';
 import { assertViteVersion } from '../../utils/assertViteVersion.js';
-function onLoad() {
+import { installUncaughtErrorHandlers } from '../../utils/installUncaughtErrorHandlers.js';
+assertEnv();
+onLoad();
+function assertEnv() {
     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
+}
+function onLoad() {
+    installUncaughtErrorHandlers();
 }

package/dist/node/vite/index.d.ts

@@ -1,8 +1,9 @@
+import './assertEnvVite.js';
 export default plugin;
 export { plugin };
 export { plugin as ssr };
 export { getVikeConfig } from './shared/resolveVikeConfigInternal.js';
-export { PROJECT_VERSION as version } from './utils.js';
+export { PROJECT_VERSION as version } from '../../utils/PROJECT_VERSION.js';
 export type { VikeVitePluginOptions as UserConfig };
 export type { VikeVitePluginOptions };
 type PluginInterop = Record<string, unknown> & {

package/dist/node/vite/index.js

@@ -1,12 +1,15 @@
+import './assertEnvVite.js';
 export default plugin;
 export { plugin };
 // TO-DO/next-major-release: remove
 export { plugin as ssr };
 export { getVikeConfig } from './shared/resolveVikeConfigInternal.js';
-export { PROJECT_VERSION as version } from './utils.js';
+export { PROJECT_VERSION as version } from '../../utils/PROJECT_VERSION.js';
 import { getClientEntrySrcDev } from './shared/getClientEntrySrcDev.js';
 import { setGetClientEntrySrcDev } from '../../server/runtime/renderPageServer/getPageAssets/retrievePageAssetsDev.js';
-import { assertIsNotProductionRuntime, assertUsage, isVitest } from './utils.js';
+import { assertIsNotProductionRuntime } from '../../utils/assertSetup.js';
+import { assertUsage } from '../../utils/assert.js';
+import { isVitest } from '../../utils/isVitest.js';
 import pc from '@brillout/picocolors';
 import { pluginPreview } from './plugins/pluginPreview.js';
 import { pluginDev } from './plugins/pluginDev.js';

package/dist/node/vite/plugins/build/handleAssetsManifest.d.ts

@@ -1,3 +1,4 @@
+import '../../assertEnvVite.js';
 export { handleAssetsManifest };
 export { handleAssetsManifest_getBuildConfig };
 export { handleAssetsManifest_isFixEnabled };

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

@@ -1,3 +1,4 @@
+import '../../assertEnvVite.js';
 export { handleAssetsManifest };
 export { handleAssetsManifest_getBuildConfig };
 export { handleAssetsManifest_isFixEnabled };
@@ -8,7 +9,12 @@ import fs from 'node:fs/promises';
 import fs_sync from 'node:fs';
 import path from 'node:path';
 import { existsSync } from 'node:fs';
-import { assert, assertWarning, getGlobalObject, isEqualStringList, isObject, pLimit, unique } from '../../utils.js';
+import { assert, assertWarning } from '../../../../utils/assert.js';
+import { getGlobalObject } from '../../../../utils/getGlobalObject.js';
+import { isEqualStringList } from '../../../../utils/isEqualStringList.js';
+import { isObject } from '../../../../utils/isObject.js';
+import { pLimit } from '../../../../utils/pLimit.js';
+import { unique } from '../../../../utils/unique.js';
 import { parseVirtualFileId } from '../../../../shared-server-node/virtualFileId.js';
 import { getAssetsDir } from '../../shared/getAssetsDir.js';
 import pc from '@brillout/picocolors';

package/dist/node/vite/plugins/build/pluginBuildApp.d.ts

@@ -1,3 +1,4 @@
+import '../../assertEnvVite.js';
 export { pluginBuildApp };
 import type { Plugin } from 'vite';
 declare function pluginBuildApp(): Plugin[];

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

@@ -1,7 +1,10 @@
+import '../../assertEnvVite.js';
 export { pluginBuildApp };
 import { runPrerender_forceExit } from '../../../prerender/runPrerenderEntry.js';
 import { resolveOutDir } from '../../shared/getOutDirs.js';
-import { assert, assertWarning, getGlobalObject, onSetupBuild } from '../../utils.js';
+import { assert, assertWarning } from '../../../../utils/assert.js';
+import { onSetupBuild } from '../../../../utils/assertSetup.js';
+import { getGlobalObject } from '../../../../utils/getGlobalObject.js';
 import { isPrerenderAutoRunEnabled, wasPrerenderRun } from '../../../prerender/context.js';
 import { isViteCli, getViteConfigForBuildFromCli } from '../../shared/isViteCli.js';
 import pc from '@brillout/picocolors';
@@ -129,7 +132,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/pluginBuildConfig.d.ts

@@ -1,3 +1,4 @@
+import '../../assertEnvVite.js';
 export { pluginBuildConfig };
 export { assertRollupInput };
 export { analyzeClientEntries };

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

@@ -1,7 +1,14 @@
+import '../../assertEnvVite.js';
 export { pluginBuildConfig };
 export { assertRollupInput };
 export { analyzeClientEntries };
-import { assert, setAssertOnBeforeLog, removeFileExtension, unique, assertUsage, injectRollupInputs, normalizeRollupInput, onSetupBuild, assertIsImportPathNpmPackage, requireResolveDistFile, } from '../../utils.js';
+import { assert, setAssertOnBeforeLog, assertUsage } from '../../../../utils/assert.js';
+import { onSetupBuild } from '../../../../utils/assertSetup.js';
+import { injectRollupInputs, normalizeRollupInput } from '../../../../utils/injectRollupInputs.js';
+import { assertIsImportPathNpmPackage } from '../../../../utils/parseNpmPackage.js';
+import { removeFileExtension } from '../../../../utils/removeFileExtension.js';
+import { requireResolveDistFile } from '../../../../utils/requireResolve.js';
+import { unique } from '../../../../utils/unique.js';
 import { getVikeConfigInternal } from '../../shared/resolveVikeConfigInternal.js';
 import { findPageFiles } from '../../shared/findPageFiles.js';
 import { generateVirtualFileId } from '../../../../shared-server-node/virtualFileId.js';

package/dist/node/vite/plugins/build/pluginDistFileNames.d.ts

@@ -1,3 +1,4 @@
+import '../../assertEnvVite.js';
 export { pluginDistFileNames };
 import type { Plugin } from 'vite';
 declare function pluginDistFileNames(): Plugin[];

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

@@ -1,8 +1,12 @@
+import '../../assertEnvVite.js';
 export { pluginDistFileNames };
 // Attempt to preserve file structure of `.page.js` files:
 //  - https://github.com/vikejs/vike/commit/11a4c49e5403aa7c37c8020c462b499425b41854
 //  - Blocker: https://github.com/rollup/rollup/issues/4724
-import { assertPosixPath, assert, assertUsage, isArray, isCallable } from '../../utils.js';
+import { assert, assertUsage } from '../../../../utils/assert.js';
+import { isArray } from '../../../../utils/isArray.js';
+import { isCallable } from '../../../../utils/isCallable.js';
+import { assertPosixPath } from '../../../../utils/path.js';
 import path from 'node:path';
 import crypto from 'node:crypto';
 import { getAssetsDir } from '../../shared/getAssetsDir.js';

package/dist/node/vite/plugins/build/pluginDistPackageJsonFile.d.ts

@@ -1,3 +1,4 @@
+import '../../assertEnvVite.js';
 export { pluginDistPackageJsonFile };
 import type { Plugin } from 'vite';
 declare function pluginDistPackageJsonFile(): Plugin[];

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

@@ -1,3 +1,4 @@
+import '../../assertEnvVite.js';
 export { pluginDistPackageJsonFile };
 import { rollupIsEsm } from '../../shared/rollupIsEsm.js';
 import { isViteServerSide } from '../../shared/isViteServerSide.js';

package/dist/node/vite/plugins/build/pluginModuleBanner.d.ts

@@ -1,3 +1,4 @@
+import '../../assertEnvVite.js';
 export { pluginModuleBanner };
 import type { Plugin } from 'vite';
 declare function pluginModuleBanner(): Plugin[];

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

@@ -1,12 +1,15 @@
+import '../../assertEnvVite.js';
 export { pluginModuleBanner };
-import { assert, removeVirtualFileIdPrefix } from '../../utils.js';
+import { assert } from '../../../../utils/assert.js';
+import { removeVirtualFileIdPrefix } from '../../../../utils/virtualFileId.js';
 import { getMagicString } from '../../shared/getMagicString.js';
 // Misusing legal comments so that esbuild doesn't remove them.
 // - Legal comments: https://esbuild.github.io/api/#legal-comments
 // - 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/plugins/build/pluginProdBuildEntry.d.ts

@@ -1,3 +1,4 @@
+import '../../assertEnvVite.js';
 export { pluginProdBuildEntry };
 export { set_macro_ASSETS_MANIFEST };
 import type { Plugin, Rollup } from 'vite';

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

@@ -1,8 +1,11 @@
+import '../../assertEnvVite.js';
 export { pluginProdBuildEntry };
 export { set_macro_ASSETS_MANIFEST };
 import { serverProductionEntryPlugin } from '@brillout/vite-plugin-server-entry/plugin';
 import { virtualFileIdGlobalEntryServer } from '../../../../shared-server-node/virtualFileId.js';
-import { assert, PROJECT_VERSION, requireResolveDistFile } from '../../utils.js';
+import { PROJECT_VERSION } from '../../../../utils/PROJECT_VERSION.js';
+import { assert } from '../../../../utils/assert.js';
+import { requireResolveDistFile } from '../../../../utils/requireResolve.js';
 import fs from 'node:fs/promises';
 import path from 'node:path';
 import { isUsingClientRouter } from '../pluginExtractExportNames.js';