vike 0.4.255 → 0.4.256-commit-414bdc0

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';
+type ConfigNameBuiltIn = Exclude<keyof ConfigBuiltIn, keyof VikeVitePluginOptions | 'onBeforeRoute' | 'onPrerenderStart' | 'vite' | 'redirects'> | 'prerender' | 'hasServerOnlyHook' | 'isClientRuntimeLoaded' | 'onBeforeRenderEnv' | 'dataEnv' | 'guardEnv' | 'hooksTimeout' | 'clientHooks' | 'middleware' | 'server' | 'isr' | 'edge';
 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,6 +521,14 @@ 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 | ImportStringList;
     cli?: {
         /** @experimental
          *
@@ -540,6 +548,25 @@ type ConfigBuiltIn = {
      * @experimental
      */
     staticReplace?: StaticReplace[];
+    /**
+     * The license key for larger teams.
+     *
+     * https://vike.dev/license
+     * 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,3 +1,4 @@
+import type { IncomingMessage } from 'node:http';
 export type { PageContext };
 export type { PageContextServer };
 export type { PageContextClient };
@@ -7,6 +8,7 @@ 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 };
@@ -132,6 +134,10 @@ 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/types/Server.d.ts

@@ -0,0 +1,8 @@
+import type { Fetchable, ServerOptions } from '@universal-deploy/store';
+/** Server options.
+ *
+ * https://vike.dev/server
+ */
+export interface Server extends Fetchable {
+    prod?: Omit<ServerOptions, 'fetch'>;
+}

package/dist/types/Server.js

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

package/dist/types/index.d.ts

@@ -51,3 +51,4 @@ import { PageContextBuiltInServer } from './PageContext.js';
  */
 type PageContextBuiltIn<Page = any> = PageContextBuiltInServer<Page>;
 export type { PageContextBuiltIn };
+export type { Server } from './Server.js';

package/dist/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.255";
+export declare const PROJECT_VERSION: "0.4.256-commit-414bdc0";

package/dist/utils/PROJECT_VERSION.js

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

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/dist/utils/path.js

@@ -21,7 +21,7 @@ function pathJoin(path1, path2) {
         joined = '/' + joined;
     return joined;
 }
-// https://github.com/brillout/telefunc/blob/0fd44322acbd07857ae29361ba7c998607f17dd5/telefunc/utils/path-shim.ts#L17-L21
+// https://github.com/telefunc/telefunc/blob/0fd44322acbd07857ae29361ba7c998607f17dd5/telefunc/utils/path-shim.ts#L17-L21
 const IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/;
 function pathIsAbsolute(filePath) {
     return IS_ABSOLUTE_RE.test(filePath);

package/fetch.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.255",
+  "version": "0.4.256-commit-414bdc0",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -94,6 +94,14 @@
       "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",
@@ -124,17 +132,23 @@
     "@brillout/json-serializer": "^0.5.22",
     "@brillout/picocolors": "^1.0.30",
     "@brillout/vite-plugin-server-entry": "0.7.18",
+    "@universal-deploy/store": "^0.2.1",
+    "@universal-deploy/vite": "^0.1.1",
+    "@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"
+    "vite": ">=6.3.0",
+    "vite-plugin-wrapper": "^0.1.0"
   },
   "peerDependencies": {
     "react-streaming": ">=0.3.42",
@@ -208,6 +222,9 @@
       "universal-middleware": [
         "./dist/server/runtime/universal-middleware.d.ts"
       ],
+      "fetch": [
+        "./dist/server/runtime/fetch.d.ts"
+      ],
       "__internal": [
         "./dist/server/__internal/index.d.ts"
       ],
@@ -241,18 +258,19 @@
     "./routing.js",
     "./server.js",
     "./types.js",
-    "./universal-middleware.js"
+    "./universal-middleware.js",
+    "./fetch.js"
   ],
   "devDependencies": {
-    "@brillout/release-me": "^0.4.12",
+    "@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.15",
-    "rimraf": "^5.0.5",
+    "react-streaming": "^0.4.17",
+    "rimraf": "^6.1.3",
     "typescript": "^5.9.3",
     "vite": "^7.2.6"
   },