vike 0.4.252 → 0.4.253-commit-1658209

package/dist/shared-server-client/hooks/getHook.d.ts

@@ -4,7 +4,7 @@ export { getHookFromPageConfig };
 export { getHookFromPageConfigGlobal };
 export { getHooksFromPageConfigGlobalCumulative };
 export { getHook_setIsPrerenderering };
-export type { Hook };
+export type { HookInternal };
 export type { HookLoc };
 export type { HookTimeout };
 export type { HooksTimeoutProvidedByUser };
@@ -15,7 +15,7 @@ import type { PageConfigGlobalRuntime, PageConfigRuntime } from '../../types/Pag
 import type { GlobalContextPublicMinimum } from '../getGlobalContextPublicShared.js';
 import type { PageContextPublicMinimum } from '../getPageContextPublicShared.js';
 type HookArgDefault = PageContextPublicMinimum;
-type Hook<HookArg = HookArgDefault> = HookLoc & {
+type HookInternal<HookArg = HookArgDefault> = HookLoc & {
     hookFn: HookFn<HookArg>;
     hookTimeout: HookTimeout;
 };
@@ -29,10 +29,10 @@ type HookTimeout = {
     warning: number | false;
 };
 type HooksTimeoutProvidedByUser = false | Partial<Record<HookNameOld, false | Partial<HookTimeout>>>;
-declare function getHookFromPageContext(pageContext: PageContextConfig, hookName: HookNameOld): null | Hook;
-declare function getHooksFromPageContextNew(hookName: HookName, pageContext: PageContextConfig): Hook[];
-declare function getHookFromPageConfig(pageConfig: PageConfigRuntime, hookName: HookNamePage): null | Hook;
-declare function getHookFromPageConfigGlobal(pageConfigGlobal: PageConfigGlobalRuntime, hookName: HookNameGlobal): null | Hook;
-declare function getHooksFromPageConfigGlobalCumulative<HookArg = GlobalContextPublicMinimum>(pageConfigGlobal: PageConfigGlobalRuntime, hookName: HookNameGlobal): Hook<HookArg>[];
+declare function getHookFromPageContext(pageContext: PageContextConfig, hookName: HookNameOld): null | HookInternal;
+declare function getHooksFromPageContextNew(hookName: HookName, pageContext: PageContextConfig): HookInternal[];
+declare function getHookFromPageConfig(pageConfig: PageConfigRuntime, hookName: HookNamePage): null | HookInternal;
+declare function getHookFromPageConfigGlobal(pageConfigGlobal: PageConfigGlobalRuntime, hookName: HookNameGlobal): null | HookInternal;
+declare function getHooksFromPageConfigGlobalCumulative<HookArg = GlobalContextPublicMinimum>(pageConfigGlobal: PageConfigGlobalRuntime, hookName: HookNameGlobal): HookInternal<HookArg>[];
 declare function getHookTimeoutDefault(hookName: HookNameOld): HookTimeout;
 declare function getHook_setIsPrerenderering(): void;

package/dist/shared-server-client/route/abort.js

@@ -163,15 +163,12 @@ function assertStatusCode(statusCode, expected, caller) {
     }
     else {
         assert(!isBrowser());
-        if (import.meta.env) {
+        if (globalThis.__VIKE__NO_EXTERNAL) {
             assert(typeof globalThis.__VIKE__IS_DEV === 'boolean');
             assert(typeof globalThis.__VIKE__IS_CLIENT === 'boolean');
             assert(import.meta.env.SSR === true);
             assert(import.meta.env.DEV === globalThis.__VIKE__IS_DEV);
         }
-        else {
-            // import.meta.env isn't defined when 'vike' is ssr.external
-        }
     }
     const expectedEnglish = joinEnglish(expected.map((s) => pc.bold(String(s))), 'or');
     const statusCodeWithColor = pc.bold(String(statusCode));

package/dist/shared-server-client/route/loadPageRoutes.d.ts

@@ -4,7 +4,7 @@ export type { PageRoutes };
 export type { RouteType };
 import type { PageFile } from '../getPageFiles.js';
 import type { PageConfigRuntime, PageConfigGlobalRuntime } from '../../types/PageConfig.js';
-import { type Hook } from '../hooks/getHook.js';
+import { type HookInternal } from '../hooks/getHook.js';
 type PageRoute = {
     pageId: string;
     comesFromV1PageConfig: boolean;
@@ -27,9 +27,9 @@ type PageRoutes = PageRoute[];
 type RouteType = 'STRING' | 'FUNCTION' | 'FILESYSTEM';
 declare function loadPageRoutes(pageFilesAll: PageFile[], pageConfigs: PageConfigRuntime[], pageConfigGlobal: PageConfigGlobalRuntime, allPageIds: string[]): Promise<{
     pageRoutes: PageRoutes;
-    onBeforeRouteHook: null | Hook;
+    onBeforeRouteHook: null | HookInternal;
 }>;
 declare function loadPageRoutesSync(pageFilesAll: PageFile[], pageConfigs: PageConfigRuntime[], pageConfigGlobal: PageConfigGlobalRuntime, allPageIds: string[]): {
     pageRoutes: PageRoutes;
-    onBeforeRouteHook: null | Hook;
+    onBeforeRouteHook: null | HookInternal;
 };

package/dist/types/Config.d.ts

@@ -48,6 +48,7 @@ import type { PassToClientPublic } from '../server/runtime/renderPageServer/html
 import type { CliPreviewConfig } from '../node/api/preview.js';
 import type { StaticReplace } from '../node/vite/plugins/pluginStaticReplace/applyStaticReplace.js';
 import type { ImportStringList } from '../node/vite/shared/importString.js';
+import type { HookPublic } from '../shared-server-client/hooks/execHook.js';
 type HookNameOld = HookName | HookNameOldDesign;
 type HookName = HookNamePage | HookNameGlobal;
 type HookNamePage = 'onHydrationEnd' | 'onBeforePrerenderStart' | 'onBeforeRender' | 'onPageTransitionStart' | 'onPageTransitionEnd' | 'onRenderHtml' | 'onRenderClient' | 'guard' | 'data' | 'onData' | 'route';
@@ -296,11 +297,7 @@ type ConfigBuiltIn = {
      *
      *  https://vike.dev/onHookCall
      */
-    onHookCall?: ((hook: {
-        name: HookName;
-        filePath: string;
-        call: () => void | Promise<void>;
-    }, pageContext: PageContextClient | PageContextServer | null) => void | Promise<void>) | ImportStringList;
+    onHookCall?: ((hook: HookPublic, pageContext: PageContextServer | null) => void | Promise<void>) | ImportStringList;
     /** Hook for fetching data.
      *
      *  https://vike.dev/data

package/dist/types/PageContext.d.ts

@@ -131,7 +131,6 @@ type PageContextInit = {
      */
     headersOriginal?: unknown;
     /** @deprecated Set `pageContextInit.urlOriginal` instead  */ url?: string;
-    /** @deprecated Set pageContextInit.headersOriginal instead */ headers?: Record<string, string>;
 };
 type PageContextBuiltInServer<Data> = PageContextBuiltInCommon<Data> & PageContextInit & PageContextUrlServer & {
     /**
@@ -270,6 +269,8 @@ type PageContextClientCommon = {
      * https://vike.dev/pageContext#isPrerendering
      */
     isPrerendering: false;
+    cspNonce?: undefined;
+    headers?: undefined;
 };
 type PageContextInternalServer = Omit<PageContextBuiltInCommon<unknown> & PageContextUrlInternal, 'data' | 'globalContext'>;
 type OnlyUsers = 'data' | 'Page' | 'globalContext';

package/dist/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.252";
+export declare const PROJECT_VERSION: "0.4.253-commit-1658209";

package/dist/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.252';
+export const PROJECT_VERSION = '0.4.253-commit-1658209';

package/dist/utils/debug.js

@@ -175,22 +175,18 @@ function getFlagsActivated() {
 }
 function getDEBUG() {
     assert(isUsed);
-    let DEBUG;
     // ssr.noExternal
-    /* // Full implementation:
-       // - https://github.com/vikejs/vike/commit/7637564a98f43e23834bcae2f7ada8d941958a34
-       // - https://github.com/vikejs/vike/pull/2718
-       // - We don't implement this yet because it crashes @cloudflare/vite-plugin
-    if (import.meta.env) {
-      return import.meta.env.DEBUG
+    // - @cloudflare/vite-plugin
+    try {
+        return import.meta.env.DEBUG;
     }
-    //*/
+    catch { }
     // ssr.external
-    // - `process` can be undefined in edge workers
-    // - We want bundlers to be able to statically replace `process.env.*`
+    // - `process` can be `undefined` (e.g. edge workers)
+    // - We want bundlers (e.g. webpack) to be able to statically replace `process.env.*`
     try {
-        DEBUG = process.env.DEBUG;
+        return process.env.DEBUG;
     }
     catch { }
-    return DEBUG;
+    return null;
 }

package/dist/utils/isBrowser.d.ts

@@ -1 +1,2 @@
+/** Test whether the environment is a *real* browser (not a browser simulation such as `jsdom`). */
 export declare function isBrowser(): boolean;

package/dist/utils/isBrowser.js

@@ -1,5 +1,7 @@
+/** Test whether the environment is a *real* browser (not a browser simulation such as `jsdom`). */
 export function isBrowser() {
-    // Using `typeof window !== 'undefined'` alone is not enough because some users use https://www.npmjs.com/package/ssr-window
-    return typeof window !== 'undefined' && typeof window.scrollY === 'number';
-    // Alternatively, test whether environment is a *real* browser: https://github.com/brillout/picocolors/blob/d59a33a0fd52a8a33e4158884069192a89ce0113/picocolors.js#L87-L89
+    // - Using `typeof window !== 'undefined'` alone isn't narrow enough because some users use https://www.npmjs.com/package/ssr-window
+    // - Using `typeof window !== "undefined" && typeof window.scrollY === "number"` still isn't narrow enough because of jsdom
+    // - https://github.com/jsdom/jsdom/issues/1537#issuecomment-1689368267
+    return Object.getOwnPropertyDescriptor(globalThis, 'window')?.get?.toString().includes('[native code]') ?? false;
 }

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "vike",
-  "version": "0.4.252",
+  "version": "0.4.253-commit-1658209",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
+      "types": "./dist/server/runtime/index.d.ts",
       "worker": "./dist/server/runtime/index.js",
       "workerd": "./dist/server/runtime/index.js",
       "node": "./dist/server/runtime/index.js",
       "browser": "./dist/client/node.js",
-      "types": "./dist/server/runtime/index.d.ts",
       "default": "./dist/server/runtime/index.js"
     },
     "./client": {
@@ -19,89 +19,89 @@
       "default": "./dist/types/index.js"
     },
     "./client/router": {
+      "types": "./dist/client/runtime-client-routing/index.d.ts",
       "worker": "./dist/server/client/router.js",
       "workerd": "./dist/server/client/router.js",
       "node": "./dist/server/client/router.js",
       "browser": "./dist/client/runtime-client-routing/index.js",
-      "types": "./dist/client/runtime-client-routing/index.d.ts",
       "default": "./dist/client/runtime-client-routing/index.js"
     },
     "./routing": {
+      "types": "./dist/shared-server-client/route/routing.d.ts",
       "worker": "./dist/shared-server-client/route/routing.js",
       "workerd": "./dist/shared-server-client/route/routing.js",
       "node": "./dist/shared-server-client/route/routing.js",
       "browser": "./dist/shared-server-client/route/routing.js",
-      "types": "./dist/shared-server-client/route/routing.d.ts",
       "default": "./dist/shared-server-client/route/routing.js"
     },
     "./cli": {
-      "node": "./dist/node/cli/index.js",
       "types": "./dist/node/cli/index.d.ts",
+      "node": "./dist/node/cli/index.js",
       "default": "./dist/node/cli/index.js"
     },
     "./api": {
-      "node": "./dist/node/api/index.js",
       "types": "./dist/node/api/index.d.ts",
+      "node": "./dist/node/api/index.js",
       "default": "./dist/node/api/index.js"
     },
     "./prerender": {
-      "node": "./dist/node/prerender/index.js",
       "types": "./dist/node/prerender/index.d.ts",
+      "node": "./dist/node/prerender/index.js",
       "default": "./dist/node/prerender/index.js"
     },
     "./plugin": {
-      "node": "./dist/node/vite/index.js",
       "types": "./dist/node/vite/index.d.ts",
+      "node": "./dist/node/vite/index.js",
       "default": "./dist/node/vite/index.js"
     },
     "./RenderErrorPage": {
+      "types": "./dist/shared-server-client/RenderErrorPage.d.ts",
       "worker": "./dist/shared-server-client/RenderErrorPage.js",
       "workerd": "./dist/shared-server-client/RenderErrorPage.js",
       "node": "./dist/shared-server-client/RenderErrorPage.js",
       "browser": "./dist/shared-server-client/RenderErrorPage.js",
-      "types": "./dist/shared-server-client/RenderErrorPage.d.ts",
       "default": "./dist/shared-server-client/RenderErrorPage.js"
     },
     "./abort": {
+      "types": "./dist/shared-server-client/abort.d.ts",
       "worker": "./dist/shared-server-client/abort.js",
       "workerd": "./dist/shared-server-client/abort.js",
       "node": "./dist/shared-server-client/abort.js",
       "browser": "./dist/shared-server-client/abort.js",
-      "types": "./dist/shared-server-client/abort.d.ts",
       "default": "./dist/shared-server-client/abort.js"
     },
     "./getPageContext": {
+      "types": "./dist/server/runtime/getPageContext.d.ts",
       "worker": "./dist/server/runtime/getPageContext.js",
       "workerd": "./dist/server/runtime/getPageContext.js",
       "node": "./dist/server/runtime/getPageContext.js",
       "browser": "./dist/client/runtime-client-routing/getPageContext.js",
-      "types": "./dist/server/runtime/getPageContext.d.ts",
       "default": "./dist/server/runtime/getPageContext.js"
     },
     "./modifyUrl": {
+      "types": "./dist/shared-server-client/modifyUrl.d.ts",
       "worker": "./dist/shared-server-client/modifyUrl.js",
       "workerd": "./dist/shared-server-client/modifyUrl.js",
       "node": "./dist/shared-server-client/modifyUrl.js",
       "browser": "./dist/shared-server-client/modifyUrl.js",
-      "types": "./dist/shared-server-client/modifyUrl.d.ts",
       "default": "./dist/shared-server-client/modifyUrl.js"
     },
     "./universal-middleware": {
+      "types": "./dist/server/runtime/universal-middleware.d.ts",
       "worker": "./dist/server/runtime/universal-middleware.js",
       "workerd": "./dist/server/runtime/universal-middleware.js",
       "node": "./dist/server/runtime/universal-middleware.js",
       "browser": "./dist/client/node.js",
-      "types": "./dist/server/runtime/universal-middleware.d.ts",
       "default": "./dist/server/runtime/universal-middleware.js"
     },
     "./__internal": {
-      "node": "./dist/server/__internal/index.js",
       "types": "./dist/server/__internal/index.d.ts",
+      "node": "./dist/server/__internal/index.js",
       "default": "./dist/server/__internal/index.js"
     },
     "./__internal/setup": {
-      "node": "./dist/server/runtime/page-files/setup.js",
       "types": "./dist/server/runtime/page-files/setup.d.ts",
+      "node": "./dist/server/runtime/page-files/setup.js",
       "default": "./dist/server/runtime/page-files/setup.js"
     },
     "./__internal/vite": {
@@ -109,11 +109,11 @@
       "default": "./dist/server/__internal/vite.js"
     },
     ".": {
+      "types": "./dist/server/runtime/index.d.ts",
       "worker": "./dist/server/runtime/index.js",
       "workerd": "./dist/server/runtime/index.js",
       "node": "./dist/server/runtime/index.js",
       "browser": "./dist/client/index.js",
-      "types": "./dist/server/runtime/index.d.ts",
       "default": "./dist/server/runtime/index.js"
     }
   },
@@ -153,7 +153,7 @@
     "node": ">=20.19.0"
   },
   "license": "MIT",
-  "description": "The Framework *You* Control - Next.js & Nuxt alternative for unprecedented flexibility and dependability.",
+  "description": "(Replaces Next.js/Nuxt) 🔨 Composable framework to build advanced applications with flexibility and stability.",
   "keywords": [
     "vite-plugin",
     "ssr",