vike 0.4.238 → 0.4.239-commit-33e55d4

package/dist/esm/shared/page-configs/resolveVikeConfigPublic.js

@@ -1,54 +1,48 @@
-// TO-DO/soon: rename PageConfig names
-// - Use `Internal` suffix, i.e. {Page,Global}ConfigInternal
-//   - While keeping {Page,Global}ConfigPublic or remove Public suffix and rename it to {Page,Global}Config ?
-// - rename EagerLoaded EagerlyLoaded
-// - remove `LazyLoaded` suffix
 // TO-DO/soon/same-api: use public API internally?
 // TO-DO/soon/flat-pageContext: rename definedAt => definedBy
-export { resolveVikeConfigPublicGlobal };
-export { resolveVikeConfigPublicPageEagerLoaded };
-export { resolveVikeConfigPublicPageLazyLoaded };
+export { resolveGlobalConfigPublic };
+export { resolvePageContextConfig };
+export { resolveGlobalContextConfig };
 import { assertDefaultExports, forbiddenDefaultExports } from '../getPageFiles/assert_exports_old_design.js';
 import { getConfigDefinedAtOptional, getDefinedAtString } from './getConfigDefinedAt.js';
 import { getConfigValueFilePathToShowToUser } from './helpers.js';
 import { assert, isObject, assertWarning, assertUsage, makeLast, isBrowser, isScriptFile, isTemplateFile, objectDefineProperty, } from '../utils.js';
 import pc from '@brillout/picocolors';
-function resolveVikeConfigPublicPageEagerLoaded(pageConfigGlobalValues, pageConfig, pageConfigValues) {
-    const vikeConfigPublicPage_ = resolveVikeConfigPublic_base({ pageConfigGlobalValues, pageConfigValues });
-    const vikeConfigPublicPage = getPublicCopy(vikeConfigPublicPage_);
-    let page;
-    if (!pageConfig.isErrorPage) {
-        const route = vikeConfigPublicPage.config.route ?? pageConfig.routeFilesystem.routeString;
-        page = {
-            ...vikeConfigPublicPage,
-            route,
-        };
-    }
-    else {
-        page = {
-            ...vikeConfigPublicPage,
-            isErrorPage: true,
-        };
-    }
+function resolveGlobalConfigPublicPage(pageConfigGlobalValues, pageConfig, pageConfigValues) {
+    const pageConfigPublic_ = resolvePageConfigPublic({ pageConfigGlobalValues, pageConfigValues });
+    const pageConfigPublic = getPublicCopy(pageConfigPublic_);
+    const page = (() => {
+        if (!pageConfig.isErrorPage) {
+            const route = pageConfigPublic.config.route ?? pageConfig.routeFilesystem.routeString;
+            return {
+                ...pageConfigPublic,
+                route,
+            };
+        }
+        else {
+            return {
+                ...pageConfigPublic,
+                isErrorPage: true,
+            };
+        }
+    })();
     return [pageConfig.pageId, page];
 }
-function getPublicCopy(vikeConfigPublic) {
-    return {
-        config: vikeConfigPublic.config,
-        _source: vikeConfigPublic.source,
-        _sources: vikeConfigPublic.sources,
-        _from: vikeConfigPublic.from,
+function getPublicCopy(configInternal) {
+    const configPublic = {
+        config: configInternal.config,
+        // TO-DO/soon/flat-pageContext: expose publicly?
+        _source: configInternal.source,
+        _sources: configInternal.sources,
+        _from: configInternal.from,
     };
+    return configPublic;
 }
-function resolveVikeConfigPublic_base({ pageConfigGlobalValues, pageConfigValues, }) {
+function resolvePageConfigPublic({ pageConfigGlobalValues, pageConfigValues, }) {
     const configValues = { ...pageConfigGlobalValues, ...pageConfigValues };
-    return resolveVikeConfigPublic_V1Design({ configValues });
+    return resolveConfigPublic_V1Design({ configValues });
 }
-function resolveVikeConfigPublicGlobal({ pageConfigGlobalValues, }) {
-    const vikeConfigPublicGlobal = resolveVikeConfigPublic_V1Design({ configValues: pageConfigGlobalValues });
-    return getPublicCopy(vikeConfigPublicGlobal);
-}
-function resolveVikeConfigPublicPageLazyLoaded(pageFiles, // V0.4 design
+function resolvePageContextConfig(pageFiles, // V0.4 design
 pageConfig, // V1 design
 pageConfigGlobal) {
     const config = {};
@@ -75,7 +69,7 @@ pageConfigGlobal) {
     let sources;
     let from;
     if (pageConfig) {
-        const res = resolveVikeConfigPublic_base({
+        const res = resolvePageConfigPublic({
             pageConfigGlobalValues: pageConfigGlobal.configValues,
             pageConfigValues: pageConfig.configValues,
         });
@@ -110,7 +104,7 @@ pageConfigGlobal) {
     });
     assert(!('default' in exports));
     assert(!('default' in exportsAll));
-    const configPublicPageLazy = {
+    const pageContextAddendum = {
         config: config,
         from,
         source,
@@ -121,7 +115,7 @@ pageConfigGlobal) {
         exportsAll,
     };
     // TO-DO/next-major-release: remove
-    objectDefineProperty(configPublicPageLazy, 'pageExports', {
+    objectDefineProperty(pageContextAddendum, 'pageExports', {
         get: () => {
             // We only show the warning in Node.js because when using Client Routing Vue integration uses `Object.assign(pageContextReactive, pageContext)` which will wrongully trigger the warning. There is no cross-browser way to catch whether the property accessor was initiated by an `Object.assign()` call.
             if (!isBrowser()) {
@@ -135,10 +129,33 @@ pageConfigGlobal) {
         enumerable: false,
         configurable: true,
     });
-    return configPublicPageLazy;
+    return pageContextAddendum;
+}
+function resolveGlobalContextConfig(pageConfigs, pageConfigGlobal) {
+    const globalContextAddendum = resolveGlobalConfigPublic(pageConfigs, pageConfigGlobal, (c) => c.configValues);
+    return globalContextAddendum;
+}
+function resolveGlobalConfigPublic(pageConfigs, pageConfigGlobal, getConfigValues) {
+    // global
+    const pageConfigGlobalValues = getConfigValues(pageConfigGlobal, true);
+    const globalConfigPublicBase_ = resolveConfigPublic_V1Design({ configValues: pageConfigGlobalValues });
+    const globalConfigPublicBase = getPublicCopy(globalConfigPublicBase_);
+    // pages
+    const pages = Object.fromEntries(pageConfigs.map((pageConfig) => {
+        const pageConfigValues = getConfigValues(pageConfig);
+        return resolveGlobalConfigPublicPage(pageConfigGlobalValues, pageConfig, pageConfigValues);
+    }));
+    const globalConfigPublic = {
+        ...globalConfigPublicBase,
+        pages,
+    };
+    return {
+        ...globalConfigPublic,
+        _globalConfigPublic: globalConfigPublic,
+    };
 }
 // V1 design
-function resolveVikeConfigPublic_V1Design(pageConfig) {
+function resolveConfigPublic_V1Design(pageConfig) {
     const config = {};
     const configEntries = {};
     const exportsAll = {};
@@ -226,6 +243,8 @@ function resolveVikeConfigPublic_V1Design(pageConfig) {
         from,
     };
 }
+// V0.4 design
+// TO-DO/next-major-release: remove
 function getExportValues(pageFile) {
     const { filePath, fileExports } = pageFile;
     assert(fileExports); // assume pageFile.loadFile() was called

package/dist/esm/types/Config/ConfigResolved.d.ts

@@ -0,0 +1,8 @@
+export type { ConfigResolved };
+import type { ConfigBuiltIn, ConfigBuiltInResolved, ImportString } from '../Config.js';
+type ConfigUnresolved = WithoutImportString<ConfigBuiltIn & Vike.Config>;
+type ConfigResolvedOnly = ConfigBuiltInResolved & Vike.ConfigResolved;
+type ConfigResolved = ConfigResolvedOnly & Omit<ConfigUnresolved, keyof ConfigResolvedOnly>;
+type WithoutImportString<T> = {
+    [K in keyof T]: Exclude<T[K], ImportString>;
+};

package/dist/esm/types/Config.d.ts

@@ -37,14 +37,14 @@ export type { RouteAsync };
 export type { RouteSync };
 import type { PrefetchSetting, PrefetchStaticAssets } from '../client/runtime-client-routing/prefetch/PrefetchSetting.js';
 import type { ConfigDefinition } from '../node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js';
-import type { DocumentHtml } from '../node/runtime/html/renderHtml.js';
+import type { DocumentHtml } from '../node/runtime/renderPage/html/renderHtml.js';
 import type { InjectFilterEntry } from './index.js';
 import type { VikeVitePluginOptions } from '../node/vite/index.js';
-import type { Vike, VikePackages } from './VikeNamespace.js';
+import type { Vike } from './VikeNamespace.js';
 import type { HooksTimeoutProvidedByUser } from '../shared/hooks/getHook.js';
 import type { GlobalContext, PageContextClient, PageContextServer } from './PageContext.js';
 import type { InlineConfig } from 'vite';
-import type { PassToClientPublic } from '../node/runtime/html/serializeContext.js';
+import type { PassToClientPublic } from '../node/runtime/renderPage/html/serializeContext.js';
 type HookNameOld = HookName | HookNameOldDesign;
 type HookName = HookNamePage | HookNameGlobal;
 type HookNamePage = 'onHydrationEnd' | 'onBeforePrerenderStart' | 'onBeforeRender' | 'onPageTransitionStart' | 'onPageTransitionEnd' | 'onRenderHtml' | 'onRenderClient' | 'guard' | 'data' | 'onData' | 'route';
@@ -52,7 +52,7 @@ type HookNameGlobal = 'onBeforeRoute' | 'onPrerenderStart' | 'onCreatePageContex
 type HookNameOldDesign = 'render' | 'prerender' | 'onBeforePrerender';
 type ConfigNameBuiltIn = Exclude<keyof ConfigBuiltIn, keyof VikeVitePluginOptions | 'onBeforeRoute' | 'onPrerenderStart' | 'vite' | 'redirects'> | 'prerender' | 'serverOnlyHooks' | 'isClientRuntimeLoaded' | 'onBeforeRenderEnv' | 'dataEnv' | 'hooksTimeout' | 'clientHooks' | 'middleware';
 type ConfigNameGlobal = 'onPrerenderStart' | 'onBeforeRoute' | 'prerender' | 'disableAutoFullBuild' | 'includeAssetsImportedByServer' | 'baseAssets' | 'baseServer' | 'redirects' | 'trailingSlash' | 'disableUrlNormalization' | 'vite';
-type Config = ConfigBuiltIn & Vike.Config & (VikePackages.ConfigVikeReact | VikePackages.ConfigVikeVue | VikePackages.ConfigVikeSolid | VikePackages.ConfigVikeSvelte | VikePackages.ConfigVikeAngular);
+type Config = ConfigBuiltIn & Vike.Config;
 /** @deprecated This type is deprecated, see https://vike.dev/data */
 type DataAsync<Data = unknown> = (pageContext: PageContextServer) => Promise<Data>;
 /** @deprecated This type is deprecated, see https://vike.dev/data */
@@ -445,7 +445,7 @@ type ConfigBuiltIn = {
      *
      * https://vike.dev/headers#response
      */
-    headersResponse?: HeadersInit;
+    headersResponse?: HeadersInit | ((pageContext: PageContextServer) => HeadersInit | Promise<HeadersInit>);
     /**
      * Make development/preview server available over LAN and public addresses.
      *
@@ -468,6 +468,14 @@ type ConfigBuiltIn = {
      * https://vike.dev/mode
      */
     mode?: string;
+    /**
+     * Content Security Policy (CSP).
+     *
+     * https://vike.dev/csp
+     */
+    csp?: {
+        nonce: boolean | ((pageContext: PageContextServer) => string | Promise<string>);
+    };
     /** Where scripts are injected in the HTML.
      *
      * https://vike.dev/injectScriptsAt
@@ -499,7 +507,7 @@ type ConfigBuiltInResolved = {
     redirects?: Record<string, string>[];
     prerender?: Exclude<Config['prerender'], ImportString | undefined>[];
     middleware?: Function[];
-    headersResponse?: HeadersInit[];
+    headersResponse?: Exclude<Config['headersResponse'], ImportString | undefined>[];
 };
 type ConfigMeta = Record<string, ConfigDefinition>;
 type ImportString = `import:${string}`;

package/dist/esm/types/PageContext.d.ts

@@ -15,9 +15,8 @@ export type { PageContextBuiltInServer_deprecated as PageContextBuiltInServer };
 export type { PageContextBuiltInClientWithClientRouting_deprecated as PageContextBuiltInClientWithClientRouting };
 export type { PageContextBuiltInClientWithServerRouting_deprecated as PageContextBuiltInClientWithServerRouting };
 import type { PageContextUrlInternal, PageContextUrlClient, PageContextUrlServer } from '../shared/getPageContextUrlComputed.js';
-import type { ConfigEntries, ExportsAll, From, Source, Sources } from '../shared/page-configs/resolveVikeConfigPublic.js';
+import type { From, PageContextConfig, Source, Sources } from '../shared/page-configs/resolveVikeConfigPublic.js';
 import type { Config } from './Config.js';
-import type { PageContextConfig } from './Config/PageContextConfig.js';
 import type { AbortStatusCode } from '../shared/route/abort.js';
 import type { GlobalContextServer } from '../node/runtime/globalContext.js';
 import type { GlobalContextClient } from '../client/runtime-client-routing/globalContext.js';
@@ -28,7 +27,7 @@ type PageContextClient<Data = unknown> = PageContextBuiltInClientWithClientRouti
 type GlobalContext = GlobalContextServer | GlobalContextClient;
 type PageContextWithServerRouting<Data = unknown> = PageContextClientWithServerRouting<Data> | PageContextServer<Data>;
 type PageContextClientWithServerRouting<Data = unknown> = PageContextBuiltInClientWithServerRouting<Data> & Vike.PageContext & Vike.PageContextClient;
-type PageContextBuiltInCommon<Data> = {
+type PageContextBuiltInCommon<Data> = PageContextConfig & {
     /**
      * Useful for distinguishing `pageContext` from other objects and narrowing down TypeScript unions.
      *
@@ -53,28 +52,6 @@ type PageContextBuiltInCommon<Data> = {
      * https://vike.dev/pageContext#data
      */
     data: Data;
-    /** The page's configuration values.
-     *
-     * https://vike.dev/config
-     * https://vike.dev/pageContext#config
-     */
-    config: PageContextConfig;
-    /** The page's configuration, including the configs origin and overridden configs.
-     *
-     * https://vike.dev/config
-     */
-    configEntries: ConfigEntries;
-    /** Custom Exports/Hooks.
-     *
-     * https://vike.dev/exports
-     */
-    exports: Record<string, unknown>;
-    /**
-     * Same as `pageContext.exports` but cumulative.
-     *
-     * https://vike.dev/exports
-     */
-    exportsAll: ExportsAll;
     /** The URL you provided to Vike when calling `renderPage({ urlOriginal })` in your server middleware.
      *
      * https://vike.dev/renderPage
@@ -183,6 +160,12 @@ type PageContextBuiltInServer<Data> = PageContextBuiltInCommon<Data> & PageConte
      * https://vike.dev/pageContext#globalContext
      */
     globalContext: GlobalContextServer;
+    /**
+     * The CSP nonce.
+     *
+     * https://vike.dev/csp
+     */
+    cspNonce: string | null;
     isHydration?: undefined;
     isBackwardNavigation?: undefined;
     previousPageContext?: undefined;

package/dist/esm/types/VikeNamespace.d.ts

@@ -1,5 +1,4 @@
 export type { Vike };
-export type { VikePackages };
 declare global {
     /** Refine Vike types. */
     namespace Vike {
@@ -62,30 +61,4 @@ declare global {
             _interfaceIsNotAny?: never;
         }
     }
-    /** This namespace is only used by:
-     *  - `vike-react`
-     *  - `vike-vue`
-     *  - `vike-solid`
-     *  - `vike-svelte`
-     *  - `vike-angular`
-     *
-     *  As a Vike user, you can ignore this.
-     */
-    namespace VikePackages {
-        interface ConfigVikeReact {
-            _interfaceIsNotAny?: never;
-        }
-        interface ConfigVikeVue {
-            _interfaceIsNotAny?: never;
-        }
-        interface ConfigVikeSolid {
-            _interfaceIsNotAny?: never;
-        }
-        interface ConfigVikeSvelte {
-            _interfaceIsNotAny?: never;
-        }
-        interface ConfigVikeAngular {
-            _interfaceIsNotAny?: never;
-        }
-    }
 }

package/dist/esm/types/index.d.ts

@@ -5,13 +5,13 @@ export type { PageContextBuiltInClientWithClientRouting } from './PageContext.js
 export type { PageContextBuiltInClientWithServerRouting } from './PageContext.js';
 export type { Config, ConfigMeta as Meta, ImportString, KeepScrollPosition, } from './Config.js';
 export type { DataAsync, DataSync, GuardAsync, GuardSync, OnBeforePrerenderStartAsync, OnBeforePrerenderStartSync, OnBeforeRenderAsync, OnBeforeRenderSync, OnBeforeRouteAsync, OnBeforeRouteSync, OnHydrationEndAsync, OnHydrationEndSync, OnPageTransitionEndAsync, OnPageTransitionEndSync, OnPageTransitionStartAsync, OnPageTransitionStartSync, OnPrerenderStartAsync, OnPrerenderStartSync, OnRenderClientAsync, OnRenderClientSync, OnRenderHtmlAsync, OnRenderHtmlSync, RouteAsync, RouteSync, } from './Config.js';
-export type { ConfigResolved } from './Config/PageContextConfig.js';
+export type { ConfigResolved } from './Config/ConfigResolved.js';
 export type { ConfigEnv } from './PageConfig.js';
 export type { ConfigDefinition, ConfigEffect, } from '../node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js';
 export type { ConfigEntries } from '../shared/page-configs/resolveVikeConfigPublic.js';
 export type { VikeConfig } from '../node/vite/shared/resolveVikeConfigInternal.js';
 export type { UrlPublic as Url } from '../utils/parseUrl.js';
-export type { InjectFilterEntry } from '../node/runtime/html/injectAssets/getHtmlTags.js';
+export type { InjectFilterEntry } from '../node/runtime/renderPage/html/injectAssets/getHtmlTags.js';
 export { defineConfig } from './defineConfig.js';
 import type { ConfigEnv } from './PageConfig.js';
 /** @deprecated Replace:

package/dist/esm/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.238";
+export declare const PROJECT_VERSION: "0.4.239-commit-33e55d4";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.238';
+export const PROJECT_VERSION = '0.4.239-commit-33e55d4';

package/dist/esm/utils/assert.js

@@ -147,6 +147,7 @@ function addPrefixProjectName(msg, showProjectVersion = false) {
     const prefix = showProjectVersion ? projectTagWithVersion : projectTag;
     return `${prefix}${msg}`;
 }
+// TO-DO/eventually: remove this (refactor the whole log handling)
 function getAssertErrMsg(thing) {
     let errMsg;
     let errStack;
@@ -170,7 +171,21 @@ function getAssertErrMsg(thing) {
             }
         }
         else if (errStack?.includes(tag)) {
-            throw new Error('Internal Vike error');
+            // The following assert can fail, e.g. with following error:
+            // ```
+            // Error: Error running module "/home/rom/code/vike-server/examples/cloudflare-react/cloudflare-entry.js".
+            // Error running module "photon:cloudflare:/home/rom/code/vike-server/examples/cloudflare-react/server.js".
+            // Error running module "/home/rom/code/vike-server/examples/cloudflare-react/server.js".
+            // Error running module "/home/rom/code/vike-server/node_modules/.pnpm/@photonjs+hono@0.0.6_@hattip+core@0.0.49_elysia@1.3.13_exact-mirror@0.1.6_@sinclair+typ_c39d432d43266746f390ace81b426601/node_modules/@photonjs/hono/dist/index.js?v=6ca51a04".
+            // Error running module "/home/rom/code/vike-server/node_modules/.pnpm/@photonjs+hono@0.0.6_@hattip+core@0.0.49_elysia@1.3.13_exact-mirror@0.1.6_@sinclair+typ_c39d432d43266746f390ace81b426601/node_modules/@photonjs/hono/dist/apply.dev.js?v=6ca51a04".
+            // Error running module "photon:get-middlewares:dev:hono".
+            // Error running module "/home/rom/code/vike-server/packages/vike-server/dist/universal.dev.js".
+            // [vike][Wrong Usage] The global context isn't set yet, use getGlobalContextAsync() instead........
+            //     at async ProxyServer.fetch (file:///home/rom/code/vike-server/node_modules/.pnpm/miniflare@4.20250829.0/node_modules/miniflare/src/workers/core/proxy.worker.ts:174:11)
+            // ```
+            /*
+            throw new Error('Internal Vike error')
+            */
         }
         if (errMsg?.startsWith(tag)) {
             const assertMsg = errMsg.slice(tag.length);

package/dist/esm/utils/assertNodeVersion.js

@@ -6,5 +6,7 @@ function assertNodeVersion() {
     if (!isNodeJS())
         return;
     const version = process.versions.node;
-    assertVersion('Node.js', version, '18.0.0');
+    assertVersion('Node.js', version, 
+    // https://gist.github.com/brillout/8e0133716e169b981b6c4e8a938b0134
+    ['20.19.0', '22.12.0', '23.0.0']);
 }

package/dist/esm/utils/assertVersion.d.ts

@@ -1,4 +1,5 @@
 export { assertVersion };
-export { isVersionOrAbove };
-declare function assertVersion(dependencyName: 'Vite' | 'Node.js', versionActual: string, versionExpected: `${number}.${number}.${number}`): void;
-declare function isVersionOrAbove(versionActual: string, versionExpected: `${number}.${number}.${number}`): boolean;
+export { isVersionMatch };
+type Version = `${number}.${number}.${number}`;
+declare function assertVersion(dependencyName: 'Vite' | 'Node.js', versionActual: string, versionExpectedList: Version[]): void;
+declare function isVersionMatch(versionActual: string, versionExpectedList: Version[]): boolean;

package/dist/esm/utils/assertVersion.js

@@ -1,14 +1,32 @@
 export { assertVersion };
-export { isVersionOrAbove };
+export { isVersionMatch };
+import pc from '@brillout/picocolors';
 import { assert, assertUsage } from './assert.js';
 import { assertIsNotBrowser } from './assertIsNotBrowser.js';
+import { joinEnglish } from './joinEnglish.js';
 assertIsNotBrowser();
-function assertVersion(dependencyName, versionActual, versionExpected) {
+function assertVersion(dependencyName, versionActual, versionExpectedList) {
+    assertUsage(isVersionMatch(versionActual, versionExpectedList), `${pc.bold(dependencyName)} ${pc.red(pc.bold(versionActual))} isn't supported, use ${pc.bold(dependencyName)} ${joinEnglish([...versionExpectedList, 'above'].map((v) => pc.green(pc.bold(v))), 'or')}.`);
+}
+function isVersionMatch(versionActual, versionExpectedList) {
     assert(versionActual);
-    assert(versionExpected);
-    assertUsage(isVersionOrAbove(versionActual, versionExpected), `${dependencyName} ${versionActual} isn't supported, use ${dependencyName} >= ${versionExpected} instead.`);
+    assert(versionExpectedList);
+    assert(versionExpectedList.length > 0);
+    const versionActualMajor = parseVersion(versionActual)[0];
+    const versionExpectedListSameMajor = versionExpectedList.filter((versionExpected) => {
+        const versionExpectedMajor = parseVersion(versionExpected)[0];
+        return versionExpectedMajor === versionActualMajor;
+    });
+    assert(versionExpectedListSameMajor.length <= 1);
+    const versionExpectedSameMajor = versionExpectedListSameMajor[0];
+    if (versionExpectedSameMajor) {
+        return isSameOrAbove(versionActual, versionExpectedSameMajor);
+    }
+    else {
+        return versionExpectedList.every((versionExpected) => isSameOrAbove(versionActual, versionExpected));
+    }
 }
-function isVersionOrAbove(versionActual, versionExpected) {
+function isSameOrAbove(versionActual, versionExpected) {
     const p1 = parseVersion(versionActual);
     const p2 = parseVersion(versionExpected);
     // major

package/dist/esm/utils/joinEnglish.js

@@ -7,5 +7,6 @@ function joinEnglish(arr, conjunction, colorizer = (s) => s) {
         return colorizer(arr[0]);
     const firsts = arr.slice(0, arr.length - 1);
     const last = arr[arr.length - 1];
-    return firsts.map(colorizer).join(', ') + `, ${conjunction} ` + colorizer(last);
+    const lastComma = arr.length > 2 ? ',' : '';
+    return firsts.map(colorizer).join(', ') + `${lastComma} ${conjunction} ` + colorizer(last);
 }

package/dist/esm/utils/virtualFileId.d.ts

@@ -1,6 +1,10 @@
 export { isVirtualFileId };
 export { addVirtualFileIdPrefix };
 export { removeVirtualFileIdPrefix };
+export { virtualFileIdPrefix1 };
+export { virtualFileIdPrefix2 };
+declare const virtualFileIdPrefix1 = "virtual:vike:";
+declare const virtualFileIdPrefix2: "\0virtual:vike:";
 declare function isVirtualFileId(id: string): boolean;
 declare function addVirtualFileIdPrefix(id: string): string;
 declare function removeVirtualFileIdPrefix(id: string): string;

package/dist/esm/utils/virtualFileId.js

@@ -1,34 +1,37 @@
 export { isVirtualFileId };
 export { addVirtualFileIdPrefix };
 export { removeVirtualFileIdPrefix };
+export { virtualFileIdPrefix1 };
+export { virtualFileIdPrefix2 };
 import pc from '@brillout/picocolors';
 import { assert, assertUsage } from './assert.js';
 import { assertIsNotBrowser } from './assertIsNotBrowser.js';
 assertIsNotBrowser();
-const idBase = 'virtual:vike:';
+const virtualFileIdPrefix1 = 'virtual:vike:';
 // https://vitejs.dev/guide/api-plugin.html#virtual-modules-convention
-const prefix = '\0';
+const convention = '\0';
+const virtualFileIdPrefix2 = `${convention}${virtualFileIdPrefix1}`;
 function isVirtualFileId(id) {
-    if (id.startsWith(idBase))
+    if (id.startsWith(virtualFileIdPrefix1))
         return true;
-    if (id.startsWith(prefix + idBase))
+    if (id.startsWith(virtualFileIdPrefix2))
         return true;
     // https://github.com/vikejs/vike/issues/1985
-    assertUsage(!id.includes(idBase), `Encountered a module ID ${pc.cyan(id)} that is unexpected. Are you using a tool that modifies the ID of modules? For example, the baseUrl setting in tsconfig.json cannot be used.`);
+    assertUsage(!id.includes(virtualFileIdPrefix1), `Encountered a module ID ${pc.cyan(id)} that is unexpected. Are you using a tool that modifies the ID of modules? For example, the baseUrl setting in tsconfig.json cannot be used.`);
     return false;
 }
 function addVirtualFileIdPrefix(id) {
     assert(isVirtualFileId(id));
-    if (!id.startsWith(prefix)) {
-        id = prefix + id;
+    if (!id.startsWith(convention)) {
+        id = convention + id;
     }
-    assert(id.startsWith(prefix));
+    assert(id.startsWith(convention));
     return id;
 }
 function removeVirtualFileIdPrefix(id) {
-    if (id.startsWith(prefix)) {
-        id = id.slice(prefix.length);
+    if (id.startsWith(convention)) {
+        id = id.slice(convention.length);
     }
-    assert(!id.startsWith(prefix));
+    assert(!id.startsWith(convention));
     return id;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.238",
+  "version": "0.4.239-commit-33e55d4",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -132,7 +132,7 @@
     "@brillout/json-serializer": "^0.5.20",
     "@brillout/picocolors": "^1.0.26",
     "@brillout/require-shim": "^0.1.2",
-    "@brillout/vite-plugin-server-entry": "^0.7.13",
+    "@brillout/vite-plugin-server-entry": "^0.7.14",
     "acorn": "^8.0.0",
     "cac": "^6.0.0",
     "es-module-lexer": "^1.0.0",
@@ -144,11 +144,11 @@
     "sirv": "^3.0.1",
     "source-map-support": "^0.5.0",
     "tinyglobby": "^0.2.10",
-    "vite": ">=6.0.0"
+    "vite": ">=6.3.0"
   },
   "peerDependencies": {
     "react-streaming": ">=0.3.42",
-    "vite": ">=6.0.0"
+    "vite": ">=6.3.0"
   },
   "peerDependenciesMeta": {
     "react-streaming": {
@@ -159,7 +159,7 @@
     }
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.19.0"
   },
   "license": "MIT",
   "description": "The Framework *You* Control - Next.js & Nuxt alternative for unprecedented flexibility and dependability.",

package/dist/cjs/types/Config/helpers.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/esm/node/runtime/html/injectAssets/inferHtmlTags.d.ts

@@ -1,9 +0,0 @@
-export { inferAssetTag };
-export { inferPreloadTag };
-export { inferEarlyHintLink };
-export { scriptAttrs };
-import type { PageAsset } from '../../renderPage/getPageAssets.js';
-declare const scriptAttrs = "type=\"module\" async";
-declare function inferPreloadTag(pageAsset: PageAsset): string;
-declare function inferAssetTag(pageAsset: PageAsset): string;
-declare function inferEarlyHintLink(pageAsset: PageAsset): string;

package/dist/esm/node/runtime/html/injectAssets/mergeScriptTags.d.ts

@@ -1,2 +0,0 @@
-export { mergeScriptTags };
-declare function mergeScriptTags(scriptTagsHtml: string): string;

package/dist/esm/types/Config/PageContextConfig.d.ts

@@ -1,15 +0,0 @@
-export type { PageContextConfig };
-export type { ConfigResolved };
-import type { VikePackages } from '../VikeNamespace.js';
-import type { ConfigBuiltIn, ConfigBuiltInResolved, ImportString } from '../Config.js';
-import type { Combine, IsNotEmpty, XOR5 } from './helpers.js';
-type PageContextConfig = ConfigResolved & (ConfigVikePackagesNotEmptyXor extends true ? ConfigVikePackagesIntersection : ConfigVikePackagesCombined);
-type ConfigUnresolved = WithoutImportString<ConfigBuiltIn & Vike.Config>;
-type ConfigResolvedOnly = ConfigBuiltInResolved & Vike.ConfigResolved;
-type ConfigResolved = ConfigResolvedOnly & Omit<ConfigUnresolved, keyof ConfigResolvedOnly>;
-type ConfigVikePackagesIntersection = VikePackages.ConfigVikeReact & VikePackages.ConfigVikeVue & VikePackages.ConfigVikeSolid & VikePackages.ConfigVikeSvelte & VikePackages.ConfigVikeAngular;
-type ConfigVikePackagesCombined = Combine<VikePackages.ConfigVikeReact, Combine<VikePackages.ConfigVikeVue, Combine<VikePackages.ConfigVikeSolid, Combine<VikePackages.ConfigVikeSvelte, VikePackages.ConfigVikeAngular>>>>;
-type ConfigVikePackagesNotEmptyXor = XOR5<IsNotEmpty<VikePackages.ConfigVikeReact>, IsNotEmpty<VikePackages.ConfigVikeVue>, IsNotEmpty<VikePackages.ConfigVikeSolid>, IsNotEmpty<VikePackages.ConfigVikeSvelte>, IsNotEmpty<VikePackages.ConfigVikeAngular>>;
-type WithoutImportString<T> = {
-    [K in keyof T]: Exclude<T[K], ImportString>;
-};

package/dist/esm/types/Config/helpers.d.ts

@@ -1,10 +0,0 @@
-export type { IsNotEmpty };
-export type { XOR5 };
-export type { Combine };
-type IsNotEmpty<T> = Not<IsEmpty<T>>;
-type IsEmpty<T> = keyof T extends never ? true : false;
-type Combine<T1, T2> = {
-    [K in keyof T1 | keyof T2]?: (K extends keyof T1 ? T1[K] : never) | (K extends keyof T2 ? T2[K] : never);
-};
-type XOR5<T1 extends boolean, T2 extends boolean, T3 extends boolean, T4 extends boolean, T5 extends boolean> = (T1 extends true ? T2 extends true ? false : T3 extends true ? false : T4 extends true ? false : Not<T5> : T2 extends true ? T3 extends true ? false : T4 extends true ? false : Not<T5> : T3 extends true ? T4 extends true ? false : Not<T5> : T4 extends true ? Not<T5> : T5);
-type Not<T extends boolean> = T extends true ? false : true;

package/dist/esm/types/Config/helpers.js

@@ -1 +0,0 @@
-export {};