vike 0.4.238 → 0.4.239

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";

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';

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.238",
+  "version": "0.4.239",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -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 {};