vike 0.4.255-commit-05a7b95 → 0.4.256

package/dist/types/Config.d.ts

@@ -54,7 +54,7 @@ type HookName = HookNamePage | HookNameGlobal;
 type HookNamePage = 'onHydrationEnd' | 'onBeforePrerenderStart' | 'onBeforeRender' | 'onPageTransitionStart' | 'onPageTransitionEnd' | 'onRenderHtml' | 'onRenderClient' | 'guard' | 'data' | 'onData' | 'route';
 type HookNameGlobal = 'onBeforeRoute' | 'onPrerenderStart' | 'onCreatePageContext' | 'onCreateGlobalContext' | 'onError' | 'onHookCall';
 type HookNameOldDesign = 'render' | 'prerender' | 'onBeforePrerender';
-type ConfigNameBuiltIn = Exclude<keyof ConfigBuiltIn, keyof VikeVitePluginOptions | 'onBeforeRoute' | 'onPrerenderStart' | 'vite' | 'redirects'> | 'prerender' | 'hasServerOnlyHook' | 'isClientRuntimeLoaded' | 'onBeforeRenderEnv' | 'dataEnv' | 'guardEnv' | 'hooksTimeout' | 'clientHooks' | 'middleware' | 'server' | 'isr' | 'edge';
+type ConfigNameBuiltIn = Exclude<keyof ConfigBuiltIn, keyof VikeVitePluginOptions | 'onBeforeRoute' | 'onPrerenderStart' | 'vite' | 'redirects'> | 'prerender' | 'hasServerOnlyHook' | 'isClientRuntimeLoaded' | 'onBeforeRenderEnv' | 'dataEnv' | 'guardEnv' | 'hooksTimeout' | 'clientHooks' | 'middleware';
 type ConfigNameGlobal = 'onPrerenderStart' | 'onBeforeRoute' | 'prerender' | 'disableAutoFullBuild' | 'includeAssetsImportedByServer' | 'baseAssets' | 'baseServer' | 'redirects' | 'trailingSlash' | 'disableUrlNormalization' | 'vite';
 type Config = ConfigBuiltIn & Vike.Config;
 /** @deprecated This type is deprecated, see:
@@ -521,14 +521,6 @@ type ConfigBuiltIn = {
     keepScrollPosition?: KeepScrollPosition;
     /** @experimental */
     middleware?: Function;
-    /**
-     * Set to `false` to disable Vike's automatic server integration mechanism (e.g. for integrating a JavaScript server manually via `renderPage()`).
-     *
-     * Set to `true` to use Vike's built-in server (no need to define `+server.js`).
-     *
-     * https://vike.dev/server
-     */
-    server?: boolean;
     cli?: {
         /** @experimental
          *
@@ -555,18 +547,6 @@ type ConfigBuiltIn = {
      * https://vike.dev/pricing
      */
     license?: string;
-    /** Incremental Static Regeneration (ISR).
-     *
-     * https://vike.dev/vercel#isr
-     */
-    isr?: {
-        expiration: number;
-    };
-    /** Deploy on Vercel Edge.
-     *
-     * https://vike.dev/vercel
-     */
-    edge?: boolean;
 };
 type PrerenderSetting = boolean | {
     /**

package/dist/types/PageContext.d.ts

@@ -1,4 +1,3 @@
-import type { IncomingMessage } from 'node:http';
 export type { PageContext };
 export type { PageContextServer };
 export type { PageContextClient };
@@ -8,7 +7,6 @@ export type { PageContextInternalServer };
 export type { PageContextInternalClient };
 export type { PageContextInternalClient_ServerRouting };
 export type { PageContextInternalClient_ClientRouting };
-export type { PageContextInternalInit };
 export type { PageContextInit };
 export type { PageContextBuiltInServer_deprecated as PageContextBuiltInServer };
 export type { PageContextBuiltInClientWithClientRouting_deprecated as PageContextBuiltInClientWithClientRouting };
@@ -134,10 +132,6 @@ type PageContextInit = {
     headersOriginal?: unknown;
     /** @deprecated Set `pageContextInit.urlOriginal` instead  */ url?: string;
 };
-type PageContextInternalInit = PageContextInit & {
-    _reqDev?: IncomingMessage;
-    _reqWeb?: Request;
-};
 type PageContextBuiltInServer<Data> = PageContextBuiltInCommon<Data> & PageContextInit & PageContextUrlServer & {
     /**
      * The HTTP request headers.

package/dist/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.255-commit-05a7b95";
+export declare const PROJECT_VERSION: "0.4.256";

package/dist/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.255-commit-05a7b95';
+export const PROJECT_VERSION = '0.4.256';

package/dist/utils/assertKeys.js

@@ -14,9 +14,9 @@ function assertKeys(obj, keysExpected, errPrefix) {
         assertUsage(false, [
             errPrefix,
             `unknown key${keysUnknown.length === 1 ? '' : 's'}`,
-            joinEnglish(keysUnknown, 'and', pc.cyan) + '.',
+            joinEnglish(keysUnknown, 'and', { color: pc.cyan }) + '.',
             'Only following keys are allowed:',
-            joinEnglish(keysExpected, 'and', pc.cyan) + '.',
+            joinEnglish(keysExpected, 'and', { color: pc.cyan }) + '.',
         ].join(' '));
     }
 }

package/dist/utils/assertNodeVersion.js

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

package/dist/utils/assertVersion.js

@@ -6,7 +6,7 @@ import { assertIsNotBrowser } from './assertIsNotBrowser.js';
 import { joinEnglish } from './joinEnglish.js';
 assertIsNotBrowser();
 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')}.`);
+    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', { trailingComma: false })}.`);
 }
 function isVersionMatch(versionActual, versionExpectedList) {
     assert(versionActual);

package/dist/utils/joinEnglish.d.ts

@@ -1,2 +1,5 @@
 export { joinEnglish };
-declare function joinEnglish(arr: string[] | readonly string[], conjunction: 'or' | 'and', colorizer?: (s: string) => string): string;
+declare function joinEnglish(arr: string[] | readonly string[], conjunction: 'or' | 'and', { color, trailingComma }?: {
+    color?: (s: string) => string;
+    trailingComma?: boolean;
+}): string;

package/dist/utils/joinEnglish.js

@@ -1,12 +1,12 @@
 export { joinEnglish };
 import { assert } from './assert.js';
 // https://stackoverflow.com/questions/53879088/join-an-array-by-commas-and-and/53879103#53879103
-function joinEnglish(arr, conjunction, colorizer = (s) => s) {
+function joinEnglish(arr, conjunction, { color = (s) => s, trailingComma = true } = {}) {
     assert(arr.length > 0);
     if (arr.length === 1)
-        return colorizer(arr[0]);
+        return color(arr[0]);
     const firsts = arr.slice(0, arr.length - 1);
     const last = arr[arr.length - 1];
-    const lastComma = arr.length > 2 ? ',' : '';
-    return firsts.map(colorizer).join(', ') + `${lastComma} ${conjunction} ` + colorizer(last);
+    const lastComma = trailingComma && arr.length > 2 ? ',' : '';
+    return firsts.map(color).join(', ') + `${lastComma} ${conjunction} ` + color(last);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.255-commit-05a7b95",
+  "version": "0.4.256",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -94,14 +94,6 @@
       "browser": "./dist/client/node.js",
       "default": "./dist/server/runtime/universal-middleware.js"
     },
-    "./fetch": {
-      "types": "./dist/server/runtime/fetch.d.ts",
-      "worker": "./dist/server/runtime/fetch.js",
-      "workerd": "./dist/server/runtime/fetch.js",
-      "node": "./dist/server/runtime/fetch.js",
-      "browser": "./dist/client/node.js",
-      "default": "./dist/server/runtime/fetch.js"
-    },
     "./__internal": {
       "types": "./dist/server/__internal/index.d.ts",
       "node": "./dist/server/__internal/index.js",
@@ -132,19 +124,14 @@
     "@brillout/json-serializer": "^0.5.22",
     "@brillout/picocolors": "^1.0.30",
     "@brillout/vite-plugin-server-entry": "0.7.18",
-    "@universal-deploy/node": "^0.1.2",
-    "@universal-deploy/store": "^0.1.4",
-    "@universal-middleware/core": "^0.4.17",
-    "@universal-middleware/node": "^0.1.0",
     "cac": "^6.0.0",
-    "convert-route": "^1.1.1",
     "es-module-lexer": "^1.0.0",
     "esbuild": ">=0.19.0",
     "json5": "^2.0.0",
     "magic-string": "^0.30.17",
-    "picomatch": "^4.0.2",
-    "semver": "^7.0.0",
-    "sirv": "^3.0.1",
+    "picomatch": "^4.0.4",
+    "semver": "^7.7.4",
+    "sirv": "^3.0.2",
     "source-map-support": "^0.5.0",
     "tinyglobby": "^0.2.10",
     "vite": ">=6.3.0"
@@ -221,9 +208,6 @@
       "universal-middleware": [
         "./dist/server/runtime/universal-middleware.d.ts"
       ],
-      "fetch": [
-        "./dist/server/runtime/fetch.d.ts"
-      ],
       "__internal": [
         "./dist/server/__internal/index.d.ts"
       ],
@@ -257,19 +241,18 @@
     "./routing.js",
     "./server.js",
     "./types.js",
-    "./universal-middleware.js",
-    "./fetch.js"
+    "./universal-middleware.js"
   ],
   "devDependencies": {
     "@brillout/release-me": "^0.4.13",
     "@types/babel__core": "^7.20.5",
     "@types/estree": "^1.0.5",
     "@types/node": "^20.10.5",
-    "@types/picomatch": "^3.0.2",
-    "@types/semver": "^7.5.8",
+    "@types/picomatch": "^4.0.2",
+    "@types/semver": "^7.7.1",
     "@types/source-map-support": "^0.5.10",
-    "react-streaming": "^0.4.16",
-    "rimraf": "^5.0.5",
+    "react-streaming": "^0.4.17",
+    "rimraf": "^6.1.3",
     "typescript": "^5.9.3",
     "vite": "^7.2.6"
   },

package/dist/node/vite/plugins/pluginUniversalDeploy/getDeployConfigs.d.ts

@@ -1,12 +0,0 @@
-export { getDeployConfigs };
-import type { PageConfigPublicWithRoute } from '../../../../shared-server-client/page-configs/resolveVikeConfigPublic.js';
-import '../../assertEnvVite.js';
-declare function getDeployConfigs(pageId: string, page: PageConfigPublicWithRoute): {
-    route: string[];
-    vercel: {
-        isr: {
-            expiration: number;
-        } | undefined;
-        edge: boolean;
-    };
-} | null;

package/dist/node/vite/plugins/pluginUniversalDeploy/getDeployConfigs.js

@@ -1,73 +0,0 @@
-import pc from '@brillout/picocolors';
-export { getDeployConfigs };
-import { fromVike, toRou3 } from 'convert-route';
-import { assert, assertUsage, assertWarning } from '../../../../utils/assert.js';
-import '../../assertEnvVite.js';
-function getDeployConfigs(pageId, page) {
-    // Convert Vike's routes to rou3 format
-    const routeIr = typeof page.route === 'string' ? fromVike(page.route) : null;
-    // Vercel specific configs
-    const rawIsr = extractIsr(page.config);
-    let isr = assertIsr(rawIsr);
-    const edge = extractEdge(page.config);
-    const isrOrEdge = isr ? 'isr' : edge ? 'edge' : null;
-    if (typeof page.route === 'function' && isrOrEdge) {
-        assertWarning(false, `Page ${pageId}: ${pc.cyan(isrOrEdge)} is not supported when using route function. Remove ${pc.cyan(isrOrEdge)} config or use a route string if possible.`, { onlyOnce: true });
-        isr = null;
-    }
-    if (edge && rawIsr !== null && typeof rawIsr === 'object') {
-        assertUsage(false, `Page ${pageId}: ISR cannot be enabled for edge functions. Remove ${pc.cyan('isr')} config or set \`{ edge: false }\`.`);
-    }
-    if (isrOrEdge && routeIr) {
-        return {
-            route: [...new Set([...toRou3(routeIr), ...getPageContextRoute(routeIr)])],
-            vercel: {
-                isr: isr ? { expiration: isr } : undefined,
-                edge: Boolean(edge),
-            },
-        };
-    }
-    return null;
-}
-function extractIsr(exports) {
-    if (exports === null || typeof exports !== 'object')
-        return null;
-    if (!('isr' in exports))
-        return null;
-    const isr = exports.isr;
-    assertUsage(typeof isr === 'object' &&
-        typeof isr.expiration === 'number' &&
-        isr.expiration > 0, ' `{ expiration }` must be a positive number');
-    return isr;
-}
-function assertIsr(isr) {
-    if (isr === null || isr === undefined)
-        return null;
-    return isr.expiration;
-}
-function extractEdge(exports) {
-    if (exports === null || typeof exports !== 'object')
-        return null;
-    if (!('edge' in exports))
-        return null;
-    const edge = exports.edge;
-    assertUsage(typeof edge === 'boolean', ' `{ edge }` must be a boolean');
-    return edge;
-}
-function getPageContextRoute(routeIr) {
-    const lastSegment = routeIr.pathname.at(-1);
-    assert(lastSegment);
-    if (!lastSegment.catchAll) {
-        const pageContextIr = {
-            pathname: [
-                ...routeIr.pathname.slice(0, -1),
-                {
-                    ...lastSegment,
-                    value: `${lastSegment.value}.pageContext.json`,
-                },
-            ],
-        };
-        return toRou3(pageContextIr);
-    }
-    return [];
-}

package/dist/node/vite/plugins/pluginUniversalDeploy.d.ts

@@ -1,5 +0,0 @@
-export { pluginUniversalDeploy };
-import type { Plugin } from 'vite';
-import type { VikeConfigInternal } from '../shared/resolveVikeConfigInternal.js';
-import '../assertEnvVite.js';
-declare function pluginUniversalDeploy(vikeConfig: VikeConfigInternal): Plugin[];

package/dist/node/vite/plugins/pluginUniversalDeploy.js

@@ -1,155 +0,0 @@
-export { pluginUniversalDeploy };
-import { addEntry } from '@universal-deploy/store';
-import { node } from '@universal-deploy/node/vite';
-import { catchAll, devServer } from '@universal-deploy/store/vite';
-import { serverEntryVirtualId as vikeEntryId } from '@brillout/vite-plugin-server-entry/plugin';
-import { getMagicString } from '../shared/getMagicString.js';
-import { escapeRegex } from '../../../utils/escapeRegex.js';
-import { getDeployConfigs } from './pluginUniversalDeploy/getDeployConfigs.js';
-import { assert, assertUsage, assertWarning } from '../../../utils/assert.js';
-import { asyncFlatten } from '../../../utils/asyncFlatten.js';
-import '../assertEnvVite.js';
-import pc from '@brillout/picocolors';
-const virtualFileIdCatchAll = /^virtual:ud:catch-all$/;
-function pluginUniversalDeploy(vikeConfig) {
-    if (hasVikeServerOrVikePhoton(vikeConfig))
-        return [];
-    let serverEntryId = virtualFileIdCatchAll;
-    let serverFilePath = null;
-    const serverConfig = vikeConfig.config.server;
-    if (serverConfig === false)
-        return [];
-    const serverPlusFile = vikeConfig._pageConfigGlobal.configValueSources.server?.[0];
-    if (serverPlusFile) {
-        assert('filePathAbsoluteFilesystem' in serverPlusFile.definedAt);
-        serverFilePath = serverPlusFile.definedAt.filePathAbsoluteFilesystem;
-        assert(serverFilePath);
-        serverEntryId = new RegExp(escapeRegex(serverFilePath));
-    }
-    if (serverConfig !== true && !serverFilePath)
-        return [];
-    const plugins = [
-        catchAll(),
-        devServer(),
-        // Enable node adapter only if +server is defined and no other deployment target has been found
-        ...node({ importer: 'vike' }).map((p) => 
-        // Disable node() plugin later when Vite's config() hook runs, because noDeploymentTargetFound() requires `config`
-        enablePluginIf((config) => noDeploymentTargetFound(config), p)),
-        {
-            name: 'vike:pluginUniversalDeploy:entries',
-            config() {
-                for (const [pageId, page] of Object.entries(vikeConfig.pages)) {
-                    const deployConfigs = getDeployConfigs(pageId, page);
-                    if (deployConfigs !== null) {
-                        addEntry({
-                            id: serverFilePath ?? 'vike/fetch',
-                            ...deployConfigs,
-                        });
-                    }
-                }
-                // Default catch-all route
-                addEntry({
-                    id: serverFilePath ?? 'vike/fetch',
-                    route: '/**',
-                });
-            },
-            ...pluginOptions,
-        },
-        {
-            name: 'vike:pluginUniversalDeploy:serverEntry',
-            apply: 'build',
-            transform: {
-                order: 'post',
-                filter: {
-                    id: {
-                        include: [serverEntryId],
-                    },
-                },
-                handler(code, id) {
-                    const { magicString, getMagicStringResult } = getMagicString(code, id);
-                    // Inject Vike virtual server entry
-                    magicString.prepend(`import "${vikeEntryId}";\n`);
-                    return getMagicStringResult();
-                },
-            },
-            ...pluginOptions,
-        },
-    ];
-    if (serverFilePath) {
-        plugins.push(
-        // If +server.js is defined, make virtual:ud:catch-all resolve to +server.js absolute path
-        {
-            name: 'vike:pluginUniversalDeploy:server',
-            resolveId: {
-                order: 'pre',
-                filter: {
-                    id: virtualFileIdCatchAll,
-                },
-                handler() {
-                    // Will resolve the entry from the users project root
-                    return this.resolve(serverFilePath);
-                },
-            },
-            ...pluginOptions,
-        });
-    }
-    return plugins;
-}
-const pluginOptions = {
-    applyToEnvironment(env) {
-        return env.config.consumer === 'server';
-    },
-    sharedDuringBuild: true,
-};
-/**
- * Enables a plugin based on a specified condition callback which will be executed in the `config` hook.
- */
-function enablePluginIf(condition, originalPlugin) {
-    const originalConfig = originalPlugin.config;
-    originalPlugin.config = {
-        order: originalConfig && 'order' in originalConfig ? originalConfig.order : 'pre',
-        async handler(c, e) {
-            const enabled = await condition.call(this, c, e);
-            if (!enabled) {
-                const keysToDelete = Object.keys(originalPlugin).filter((k) => k !== 'name');
-                originalPlugin.name += ':disabled';
-                for (const key of keysToDelete) {
-                    // @ts-expect-error
-                    delete originalPlugin[key];
-                }
-            }
-            else if (originalConfig) {
-                if (typeof originalConfig === 'function') {
-                    return originalConfig.call(this, c, e);
-                }
-                return originalConfig.handler.call(this, c, e);
-            }
-        },
-    };
-    return originalPlugin;
-}
-// Disable a plugin if one of the following plugin is present
-//  - vite-plugin-vercel
-//  - @cloudflare/vite-plugin
-async function noDeploymentTargetFound(c) {
-    const plugins = (await asyncFlatten((c.plugins ?? []))).filter((p) => Boolean(p));
-    assertUsage(!plugins.some((p) => p.name.startsWith('photon:target-loader:vercel')), 'Replace `@photonjs/vercel` by `vite-plugin-vercel@11`, see https://vike.dev/migration/universal-deploy');
-    assertUsage(!plugins.some((p) => p.name.startsWith('photon:target-loader:cloudflare')), 'Replace `@photonjs/cloudflare` by `@cloudflare/vite-plugin`, see https://vike.dev/migration/universal-deploy');
-    // vite-plugin-vercel
-    const vitePluginVercel = plugins.some((p) => p.name.match(/^vite-plugin-vercel:(?!.*:disabled$)/));
-    // @cloudflare/vite-plugin
-    const cloudflareVitePlugin = plugins.some((p) => p.name.match(/^vite-plugin-cloudflare:(?!.*:disabled$)/));
-    return !vitePluginVercel && !cloudflareVitePlugin;
-}
-function hasVikeServerOrVikePhoton(vikeConfig) {
-    const vikeExtendsNames = new Set(vikeConfig._extensions.map((plusFile) => ('fileExportsByConfigName' in plusFile ? plusFile.fileExportsByConfigName : {}).name));
-    const vikeServerOrVikePhoton = vikeExtendsNames.has('vike-server')
-        ? 'vike-server'
-        : vikeExtendsNames.has('vike-photon')
-            ? 'vike-photon'
-            : null;
-    if (vikeServerOrVikePhoton) {
-        assertWarning(false, `${pc.cyan(vikeServerOrVikePhoton)} is deprecated, see ${pc.underline('https://vike.dev/migration/universal-deploy')}`, { onlyOnce: true });
-        return true;
-    }
-}

package/dist/server/runtime/fetch.d.ts

@@ -1,10 +0,0 @@
-import '../assertEnvServer.js';
-declare const _default: {
-    fetch: (<T extends string>(request: Request, context: Universal.Context, runtime: import("@universal-middleware/core").RuntimeAdapterTarget<T>) => Promise<Response>) & import("@universal-middleware/core").WithUniversalSymbols<{
-        name: string;
-        method: ("GET" | "HEAD" | "POST" | "PUT" | "OPTIONS" | "PATCH")[];
-        path: string;
-        immutable: true;
-    }>;
-};
-export default _default;

package/dist/server/runtime/fetch.js

@@ -1,5 +0,0 @@
-import '../assertEnvServer.js';
-import vikeHandler from './universal-middleware.js';
-export default {
-    fetch: vikeHandler,
-};

package/dist/utils/asyncFlatten.d.ts

@@ -1,4 +0,0 @@
-export { asyncFlatten };
-export type { AsyncFlatten };
-type AsyncFlatten<T extends unknown[]> = T extends (infer U)[] ? Exclude<Awaited<U>, U[]>[] : never;
-declare function asyncFlatten<T extends unknown[]>(arr: T): Promise<AsyncFlatten<T>>;

package/dist/utils/asyncFlatten.js

@@ -1,7 +0,0 @@
-export { asyncFlatten };
-async function asyncFlatten(arr) {
-    do {
-        arr = (await Promise.all(arr)).flat(Infinity);
-    } while (arr.some((v) => v?.then));
-    return arr;
-}

package/fetch.js

@@ -1,3 +0,0 @@
-// Some tools still need this as of January 2025
-export * from './dist/server/runtime/fetch.js'
-export { default } from './dist/server/runtime/fetch.js'