vike 0.4.256 → 0.4.257-commit-3b8b557

package/dist/shared-server-client/page-configs/loadAndParseVirtualFilePageEntry.js

@@ -21,10 +21,13 @@ async function loadAndParseVirtualFilePageEntry(pageConfig, isDev) {
         configValues = parseVirtualFileExportsPageEntry(virtualFileExportsPageEntry);
     }
     catch (e) {
-        if (!(e instanceof ReferenceError))
+        // Safari WebKit bug: dynamic import() may resolve before the module body executes.
+        if (
+        // Throwing ReferenceError (TDZ): https://github.com/vikejs/vike/issues/3121
+        !(e instanceof ReferenceError) &&
+            // Or TypeError (undefined exports) on some WebKit builds: https://github.com/vikejs/vike/issues/3199
+            !(e instanceof TypeError))
             throw e;
-        // Safari WebKit bug: dynamic import() may resolve before the module body executes,
-        // https://github.com/vikejs/vike/issues/3121
         await new Promise((resolve) => setTimeout(resolve));
         configValues = parseVirtualFileExportsPageEntry(virtualFileExportsPageEntry);
     }

package/dist/shared-server-client/page-configs/resolveVikeConfigPublic.d.ts

@@ -2,6 +2,7 @@ export { resolveGlobalConfigPublic };
 export { resolvePageContextConfig };
 export { resolveGlobalContextConfig };
 export type { PageContextConfig };
+export type { PageConfigPublicWithRoute };
 export type { GlobalConfigPublic };
 export type { Source };
 export type { Sources };

package/dist/types/Config.d.ts

@@ -10,6 +10,7 @@ export type { HookNamePage };
 export type { HookNameGlobal };
 export type { Route };
 export type { KeepScrollPosition };
+export type { Vercel };
 export type { DataAsync };
 export type { DataSync };
 export type { GuardAsync };
@@ -54,7 +55,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' | 'vercel';
 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 +522,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
          *
@@ -547,6 +556,28 @@ type ConfigBuiltIn = {
      * https://vike.dev/pricing
      */
     license?: string;
+    /**
+     * Vercel options
+     *
+     * https://vike.dev/vercel
+     */
+    vercel?: Vercel;
+};
+type Vercel = {
+    /**
+     * Incremental Static Regeneration (ISR).
+     *
+     * https://vike.dev/vercel#isr
+     */
+    isr?: {
+        expiration: number;
+    };
+    /**
+     * Deploy on Vercel Edge.
+     *
+     * https://vike.dev/vercel#edge
+     */
+    edge?: boolean;
 };
 type PrerenderSetting = boolean | {
     /**

package/dist/types/FilePath.d.ts

@@ -15,11 +15,11 @@ type FilePathResolved = FilePathCommon & {
      */
     filePathAbsoluteFilesystem: string;
     /**
-     * The file's path, shown to the user in logs.
+     * The file path shown to the user in logs.
      *
-     * Resolved: it always shows a file path. (It never shows an import path such as `vike-react/config`.)
+     * Its value is: `filePath.filePathAbsoluteUserRootDir ?? filePath.filePathAbsoluteFilesystem`.
      *
-     * Its value is equivalent to `filePath.filePathAbsoluteUserRootDir ?? filePath.filePathAbsoluteFilesystem`.
+     * Note that it always shows a file path. (It never shows an import path such as `vike-react/config`.)
      */
     filePathToShowToUserResolved: string;
     /**
@@ -52,11 +52,11 @@ type FilePathAbsoluteUserRootDir = {
 };
 type FilePathCommon = {
     /**
-     * The file's path, shown to the user in logs.
+     * The file or import path shown to the user in logs.
      *
-     * Unresolved: it may show an import path instead of a file path such as `vike-react/config`.
+     * Its value is: `filePath.filePathAbsoluteUserRootDir ?? filePath.importPathAbsolute`.
      *
-     * Its value is equivalent to `filePath.filePathAbsoluteUserRootDir ?? filePath.importPathAbsolute`.
+     * Note that if `filePath.filePathAbsoluteUserRootDir` isn't defined then it shows the import path (e.g. `vike-react/config`) instead of a file path.
      */
     filePathToShowToUser: string;
     /**

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,10 +8,12 @@ export type { PageContextInternalServer };
 export type { PageContextInternalClient };
 export type { PageContextInternalClient_ServerRouting };
 export type { PageContextInternalClient_ClientRouting };
+export type { PageContextInitInternal };
 export type { PageContextInit };
 export type { PageContextBuiltInServer_deprecated as PageContextBuiltInServer };
 export type { PageContextBuiltInClientWithClientRouting_deprecated as PageContextBuiltInClientWithClientRouting };
 export type { PageContextBuiltInClientWithServerRouting_deprecated as PageContextBuiltInClientWithServerRouting };
+import type { RuntimeAdapterTarget } from '@universal-middleware/core';
 import type { PageContextUrlInternal, PageContextUrlClient, PageContextUrlServer } from '../shared-server-client/getPageContextUrlComputed.js';
 import type { From, PageContextConfig, Source, Sources } from '../shared-server-client/page-configs/resolveVikeConfigPublic.js';
 import type { Config } from './Config.js';
@@ -24,7 +27,11 @@ import type { PageContextPublicProxyClient } from '../client/runtime-client-rout
 type PageContextServer<Data = unknown> = PageContextBuiltInServer<Data> & {
     /** https://vike.dev/warning/internals */
     dangerouslyUseInternals: DangerouslyUseInternals<PageContextInternalServer & PageContextAfterRender & PageContextPublicServer>;
-} & Vike.PageContext & Vike.PageContextServer;
+} & Vike.PageContext & Vike.PageContextServer & (Vike.Server extends {
+    server: string;
+} ? {
+    runtime: RuntimeAdapterTarget<Vike.Server['server']>;
+} : {});
 type PageContext<Data = unknown> = PageContextClient<Data> | PageContextServer<Data>;
 type PageContextClient<Data = unknown> = PageContextBuiltInClientWithClientRouting<Data> & {
     /** https://vike.dev/warning/internals */
@@ -132,6 +139,10 @@ type PageContextInit = {
     headersOriginal?: unknown;
     /** @deprecated Set `pageContextInit.urlOriginal` instead  */ url?: string;
 };
+type PageContextInitInternal = PageContextInit & {
+    _reqDev?: IncomingMessage;
+    _reqWeb?: Request;
+};
 type PageContextBuiltInServer<Data> = PageContextBuiltInCommon<Data> & PageContextInit & PageContextUrlServer & {
     /**
      * The HTTP request headers.
@@ -288,7 +299,7 @@ type PageContextInternalClient_ServerRouting = Omit<PageContextBuiltInClientWith
  *   ```
  * With:
  *   ```
- *   import { PageContextServer } from 'vike/types'
+ *   import type { PageContextServer } from 'vike/types'
  *   ```
  *
  * See https://vike.dev/pageContext#typescript
@@ -301,7 +312,7 @@ type PageContextBuiltInServer_deprecated<_Page = never> = PageContextBuiltInServ
  *   ```
  * With:
  *   ```
- *   import { PageContextClient } from 'vike/types'
+ *   import type { PageContextClient } from 'vike/types'
  *   ```
  *
  * See https://vike.dev/pageContext#typescript
@@ -314,7 +325,7 @@ type PageContextBuiltInClientWithClientRouting_deprecated<_Page = never> = PageC
  *   ```
  * With:
  *   ```
- *   import { PageContextClientWithServerRouting as PageContextClient } from 'vike/types'
+ *   import type { PageContextClientWithServerRouting as PageContextClient } from 'vike/types'
  *   ```
  *
  * See https://vike.dev/pageContext#typescript

package/dist/types/Server.d.ts

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

package/dist/types/Server.js

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

package/dist/types/VikeNamespace.d.ts

@@ -60,5 +60,12 @@ declare global {
         interface GlobalContextServer {
             _interfaceIsNotAny?: never;
         }
+        /** Defines the type of `pageContext.runtime`.
+         *
+         *  https://vike.dev/server#pagecontext-runtime
+         */
+        interface Server {
+            _interfaceIsNotAny?: never;
+        }
     }
 }

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.256";
+export declare const PROJECT_VERSION: "0.4.257-commit-3b8b557";

package/dist/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.256';
+export const PROJECT_VERSION = '0.4.257-commit-3b8b557';

package/dist/utils/isCloudflareWorkers.d.ts

@@ -0,0 +1 @@
+export declare function isCloudflareWorkers(): boolean;

package/dist/utils/isCloudflareWorkers.js

@@ -0,0 +1,4 @@
+// https://github.com/cloudflare/workers-sdk/issues/1481#issuecomment-2550929035
+export function isCloudflareWorkers() {
+    return typeof navigator !== 'undefined' && navigator?.userAgent === 'Cloudflare-Workers';
+}

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.256",
+  "version": "0.4.257-commit-3b8b557",
   "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,7 +132,12 @@
     "@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.6",
+    "@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",
@@ -133,8 +146,9 @@
     "semver": "^7.7.4",
     "sirv": "^3.0.2",
     "source-map-support": "^0.5.0",
-    "tinyglobby": "^0.2.10",
-    "vite": ">=6.3.0"
+    "tinyglobby": "^0.2.16",
+    "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,7 +258,8 @@
     "./routing.js",
     "./server.js",
     "./types.js",
-    "./universal-middleware.js"
+    "./universal-middleware.js",
+    "./fetch.js"
   ],
   "devDependencies": {
     "@brillout/release-me": "^0.4.13",