vike 0.4.253 → 0.4.254

package/dist/client/runtime-server-routing/getGlobalContextClientInternal.d.ts

@@ -1,6 +1,6 @@
-import '../assertEnvClient.js';
 export { getGlobalContextClientInternal };
 export type { GlobalContextClientInternalWithServerRouting };
+import '../assertEnvClient.js';
 type GlobalContextClientInternalWithServerRouting = Awaited<ReturnType<typeof getGlobalContextClientInternal>>;
 declare function getGlobalContextClientInternal(): Promise<{
     _globalConfigPublic: {

package/dist/client/runtime-server-routing/getGlobalContextClientInternal.js

@@ -1,6 +1,6 @@
-import '../assertEnvClient.js';
 export { getGlobalContextClientInternal };
 import { getGlobalContextClientInternalShared } from '../shared/getGlobalContextClientInternalShared.js';
+import '../assertEnvClient.js';
 async function getGlobalContextClientInternal() {
     const globalContext = await getGlobalContextClientInternalShared();
     return globalContext;

package/dist/client/runtime-server-routing/getPageContextPublicClient.d.ts

@@ -1,9 +1,9 @@
-import '../assertEnvClient.js';
 export { getPageContextPublicClient };
 export type { PageContextPublicClient };
 import type { PageContextConfig } from '../../shared-server-client/getPageFiles.js';
 import type { PageContextInternalClient_ServerRouting } from '../../types/PageContext.js';
 import type { PageContextPublicMinimum } from '../../shared-server-client/getPageContextPublicShared.js';
+import '../assertEnvClient.js';
 type PageContextPublicClient = PageContextPublicMinimum & PageContextInternalClient_ServerRouting & PageContextConfig;
 declare function getPageContextPublicClient<PageContext extends PageContextPublicClient>(pageContext: PageContext): PageContext & {
     Page: unknown;

package/dist/client/runtime-server-routing/getPageContextPublicClient.js

@@ -1,6 +1,6 @@
-import '../assertEnvClient.js';
 export { getPageContextPublicClient };
 import { getPageContextPublicClientShared } from '../shared/getPageContextPublicClientShared.js';
+import '../assertEnvClient.js';
 function getPageContextPublicClient(pageContext) {
     return getPageContextPublicClientShared(pageContext);
 }

package/dist/client/runtime-server-routing/index.d.ts

@@ -1,5 +1,5 @@
-import '../assertEnvClient.js';
 import type { PageContextBuiltInClientWithServerRouting } from '../../types/PageContext.js';
+import '../assertEnvClient.js';
 /** @deprecated
  * Replace:
  *   ```

package/dist/client/runtime-server-routing/index.js

@@ -1 +1,2 @@
+// TO-DO/next-major-release: remove this file
 import '../assertEnvClient.js';

package/dist/client/shared/execHookOnRenderClient.d.ts

@@ -1,10 +1,10 @@
-import '../assertEnvClient.js';
 export { execHookOnRenderClient };
 export type { PageContextBeforeRenderClient };
 import type { PageFile, PageContextConfig } from '../../shared-server-client/getPageFiles.js';
 import type { GlobalContextClientInternalShared } from './getGlobalContextClientInternalShared.js';
 import type { PageContextCreatedClient } from '../runtime-client-routing/createPageContextClient.js';
 import type { PageContextCreatedClient_ServerRouting } from '../runtime-server-routing/createPageContextClient.js';
+import '../assertEnvClient.js';
 type PageContextCreatedClientShared = PageContextCreatedClient | PageContextCreatedClient_ServerRouting;
 type PageContextBeforeRenderClient = {
     _pageFilesLoaded: PageFile[];

package/dist/client/shared/execHookOnRenderClient.js

@@ -1,8 +1,8 @@
-import '../assertEnvClient.js';
 export { execHookOnRenderClient };
 import { assert, assertUsage } from '../../utils/assert.js';
 import { getHookFromPageContext } from '../../shared-server-client/hooks/getHook.js';
 import { execHookSingle } from '../../shared-server-client/hooks/execHook.js';
+import '../assertEnvClient.js';
 async function execHookOnRenderClient(pageContext, getPageContextPublic) {
     let hook = null;
     {

package/dist/client/shared/getCurrentUrl.d.ts

@@ -1,5 +1,5 @@
-import '../assertEnvClient.js';
 export { getCurrentUrl };
+import '../assertEnvClient.js';
 declare function getCurrentUrl(options?: {
     withoutHash: true;
 }): `/${string}`;

package/dist/client/shared/getCurrentUrl.js

@@ -1,6 +1,6 @@
-import '../assertEnvClient.js';
 export { getCurrentUrl };
 import { normalizeClientSideUrl } from './normalizeClientSideUrl.js';
+import '../assertEnvClient.js';
 function getCurrentUrl(options) {
     return normalizeClientSideUrl(window.location.href, options);
 }

package/dist/client/shared/getGlobalContextClientInternalShared.d.ts

@@ -1,4 +1,3 @@
-import '../assertEnvClient.js';
 export { getGlobalContext };
 export { getGlobalContextSync };
 export { setVirtualFileExportsGlobalEntry };
@@ -6,6 +5,7 @@ export { getGlobalContextClientInternalShared };
 export type GlobalContextClientInternalShared = GlobalContextClientInternal | GlobalContextClientInternalWithServerRouting;
 import type { GlobalContextClientInternal } from '../runtime-client-routing/getGlobalContextClientInternal.js';
 import type { GlobalContextClientInternalWithServerRouting } from '../runtime-server-routing/getGlobalContextClientInternal.js';
+import '../assertEnvClient.js';
 declare function getGlobalContextClientInternalShared(): Promise<{
     _globalConfigPublic: {
         pages: {

package/dist/client/shared/getGlobalContextClientInternalShared.js

@@ -1,4 +1,3 @@
-import '../assertEnvClient.js';
 // Public usage
 export { getGlobalContext };
 export { getGlobalContextSync };
@@ -12,6 +11,7 @@ import { checkType } from '../../utils/checkType.js';
 import { genPromise } from '../../utils/genPromise.js';
 import { getGlobalObject } from '../../utils/getGlobalObject.js';
 import { objectAssign } from '../../utils/objectAssign.js';
+import '../assertEnvClient.js';
 const globalObject = getGlobalObject('getGlobalContextClientInternalShared.ts', (() => {
     const { promise: globalContextInitialPromise, resolve: globalContextInitialPromiseResolve } = genPromise();
     return {

package/dist/client/shared/getJsonSerializedInHtml.d.ts

@@ -1,6 +1,6 @@
-import '../assertEnvClient.js';
 export { getPageContextSerializedInHtml };
 export { getGlobalContextSerializedInHtml };
+import '../assertEnvClient.js';
 declare function getPageContextSerializedInHtml(): {
     pageId: string;
     routeParams: Record<string, string>;

package/dist/client/shared/getJsonSerializedInHtml.js

@@ -1,10 +1,10 @@
-import '../assertEnvClient.js';
 export { getPageContextSerializedInHtml };
 export { getGlobalContextSerializedInHtml };
 import { parse } from '@brillout/json-serializer/parse';
 import { assert, assertUsage } from '../../utils/assert.js';
 import { hasProp } from '../../utils/hasProp.js';
 import { htmlElementId_globalContext, htmlElementId_pageContext } from '../../shared-server-client/htmlElementIds.js';
+import '../assertEnvClient.js';
 // elements should exist because:
 // 1. <script id="vike_pageContext" type="application/json"> appears before the <script> that loads Vike's client runtime (which includes this file)
 // 2. <script id="vike_pageContext" type="application/json"> is neither async nor defer

package/dist/client/shared/getPageContextPublicClientShared.d.ts

@@ -1,9 +1,9 @@
-import '../assertEnvClient.js';
 export { getPageContextPublicClientShared };
 export { getPageContextPublicClientMinimal };
 import type { PageContextConfig } from '../../shared-server-client/getPageFiles.js';
 import { type PageContextPublicMinimum } from '../../shared-server-client/getPageContextPublicShared.js';
 import type { PageContextInternalClient } from '../../types/PageContext.js';
+import '../assertEnvClient.js';
 type PageContextPublicClientShared = PageContextPublicMinimum & PageContextInternalClient & PageContextConfig;
 declare function getPageContextPublicClientShared<PageContext extends PageContextPublicClientShared>(pageContext: PageContext): PageContext & {
     Page: unknown;

package/dist/client/shared/getPageContextPublicClientShared.js

@@ -1,8 +1,8 @@
-import '../assertEnvClient.js';
 export { getPageContextPublicClientShared };
 export { getPageContextPublicClientMinimal };
 import { objectAssign } from '../../utils/objectAssign.js';
 import { assertPropertyGetters, getPageContextPublicShared, } from '../../shared-server-client/getPageContextPublicShared.js';
+import '../assertEnvClient.js';
 function getPageContextPublicClientShared(pageContext) {
     // TO-DO/soon/proxy: use proxy
     const Page = pageContext.config?.Page ||

package/dist/client/shared/loadPageConfigsLazyClientSide.d.ts

@@ -1,9 +1,9 @@
-import '../assertEnvClient.js';
 export { loadPageConfigsLazyClientSide };
 export type { PageContext_loadPageConfigsLazyClientSide };
 export { isErrorFetchingStaticAssets };
 import { type PageFile } from '../../shared-server-client/getPageFiles.js';
 import type { PageConfigGlobalRuntime, PageConfigRuntime } from '../../types/PageConfig.js';
+import '../assertEnvClient.js';
 type PageContext_loadPageConfigsLazyClientSide = {
     pageId: string;
     _pageFilesAll: PageFile[];

package/dist/client/shared/loadPageConfigsLazyClientSide.js

@@ -1,4 +1,3 @@
-import '../assertEnvClient.js';
 export { loadPageConfigsLazyClientSide };
 export { isErrorFetchingStaticAssets };
 import { getPageFilesClientSide } from '../../shared-server-client/getPageFiles.js';
@@ -6,6 +5,7 @@ import { resolvePageContextConfig } from '../../shared-server-client/page-config
 import { findPageConfig } from '../../shared-server-client/page-configs/findPageConfig.js';
 import { loadAndParseVirtualFilePageEntry } from '../../shared-server-client/page-configs/loadAndParseVirtualFilePageEntry.js';
 import { objectAssign } from '../../utils/objectAssign.js';
+import '../assertEnvClient.js';
 const errStamp = '_isAssetsError';
 async function loadPageConfigsLazyClientSide(pageId, pageFilesAll, pageConfigs, pageConfigGlobal) {
     const pageFilesClientSide = getPageFilesClientSide(pageFilesAll, pageId);

package/dist/client/shared/normalizeClientSideUrl.d.ts

@@ -1,5 +1,5 @@
-import '../assertEnvClient.js';
 export { normalizeClientSideUrl };
+import '../assertEnvClient.js';
 /** Resolves relative URLs */
 declare function normalizeClientSideUrl(url: string, options?: {
     withoutHash: true;

package/dist/client/shared/normalizeClientSideUrl.js

@@ -1,7 +1,7 @@
-import '../assertEnvClient.js';
 export { normalizeClientSideUrl };
 import { assert } from '../../utils/assert.js';
 import { parseUrl } from '../../utils/parseUrl.js';
+import '../assertEnvClient.js';
 /** Resolves relative URLs */
 function normalizeClientSideUrl(url, options) {
     // This function doesn't work for `url === '#some-hash'` because `searchOriginal` will be missing: if window.location.href has a search string then it's going to be missing in the returned `urlCurrent` value because `parseUrl(url)` returns `searchOriginal: null` since there isn't any search string in `url`.

package/dist/client/shared/removeFoucBuster.d.ts

@@ -1,3 +1,3 @@
-import '../assertEnvClient.js';
 export { removeFoucBuster };
+import '../assertEnvClient.js';
 declare function removeFoucBuster(): void;

package/dist/client/shared/removeFoucBuster.js

@@ -1,6 +1,6 @@
-import '../assertEnvClient.js';
 export { removeFoucBuster };
 import { assert } from '../../utils/assert.js';
+import '../assertEnvClient.js';
 // See also:
 // - Alternative approach of exactly injecting what Vite injects:
 //   - https://github.com/remix-run/remix/issues/8830#issuecomment-1968368351

package/dist/node/api/{assertEnvApi.js → assertEnvApiDev.js}

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

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

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

package/dist/node/api/assertEnvApiDevAndProd.js

@@ -0,0 +1,9 @@
+import '../../utils/trackLogs.js'; // should be loaded ASAP
+import { assertIsNotBrowser } from '../../utils/assertIsNotBrowser.js';
+assertEnvApiDevAndProd();
+function assertEnvApiDevAndProd() {
+    assertIsNotBrowser();
+    /* It's expected that users programmtically trigger the pre-rendering process in production (it's a common technique), we therefore tolerate `import { prerender } from 'vike/api'` in production. This means that, in this case, we tolerate the `vite` package to be loaded in production (we usually prevent users to do that).
+    assertIsNotProductionRuntime()
+    */
+}

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

@@ -1,6 +1,6 @@
-import './assertEnvApi.js';
 export { build };
 import type { ApiOptions } from './types.js';
+import './assertEnvApiDev.js';
 /**
  * Programmatically trigger `$ vike build`
  *

package/dist/node/api/build.js

@@ -1,7 +1,7 @@
-import './assertEnvApi.js';
 export { build };
 import { prepareViteApiCall } from './prepareViteApiCall.js';
 import { createBuilder } from 'vite';
+import './assertEnvApiDev.js';
 /**
  * Programmatically trigger `$ vike build`
  *

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

@@ -1,8 +1,8 @@
-import './assertEnvApi.js';
 export { dev };
 export { startupLog };
 import { type ResolvedConfig, type ViteDevServer } from 'vite';
 import type { ApiOptions } from './types.js';
+import './assertEnvApiDev.js';
 /**
  * Programmatically trigger `$ vike dev`
  *

package/dist/node/api/dev.js

@@ -1,6 +1,5 @@
-import './assertEnvApi.js';
 export { dev };
-// TO-DO/eventually: remove if it doesn't end up being used
+// Enable vike-photon to call startupLog() — TO-DO/eventually: remove if it doesn't end up being used https://github.com/vikejs/vike-photon/issues/57
 export { startupLog };
 import { prepareViteApiCall } from './prepareViteApiCall.js';
 import { createServer } from 'vite';
@@ -11,6 +10,7 @@ import { colorVite } from '../../utils/colorsServer.js';
 import { PROJECT_VERSION } from '../../utils/PROJECT_VERSION.js';
 import pc from '@brillout/picocolors';
 import { processStartupLog } from '../vite/shared/loggerVite.js';
+import './assertEnvApiDev.js';
 assertIsNotProductionRuntime();
 /**
  * Programmatically trigger `$ vike dev`
@@ -31,7 +31,7 @@ async function dev(options = {}) {
             startupLog(viteServer.resolvedUrls, viteServer);
         }
         else {
-            // TO-DO/eventually: remove if it doesn't end up being used
+            // Enable vike-photon to call startupLog() — TO-DO/eventually: remove if it doesn't end up being used https://github.com/vikejs/vike-photon/issues/57
             ;
             viteConfig.server.startupLog = (resolvedUrls) => startupLog(resolvedUrls, viteServer);
         }

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

@@ -1,4 +1,3 @@
-import './assertEnvApi.js';
 export { build_ as build };
 export { dev_ as dev };
 export { preview_ as preview };
@@ -7,6 +6,7 @@ import type { build } from './build.js';
 import type { dev } from './dev.js';
 import type { preview } from './preview.js';
 import type { prerender } from './prerender.js';
+import './assertEnvApiDevAndProd.js';
 declare const build_: typeof build;
 declare const dev_: typeof dev;
 declare const preview_: typeof preview;

package/dist/node/api/index.js

@@ -1,8 +1,8 @@
-import './assertEnvApi.js';
 export { build_ as build };
 export { dev_ as dev };
 export { preview_ as preview };
 export { prerender_ as prerender };
+import './assertEnvApiDevAndProd.js';
 const build_ = async (...args) => (await import('./build.js')).build(...args);
 const dev_ = async (...args) => (await import('./dev.js')).dev(...args);
 const preview_ = async (...args) => (await import('./preview.js')).preview(...args);

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

@@ -1,6 +1,6 @@
-import './assertEnvApi.js';
 export { prepareViteApiCall };
 import type { ApiOptions, ApiOperation } from './types.js';
+import './assertEnvApiDevAndProd.js';
 declare function prepareViteApiCall(options: ApiOptions, operation: ApiOperation): Promise<{
     viteConfigResolved: import("vite").ResolvedConfig;
     viteConfigFromUserResolved: import("vite").UserConfig;

package/dist/node/api/prepareViteApiCall.js

@@ -1,8 +1,8 @@
-import './assertEnvApi.js';
 export { prepareViteApiCall };
 import { clearContextVikeApiOperation, setContextVikeApiOperation } from '../../shared-server-node/api-context.js';
 import { clearGlobalContext } from '../../server/runtime/globalContext.js';
 import { resolveViteConfigFromUser } from './resolveViteConfigFromUser.js';
+import './assertEnvApiDevAndProd.js';
 async function prepareViteApiCall(options, operation) {
     clear();
     setContextVikeApiOperation(operation, options);

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

@@ -1,12 +1,12 @@
-import './assertEnvApi.js';
 export { prerender };
 import type { PrerenderOptions } from '../prerender/runPrerender.js';
 import type { ResolvedConfig } from 'vite';
+import './assertEnvApiDevAndProd.js';
 /**
  * Programmatically trigger `$ vike prerender`
  *
  * https://vike.dev/api#prerender
  */
 declare function prerender(options?: PrerenderOptions): Promise<{
-    viteConfig: ResolvedConfig;
+    viteConfig: null | ResolvedConfig;
 }>;

package/dist/node/api/prerender.js

@@ -1,7 +1,7 @@
-import './assertEnvApi.js';
 export { prerender };
 import { runPrerenderFromAPI } from '../prerender/runPrerenderEntry.js';
 import { prepareViteApiCall } from './prepareViteApiCall.js';
+import './assertEnvApiDevAndProd.js';
 /**
  * Programmatically trigger `$ vike prerender`
  *

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

@@ -1,8 +1,8 @@
-import './assertEnvApi.js';
 export { preview };
 export type { CliPreviewConfig };
 import { type ResolvedConfig, type PreviewServer } from 'vite';
 import type { ApiOptions } from './types.js';
+import './assertEnvApiDev.js';
 /**
  * Programmatically trigger `$ vike preview`
  *

package/dist/node/api/preview.js

@@ -1,4 +1,3 @@
-import './assertEnvApi.js';
 export { preview };
 import { prepareViteApiCall } from './prepareViteApiCall.js';
 import { preview as previewVite } from 'vite';
@@ -10,6 +9,7 @@ import { isCallable } from '../../utils/isCallable.js';
 import pc from '@brillout/picocolors';
 import path from 'node:path';
 import { getVikeConfigInternal } from '../vite/shared/resolveVikeConfigInternal.js';
+import './assertEnvApiDev.js';
 /**
  * Programmatically trigger `$ vike preview`
  *

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

@@ -1,4 +1,3 @@
-import './assertEnvApi.js';
 export { resolveViteConfigFromUser };
 export { isOnlyResolvingUserConfig };
 export { getVikeConfigInternalEarly };
@@ -6,6 +5,7 @@ export { getViteRoot };
 export { assertViteRoot };
 export { normalizeViteRoot };
 import type { ResolvedConfig, UserConfig } from 'vite';
+import './assertEnvApiDevAndProd.js';
 declare function resolveViteConfigFromUser(): Promise<{
     viteConfigResolved: ResolvedConfig;
     viteConfigFromUserResolved: UserConfig;

package/dist/node/api/resolveViteConfigFromUser.js

@@ -1,4 +1,3 @@
-import './assertEnvApi.js';
 export { resolveViteConfigFromUser };
 export { isOnlyResolvingUserConfig };
 export { getVikeConfigInternalEarly };
@@ -16,6 +15,7 @@ import pc from '@brillout/picocolors';
 import { getEnvVarObject } from '../vite/shared/getEnvVarObject.js';
 import { getVikeApiOperation, isVikeCliOrApi } from '../../shared-server-node/api-context.js';
 import { getViteCommandFromCli } from '../vite/shared/isViteCli.js';
+import './assertEnvApiDevAndProd.js';
 const globalObject = getGlobalObject('api/prepareViteApiCall.ts', {});
 async function resolveViteConfigFromUser() {
     const { viteContext } = getVikeApiContext();

package/dist/node/cli/assertEnvCli.js

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

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

@@ -1,8 +1,8 @@
-import './assertEnvCli.js';
 export { isVikeCli };
 export { setContextCliCommand };
 export { getCliOptions };
 import type { CliOptions, Command } from './parseCli.js';
+import './assertEnvCli.js';
 declare function getCliOptions(): CliOptions | null;
 declare function isVikeCli(): boolean;
 declare function setContextCliCommand(command: Command, cliOptions: CliOptions): void;

package/dist/node/cli/context.js

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

package/dist/node/cli/entry.js

@@ -1,8 +1,8 @@
-import './assertEnvCli.js';
 import { dev, build, preview } from '../api/index.js';
 import pc from '@brillout/picocolors';
 import { parseCli } from './parseCli.js';
 import { setContextCliCommand } from './context.js';
+import './assertEnvCli.js';
 cli();
 async function cli() {
     const { command, cliOptions } = parseCli();

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

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

package/dist/node/cli/index.js

@@ -1,6 +1,6 @@
-import './assertEnvCli.js';
 // TO-DO/next-major-release: remove this file
 export { prerender } from '../api/prerender.js';
 import { assertWarning } from '../../utils/assert.js';
 import pc from '@brillout/picocolors';
+import './assertEnvCli.js';
 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,7 +1,7 @@
-import './assertEnvCli.js';
 export { parseCli };
 export type { Command };
 export type { CliOptions };
+import './assertEnvCli.js';
 type CliOptions = Record<string, unknown>;
 type Command = 'dev' | 'build' | 'preview' | 'prerender';
 declare function parseCli(): {

package/dist/node/cli/parseCli.js

@@ -1,10 +1,10 @@
-import './assertEnvCli.js';
 export { parseCli };
 import pc from '@brillout/picocolors';
 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';
+import './assertEnvCli.js';
 const commands = [
     { name: 'dev', desc: 'Start development server' },
     { name: 'build', desc: 'Build for production' },

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

@@ -4,15 +4,15 @@ import { VikeConfigInternal } from '../vite/shared/resolveVikeConfigInternal.js'
 import type { PageConfigBuildTime } from '../../types/PageConfig.js';
 declare function resolvePrerenderConfigGlobal(vikeConfig: Pick<VikeConfigInternal, 'config' | '_pageConfigs' | '_from'>): Promise<{
     partial: boolean;
-    redirects: boolean | null;
     noExtraDir: boolean | null;
-    keepDistServer: boolean;
     parallel: number | boolean;
     disableAutoRun: boolean;
 } & {
     defaultLocalValue: boolean;
-    isPrerenderingEnabledForAllPages: boolean;
     isPrerenderingEnabled: boolean;
+    isPrerenderingEnabledForAllPages: boolean;
+    redirects: boolean;
+    keepDistServer: boolean;
 }>;
 declare function resolvePrerenderConfigLocal(pageConfig: PageConfigBuildTime): Promise<{
     value: boolean;

package/dist/node/prerender/resolvePrerenderConfig.js

@@ -16,9 +16,7 @@ async function resolvePrerenderConfigGlobal(vikeConfig) {
     const prerenderSettings = prerenderConfigsResolved.filter(isObject2);
     const prerenderConfigGlobal = {
         partial: pickFirst(prerenderSettings.map((c) => c.partial)) ?? false,
-        redirects: pickFirst(prerenderSettings.map((c) => c.redirects)) ?? null,
         noExtraDir: pickFirst(prerenderSettings.map((c) => c.noExtraDir)) ?? null,
-        keepDistServer: pickFirst(prerenderSettings.map((c) => c.keepDistServer)) ?? false,
         parallel: pickFirst(prerenderSettings.map((c) => c.parallel)) ?? true,
         disableAutoRun: pickFirst(prerenderSettings.map((c) => c.disableAutoRun)) ?? false,
     };
@@ -40,10 +38,16 @@ async function resolvePrerenderConfigGlobal(vikeConfig) {
     const pageConfigs = vikeConfig._pageConfigs;
     const prerenderConfigLocalList = await Promise.all(pageConfigs.map(resolvePrerenderConfigLocal));
     const isEnable = (prerenderConfigLocal) => prerenderConfigLocal?.value ?? defaultLocalValue;
+    const isPrerenderingEnabled = pageConfigs.length > 0 && prerenderConfigLocalList.some(isEnable);
+    const isPrerenderingEnabledForAllPages = pageConfigs.length > 0 && prerenderConfigLocalList.every(isEnable);
     objectAssign(prerenderConfigGlobal, {
         defaultLocalValue,
-        isPrerenderingEnabledForAllPages: pageConfigs.length > 0 && prerenderConfigLocalList.every(isEnable),
-        isPrerenderingEnabled: pageConfigs.length > 0 && prerenderConfigLocalList.some(isEnable),
+        isPrerenderingEnabled,
+        isPrerenderingEnabledForAllPages,
+        redirects: pickFirst(prerenderSettings.map((c) => c.redirects)) ?? isPrerenderingEnabledForAllPages,
+        keepDistServer: !isPrerenderingEnabledForAllPages
+            ? true
+            : (pickFirst(prerenderSettings.map((c) => c.keepDistServer)) ?? false),
     });
     // TO-DO/next-major-release: remove
     if (vikeConfig._pageConfigs.length === 0 && defaultLocalValue)

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

@@ -4,7 +4,6 @@ export type { PrerenderContextPublic };
 export type { PrerenderTrigger };
 import type { PageFile } from '../../shared-server-client/getPageFiles.js';
 import { type GlobalContextServerInternal } from '../../server/runtime/globalContext.js';
-import { type ResolvedConfig } from 'vite';
 import type { ApiOptions } from '../api/types.js';
 type ProvidedByHook = null | {
     hookFilePath: string;
@@ -30,6 +29,8 @@ type PrerenderContext = {
     _noExtraDir: boolean | null;
     _prerenderedPageContexts: PrerenderedPageContexts;
     _requestIdCounter: number;
+    _userRootDir: string;
+    _outDirClient: string;
 };
 type Output<PageContext = PageContextPrerendered> = {
     filePath: string;
@@ -62,9 +63,7 @@ type PrerenderOptions = ApiOptions & {
     base?: string;
 };
 type PrerenderTrigger = '$ vike prerender' | 'prerender()' | 'auto-run';
-declare function runPrerender(options: PrerenderOptions | undefined, trigger: PrerenderTrigger): Promise<{
-    viteConfig: ResolvedConfig;
-}>;
+declare function runPrerender(options: PrerenderOptions | undefined, trigger: PrerenderTrigger): Promise<void>;
 declare function createPageContextPrerendering(urlOriginal: string, prerenderContext: PrerenderContext, globalContext: GlobalContextServerInternal, is404: boolean, pageId: string | undefined, providedByHook: ProvidedByHook): Promise<{
     _isOriginalObject: true;
     isPageContext: true;
@@ -124,13 +123,13 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         _isPrerendering: false;
         assetsManifest: null;
         _viteDevServer: import("vite").ViteDevServer | undefined;
-        viteConfig: ResolvedConfig | undefined;
+        viteConfig: import("vite").ResolvedConfig | undefined;
         isClientSide: false;
         _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
     } | {
         _isPrerendering: true;
-        viteConfig: ResolvedConfig;
+        viteConfig: import("vite").ResolvedConfig;
         _isProduction: true;
         assetsManifest: import("../../types/ViteManifest.js").ViteManifest;
         _viteDevServer: null;
@@ -167,7 +166,9 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
     _pageFilesAll: PageFile[];
     _baseServer: string;
     _baseAssets: string;
-    _pageContextInit: import("../../types/PageContext.js").PageContextInit;
+    _pageContextInit: import("../../types/PageContext.js").PageContextInit & {
+        headers?: Record<string, unknown>;
+    };
     _urlHandler: ((url: string) => string) | null;
     isClientSideNavigation: boolean;
 } & {