vike 0.4.240 → 0.4.241-commit-60b0676

package/dist/esm/shared/createGlobalContextShared.d.ts

@@ -5,13 +5,14 @@ export type { GlobalContextBasePublic };
 export type GlobalContextInternal = GlobalContextServerInternal | GlobalContextClientInternal;
 import type { PageFile } from './getPageFiles.js';
 import type { PageConfigRuntime } from '../types/PageConfig.js';
+import { type GlobalContextPrepareMinimum } from './prepareGlobalContextForPublicUsage.js';
 import type { GlobalContextServerInternal } from '../node/runtime/globalContext.js';
 import type { GlobalContextClientInternal } from '../client/runtime-client-routing/getGlobalContextClientInternal.js';
 import { type Hook } from './hooks/getHook.js';
 declare const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
 declare function createGlobalContextShared<GlobalContextAdded extends {}, GlobalContextAddedAsync extends {}>(virtualFileExportsGlobalEntry: unknown, globalObject: {
     globalContext?: {};
-    onCreateGlobalContextHooks?: Hook[];
+    onCreateGlobalContextHooks?: Hook<GlobalContextPrepareMinimum>[];
     previousCreateGlobalContextPromise?: Promise<void>;
 }, addGlobalContext?: (globalContext: GlobalContextBase) => GlobalContextAdded, addGlobalContextTmp?: (globalContext: GlobalContextBase) => Promise<GlobalContextAdded>, addGlobalContextAsync?: (globalContext: GlobalContextBase) => Promise<GlobalContextAddedAsync>): Promise<{
     _globalConfigPublic: {

package/dist/esm/shared/createGlobalContextShared.js

@@ -4,7 +4,7 @@ import { assert, changeEnumerable, genPromise, objectAssign, objectReplace, uniq
 import { parseVirtualFileExportsGlobalEntry } from './getPageFiles/parseVirtualFileExportsGlobalEntry.js';
 import { resolveGlobalContextConfig } from './page-configs/resolveVikeConfigPublic.js';
 import { execHookGlobal } from './hooks/execHook.js';
-import { prepareGlobalContextForPublicUsage } from './prepareGlobalContextForPublicUsage.js';
+import { prepareGlobalContextForPublicUsage, } from './prepareGlobalContextForPublicUsage.js';
 import { getHookFromPageConfigGlobalCumulative } from './hooks/getHook.js';
 const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
 // TO-DO/eventually use flat globalContext — like flat pageContext

package/dist/esm/shared/hooks/execHook.d.ts

@@ -24,7 +24,7 @@ type HookWithResult = Hook & {
     hookReturn: unknown;
 };
 declare function execHook<PageContext extends PageContextExecHook>(hookName: HookName, pageContext: PageContext, preparePageContextForPublicUsage: (pageContext: PageContext) => PageContext): Promise<HookWithResult[]>;
-declare function execHookGlobal<HookArg extends PageContextPrepareMinimum | GlobalContextPrepareMinimum>(hookName: HookNameGlobal, pageConfigGlobal: PageConfigGlobalRuntime, pageContext: PageContextPrepareMinimum | null, hookArg: HookArg, prepareForPublicUsage: (hookArg: HookArg) => HookArg): Promise<void>;
+declare function execHookGlobal<HookArg extends GlobalContextPrepareMinimum>(hookName: HookNameGlobal, pageConfigGlobal: PageConfigGlobalRuntime, pageContext: PageContextPrepareMinimum | null, hookArg: HookArg, prepareForPublicUsage: (hookArg: HookArg) => HookArg): Promise<void>;
 declare function execHookDirect<PageContext extends PageContextPrepareMinimum>(hooks: Hook[], pageContext: PageContext, preparePageContextForPublicUsage: (pageContext: PageContext) => PageContext): Promise<HookWithResult[]>;
 declare function execHookDirectSingle<PageContext extends PageContextExecHook>(hook: Hook, pageContext: PageContext, preparePageContextForPublicUsage: (pageContext: PageContext) => PageContext): Promise<void>;
 declare function execHookDirectSingleWithReturn<PageContext extends PageContextExecHook>(hook: Hook, pageContext: PageContext, preparePageContextForPublicUsage: (pageContext: PageContext) => PageContext): Promise<{

package/dist/esm/shared/hooks/getHook.d.ts

@@ -14,15 +14,16 @@ import type { HookNameOld, HookNamePage, HookNameGlobal, HookName } from '../../
 import type { PageConfigGlobalRuntime, PageConfigRuntime } from '../../types/PageConfig.js';
 import type { GlobalContextPrepareMinimum } from '../prepareGlobalContextForPublicUsage.js';
 import type { PageContextPrepareMinimum } from '../preparePageContextForPublicUsage.js';
-type Hook = HookLoc & {
-    hookFn: HookFn;
+type HookArgDefault = PageContextPrepareMinimum;
+type Hook<HookArg = HookArgDefault> = HookLoc & {
+    hookFn: HookFn<HookArg>;
     hookTimeout: HookTimeout;
 };
 type HookLoc = {
     hookName: HookNameOld;
     hookFilePath: string;
 };
-type HookFn = (arg: PageContextPrepareMinimum | GlobalContextPrepareMinimum) => unknown;
+type HookFn<HookArg = HookArgDefault> = (arg: HookArg) => unknown;
 type HookTimeout = {
     error: number | false;
     warning: number | false;
@@ -32,6 +33,6 @@ declare function getHookFromPageContext(pageContext: PageContextConfig, hookName
 declare function getHookFromPageContextNew(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 getHookFromPageConfigGlobalCumulative(pageConfigGlobal: PageConfigGlobalRuntime, hookName: HookNameGlobal): Hook[];
+declare function getHookFromPageConfigGlobalCumulative<HookArg = GlobalContextPrepareMinimum>(pageConfigGlobal: PageConfigGlobalRuntime, hookName: HookNameGlobal): Hook<HookArg>[];
 declare function getHookTimeoutDefault(hookName: HookNameOld): HookTimeout;
 declare function getHook_setIsPrerenderering(): void;

package/dist/esm/shared/route/abort.d.ts

@@ -12,6 +12,7 @@ export type { AbortStatusCode };
 export type { ErrorAbort };
 export type { PageContextFromRewrite };
 export type { UrlRedirect };
+export type { PageContextAbort };
 type RedirectStatusCode = number & Parameters<typeof redirect>[1];
 type AbortStatusCode = number & Parameters<InferTwoOverloads<typeof render>[0]>[0];
 type UrlRedirect = {

package/dist/esm/shared/route/abort.js

@@ -26,7 +26,11 @@ function redirect(url, statusCode) {
         statusCode = 302;
     }
     else {
-        if (!globalThis.__VIKE__IS_CLIENT || globalThis.__VIKE__IS_DEV) {
+        if (
+        // Tree-shaking to save client-side KBs
+        !globalThis.__VIKE__IS_CLIENT ||
+            globalThis.__VIKE__IS_DEV ||
+            globalThis.__VIKE__IS_DEBUG) {
             assertStatusCode(statusCode, [301, 302], 'redirect');
         }
         args.push(String(statusCode));
@@ -69,7 +73,11 @@ function render_(urlOrStatusCode, abortReason, abortCall, abortCaller, pageConte
         return AbortRender(pageContextAbort);
     }
     else {
-        if (!globalThis.__VIKE__IS_CLIENT || globalThis.__VIKE__IS_DEV) {
+        if (
+        // Tree-shaking to save client-side KBs
+        !globalThis.__VIKE__IS_CLIENT ||
+            globalThis.__VIKE__IS_DEV ||
+            globalThis.__VIKE__IS_DEBUG) {
             assertStatusCode(urlOrStatusCode, [401, 403, 404, 410, 429, 500, 503], 'render');
         }
         const abortStatusCode = urlOrStatusCode;
@@ -136,8 +144,8 @@ function logAbortErrorHandled(err, isProduction, pageContext) {
     });
 }
 function assertStatusCode(statusCode, expected, caller) {
-    assert(!globalThis.__VIKE__IS_CLIENT || globalThis.__VIKE__IS_DEV); // save client-side KBs
-    // double check vike:pluginReplaceGlobalThisConstants
+    assert(!globalThis.__VIKE__IS_CLIENT || globalThis.__VIKE__IS_DEV || globalThis.__VIKE__IS_DEBUG); // assert tree-shaking
+    // double check vike:pluginReplaceConstantsGlobalThis
     if (globalThis.__VIKE__IS_CLIENT) {
         assert(isBrowser());
         assert(typeof globalThis.__VIKE__IS_DEV === 'boolean');

package/dist/esm/shared/route/index.js

@@ -5,17 +5,21 @@ import { isBrowser } from '../../utils/isBrowser.js';
 if (isBrowser()) {
     assertClientRouting();
 }
-import { assert, assertUsage, isPlainObject, objectAssign } from './utils.js';
+import { assert, assertUsage, isPlainObject, objectAssign, debug } from './utils.js';
 import { resolvePrecedence } from './resolvePrecedence.js';
 import { resolveRouteString } from './resolveRouteString.js';
 import { resolveRouteFunction } from './resolveRouteFunction.js';
 import { execHookOnBeforeRoute } from './execHookOnBeforeRoute.js';
-import { debug } from './debug.js';
 import pc from '@brillout/picocolors';
 // TO-DO/next-major-release: make it sync
 async function route(pageContext, skipOnBeforeRouteHook) {
-    debug('Pages routes:', pageContext._globalContext._pageRoutes);
     const pageContextFromRoute = {};
+    if (
+    // Tree-shaking to save client-side KBs
+    !globalThis.__VIKE__IS_CLIENT ||
+        globalThis.__VIKE__IS_DEBUG) {
+        debug('vike:routing', 'Pages routes:', pageContext._globalContext._pageRoutes);
+    }
     // onBeforeRoute()
     if (!skipOnBeforeRouteHook) {
         const pageContextFromOnBeforeRouteHook = await execHookOnBeforeRoute(pageContext);
@@ -80,7 +84,12 @@ async function route(pageContext, skipOnBeforeRouteHook) {
     }));
     resolvePrecedence(routeMatches);
     const winner = routeMatches[0] ?? null;
-    debug(`Route matches for URL ${pc.cyan(urlPathname)} (in precedence order):`, routeMatches);
+    if (
+    // Tree-shaking to save client-side KBs
+    !globalThis.__VIKE__IS_CLIENT ||
+        globalThis.__VIKE__IS_DEBUG) {
+        debug('vike:routing', `Route matches for URL ${pc.cyan(urlPathname)} (in precedence order):`, routeMatches);
+    }
     // For vite-plugin-vercel https://github.com/magne4000/vite-plugin-vercel/blob/main/packages/vike-integration/vike.ts#L173
     objectAssign(pageContextFromRoute, { _routeMatch: winner });
     if (!winner) {

package/dist/esm/shared/route/utils.d.ts

@@ -13,3 +13,4 @@ export * from '../../utils/checkType.js';
 export * from '../../utils/joinEnglish.js';
 export * from '../../utils/truncateString.js';
 export * from '../../utils/isCallable.js';
+export * from '../../utils/debug.js';

package/dist/esm/shared/route/utils.js

@@ -22,3 +22,4 @@ export * from '../../utils/checkType.js';
 export * from '../../utils/joinEnglish.js';
 export * from '../../utils/truncateString.js';
 export * from '../../utils/isCallable.js';
+export * from '../../utils/debug.js';

package/dist/esm/types/Config.d.ts

@@ -48,9 +48,9 @@ import type { PassToClientPublic } from '../node/runtime/renderPage/html/seriali
 type HookNameOld = HookName | HookNameOldDesign;
 type HookName = HookNamePage | HookNameGlobal;
 type HookNamePage = 'onHydrationEnd' | 'onBeforePrerenderStart' | 'onBeforeRender' | 'onPageTransitionStart' | 'onPageTransitionEnd' | 'onRenderHtml' | 'onRenderClient' | 'guard' | 'data' | 'onData' | 'route';
-type HookNameGlobal = 'onBeforeRoute' | 'onPrerenderStart' | 'onCreatePageContext' | 'onCreateGlobalContext';
+type HookNameGlobal = 'onBeforeRoute' | 'onPrerenderStart' | 'onCreatePageContext' | 'onCreateGlobalContext' | 'onError';
 type HookNameOldDesign = 'render' | 'prerender' | 'onBeforePrerender';
-type ConfigNameBuiltIn = Exclude<keyof ConfigBuiltIn, keyof VikeVitePluginOptions | 'onBeforeRoute' | 'onPrerenderStart' | 'vite' | 'redirects'> | 'prerender' | 'serverOnlyHooks' | 'isClientRuntimeLoaded' | 'onBeforeRenderEnv' | 'dataEnv' | 'hooksTimeout' | 'clientHooks' | 'middleware';
+type ConfigNameBuiltIn = Exclude<keyof ConfigBuiltIn, keyof VikeVitePluginOptions | 'onBeforeRoute' | 'onPrerenderStart' | 'vite' | 'redirects'> | 'prerender' | 'hasServerOnlyHook' | 'isClientRuntimeLoaded' | 'onBeforeRenderEnv' | 'dataEnv' | '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 https://vike.dev/data */
@@ -268,7 +268,7 @@ type ConfigBuiltIn = {
      *
      * https://vike.dev/extends
      */
-    extends?: Config | Config[] | ImportString | ImportString[];
+    extends?: Config | ImportString | (Config | ImportString)[];
     /** Hook called before the page is rendered.
      *
      *  https://vike.dev/onBeforeRender
@@ -279,6 +279,11 @@ type ConfigBuiltIn = {
      *  https://vike.dev/onCreatePageContext
      */
     onCreatePageContext?: ((pageContext: PageContextServer) => void) | ImportString | null;
+    /** Hook called when an error occurs during server-side rendering.
+     *
+     *  https://vike.dev/onError
+     */
+    onError?: ((error: unknown) => void) | ImportString | null;
     /** Hook called when the `globalContext` object is created.
      *
      *  https://vike.dev/onCreateGlobalContext
@@ -468,6 +473,12 @@ type ConfigBuiltIn = {
      * https://vike.dev/mode
      */
     mode?: string;
+    /**
+     * Disable Vite's cache.
+     *
+     * https://vike.dev/force
+     */
+    force?: boolean;
     /**
      * Content Security Policy (CSP).
      *

package/dist/esm/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.240";
+export declare const PROJECT_VERSION: "0.4.241-commit-60b0676";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.240';
+export const PROJECT_VERSION = '0.4.241-commit-60b0676';

package/dist/esm/utils/assert.js

@@ -32,6 +32,7 @@ const projectTag = `[vike]`;
 const projectTagWithVersion = `[vike@${PROJECT_VERSION}]`;
 const bugTag = 'Bug';
 const numberOfStackTraceLinesToRemove = 2;
+// @__NO_SIDE_EFFECTS__
 function assert(condition, debugInfo) {
     if (condition)
         return;

package/dist/esm/utils/assertNodeVersion.js

@@ -1,7 +1,7 @@
 export { assertNodeVersion };
 import { isNodeJS } from './isNodeJS.js';
 import { assertVersion } from './assertVersion.js';
-// node_modules/vike/package.json#engines.node isn't enough as users can ignore it
+// node_modules/vike/package.json#engines.node isn't enough, as users often ignore it
 function assertNodeVersion() {
     if (!isNodeJS())
         return;

package/dist/esm/utils/assertViteVersion.d.ts

@@ -0,0 +1,2 @@
+export { assertViteVersion };
+declare function assertViteVersion(viteVersion: string): void;

package/dist/esm/utils/assertViteVersion.js

@@ -0,0 +1,11 @@
+export { assertViteVersion };
+import { assertVersion } from './assertVersion.js';
+// node_modules/vike/package.json#peerDependencies isn't enough, as users often ignore it
+function assertViteVersion(viteVersion) {
+    // - This assertion isn't reliable: the user may still use a Vite version older than 6.0.0 — see https://github.com/vitejs/vite/pull/19355
+    //   - TO-DO/eventually: let's also use this.meta.viteVersion
+    //     - this.meta.viteVersion was released in vite@7.0.0 => let's use it only after Vike requires a Vite version above 7.0.0
+    //     - https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md#700-2025-06-24
+    //     - https://github.com/vitejs/vite/pull/20088
+    assertVersion('Vite', viteVersion, ['6.3.0']);
+}

package/dist/esm/utils/debug.d.ts

@@ -1,9 +1,9 @@
+export { debug };
 export { createDebugger };
+export { isDebug };
 export { isDebugActivated };
-export type { Debug };
-declare const flags: readonly ["vike:crawl", "vike:error", "vike:esbuild-resolve", "vike:pluginExtractAssets", "vike:pluginExtractExportNames", "vike:glob", "vike:globalContext", "vike:log", "vike:optimizeDeps", "vike:outDir", "vike:pageFiles", "vike:pointer-imports", "vike:resolve", "vike:routing", "vike:setup", "vike:stream", "vike:virtualFiles", "vike:vite-rpc"];
+declare const flags: ["vike", "vike:crawl", "vike:error", "vike:esbuild-resolve", "vike:pluginExtractAssets", "vike:pluginExtractExportNames", "vike:glob", "vike:globalContext", "vike:log", "vike:optimizeDeps", "vike:outDir", "vike:pageFiles", "vike:pointer-imports", "vike:requireResolve", "vike:routing", "vike:setup", "vike:stream", "vike:virtualFiles", "vike:vite-rpc"];
 type Flag = (typeof flags)[number];
-type Debug = ReturnType<typeof createDebugger>;
 type Options = {
     serialization?: {
         emptyArray?: string;
@@ -13,4 +13,6 @@ declare function createDebugger(flag: Flag, optionsGlobal?: Options): ((...msgs:
     options: (optionsLocal: Options) => (...msgs: unknown[]) => void;
     isActivated: boolean;
 };
+declare function debug(flag: Flag, ...msgs: unknown[]): void;
 declare function isDebugActivated(flag: Flag): boolean;
+declare function isDebug(): boolean;

package/dist/esm/utils/debug.js

@@ -1,18 +1,21 @@
+export { debug };
 export { createDebugger };
+export { isDebug };
 export { isDebugActivated };
 import { isCallable } from './isCallable.js';
 import { objectAssign } from './objectAssign.js';
 import { assert, assertUsage } from './assert.js';
-import { checkType } from './checkType.js';
 import { getTerminalWidth } from './getTerminalWidth.js';
 import pc from '@brillout/picocolors';
 import { isArray } from './isArray.js';
 import { isObject } from './isObject.js';
-import { setCreateDebugger } from '../shared/route/debug.js';
-import { assertIsNotBrowser } from './assertIsNotBrowser.js';
-assertIsNotBrowser();
-setCreateDebugger(createDebugger); // for isomorphic code
+// Assert tree-shaking (ensure this module is loaded on the client-side only if debug is enabled).
+assert(!globalThis.__VIKE__IS_CLIENT ||
+    globalThis.__VIKE__IS_DEBUG ||
+    // Vite doesn't do tree-shaking in dev (maybe it will with Rolldown?)
+    import.meta.env.DEV);
 const flags = [
+    'vike',
     'vike:crawl',
     'vike:error',
     'vike:esbuild-resolve',
@@ -25,7 +28,7 @@ const flags = [
     'vike:outDir',
     'vike:pageFiles',
     'vike:pointer-imports',
-    'vike:resolve',
+    'vike:requireResolve',
     'vike:routing',
     'vike:setup',
     'vike:stream',
@@ -33,14 +36,12 @@ const flags = [
     'vike:vite-rpc',
 ];
 const flagsSkipWildcard = ['vike:log'];
-const flagRegex = /\bvike:[a-zA-Z-]+/g;
 // We purposely read process.env.DEBUG early, in order to avoid users from the temptation to set process.env.DEBUG with JavaScript, since reading & writing process.env.DEBUG dynamically leads to inconsistencies such as https://github.com/vikejs/vike/issues/2239
 const DEBUG = getDEBUG() ?? '';
 if (isDebug())
     Error.stackTraceLimit = Infinity;
 assertFlagsActivated();
 function createDebugger(flag, optionsGlobal) {
-    checkType(flag);
     assert(flags.includes(flag));
     const debugWithOptions = (optionsLocal) => {
         return (...msgs) => {
@@ -52,6 +53,9 @@ function createDebugger(flag, optionsGlobal) {
     objectAssign(debug, { options: debugWithOptions, isActivated: isDebugActivated(flag) });
     return debug;
 }
+function debug(flag, ...msgs) {
+    return debug_(flag, {}, ...msgs);
+}
 function debug_(flag, options, ...msgs) {
     if (!isDebugActivated(flag))
         return;
@@ -80,10 +84,9 @@ function debug_(flag, options, ...msgs) {
     });
 }
 function isDebugActivated(flag) {
-    checkType(flag);
     assert(flags.includes(flag));
-    const { flagsActivated, all } = getFlagsActivated();
-    const isActivated = flagsActivated.includes(flag) || (all && !flagsSkipWildcard.includes(flag));
+    const { flagsActivated, isAll } = getFlagsActivated();
+    const isActivated = flagsActivated.includes(flag) || (isAll && !flagsSkipWildcard.includes(flag));
     return isActivated;
 }
 function formatMsg(info, options, padding, position) {
@@ -153,13 +156,14 @@ function assertFlagsActivated() {
     });
 }
 function getFlagsActivated() {
-    const flagsActivated = DEBUG.match(flagRegex) ?? [];
-    const all = DEBUG.includes('vike:*');
-    return { flagsActivated, all };
+    const flagsActivated = DEBUG.match(/\bvike:[a-zA-Z-]+/g) ?? [];
+    const isAll = DEBUG.includes('vike:*');
+    const isGlobal = /\bvike\b([^:]|$)/.test(DEBUG);
+    return { flagsActivated, isAll, isGlobal };
 }
 function isDebug() {
-    const { flagsActivated, all } = getFlagsActivated();
-    return all || flagsActivated.length > 0;
+    const { flagsActivated, isAll, isGlobal } = getFlagsActivated();
+    return isAll || flagsActivated.length > 0 || isGlobal;
 }
 function getDEBUG() {
     let DEBUG;

package/dist/esm/utils/getGlobalObject.d.ts

@@ -1,7 +1,11 @@
 export { getGlobalObject };
 import type { VikeGlobalInternal } from '../types/VikeGlobalInternal.js';
 type ModuleId = `${string}.ts`;
-/** Share information across module instances. */
+/**
+ * Share information across module instances.
+ *
+ * @__NO_SIDE_EFFECTS__
+ */
 declare function getGlobalObject<T extends Record<string, unknown> = never>(moduleId: ModuleId, defaultValue: T): T;
 declare global {
     var _vike: VikeGlobalInternal;

package/dist/esm/utils/getGlobalObject.js

@@ -1,5 +1,9 @@
 export { getGlobalObject };
-/** Share information across module instances. */
+/**
+ * Share information across module instances.
+ *
+ * @__NO_SIDE_EFFECTS__
+ */
 function getGlobalObject(moduleId, defaultValue) {
     const globals = getGlobals();
     const globalObject = (globals[moduleId] ?? (globals[moduleId] = defaultValue));

package/dist/esm/utils/isExactlyOneTruthy.d.ts

@@ -0,0 +1 @@
+export declare function isExactlyOneTruthy(...values: unknown[]): boolean;

package/dist/esm/utils/isExactlyOneTruthy.js

@@ -0,0 +1,4 @@
+// Aka XOR
+export function isExactlyOneTruthy(...values) {
+    return values.filter(Boolean).length === 1;
+}

package/dist/esm/utils/isVikeReactApp.js

@@ -1,5 +1,6 @@
 export function isVikeReactApp() {
     const g = globalThis;
-    // Set by vike-react https://github.com/vikejs/vike-react/blob/23e92434424f10e7e742b6bf587edee5aa8832df/packages/vike-react/src/renderer/onRenderHtml.tsx#L75
+    // Set by vike-react
+    // https://github.com/vikejs/vike-react/blob/23e92434424f10e7e742b6bf587edee5aa8832df/packages/vike-react/src/renderer/onRenderHtml.tsx#L75
     return !!g._isVikeReactApp;
 }

package/dist/esm/utils/requireResolve.js

@@ -17,7 +17,7 @@ const importMetaUrl = import.meta.url;
 assertPosixPath(importMetaUrl);
 assertIsNotBrowser();
 assertIsNotProductionRuntime();
-const debug = createDebugger('vike:resolve');
+const debug = createDebugger('vike:requireResolve');
 // - We still can't use import.meta.resolve() as of 23.1.0 (November 2024) because `parent` argument requires an experimental flag.
 //   - https://stackoverflow.com/questions/54977743/do-require-resolve-for-es-modules#comment139581675_62272600
 // - Passing context to createRequire(context) isn't equivalent to passing it to the `paths` argument of require.resolve()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.240",
+  "version": "0.4.241-commit-60b0676",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -114,7 +114,7 @@
   },
   "dependencies": {
     "@brillout/import": "^0.2.6",
-    "@brillout/json-serializer": "^0.5.20",
+    "@brillout/json-serializer": "^0.5.21",
     "@brillout/picocolors": "^1.0.26",
     "@brillout/require-shim": "^0.1.2",
     "@brillout/vite-plugin-server-entry": "^0.7.15",
@@ -247,7 +247,7 @@
     "@types/source-map-support": "^0.5.10",
     "react-streaming": "^0.4.3",
     "rimraf": "^5.0.5",
-    "typescript": "^5.8.3",
+    "typescript": "^5.9.2",
     "vite": "^7.1.5"
   },
   "scripts": {

package/dist/esm/node/vite/plugins/pluginEnvVars.d.ts

@@ -1,3 +0,0 @@
-export { pluginEnvVars };
-import type { Plugin } from 'vite';
-declare function pluginEnvVars(): Plugin[];

package/dist/esm/node/vite/plugins/pluginEnvVars.js

@@ -1,110 +0,0 @@
-export { pluginEnvVars };
-import { loadEnv } from 'vite';
-import { assert, assertPosixPath, assertUsage, assertWarning, escapeRegex, isArray, isNotNullish, lowerFirst, } from '../utils.js';
-import { getModuleFilePathAbsolute } from '../shared/getFilePath.js';
-import { normalizeId } from '../shared/normalizeId.js';
-import { isViteServerSide_extraSafe } from '../shared/isViteServerSide.js';
-import { getMagicString } from '../shared/getMagicString.js';
-// TO-DO/eventually:
-// - Make import.meta.env work inside +config.js
-//   - For it to work, we'll probably need the user to define the settings (e.g. `envDir`) for loadEnv() inside vike.config.js instead of vite.config.js
-//   - Or stop using Vite's `mode` implementation and have Vike implement its own `mode` feature? (So that the only dependencies are `$ vike build --mode staging` and `$ MODE=staging vike build`.)
-const PUBLIC_ENV_PREFIX = 'PUBLIC_ENV__';
-const PUBLIC_ENV_ALLOWLIST = [
-    // https://github.com/vikejs/vike/issues/1724
-    'STORYBOOK',
-];
-const skipNodeModules = '/node_modules/';
-const skipIrrelevant = 'import.meta.env.';
-const filterRolldown = {
-    id: {
-        exclude: `**${skipNodeModules}**`,
-    },
-    code: {
-        include: skipIrrelevant,
-    },
-};
-const filterFunction = (id, code) => {
-    if (id.includes(skipNodeModules))
-        return false;
-    if (!code.includes(skipIrrelevant))
-        return false;
-    return true;
-};
-function pluginEnvVars() {
-    let envsAll;
-    let config;
-    return [
-        {
-            name: 'vike:pluginEnvVars',
-            enforce: 'post',
-            configResolved: {
-                handler(config_) {
-                    config = config_;
-                    envsAll = loadEnv(config.mode, config.envDir || config.root, '');
-                    config.plugins.sort(lowerFirst((plugin) => (plugin.name === 'vite:define' ? 1 : 0)));
-                },
-            },
-            transform: {
-                filter: filterRolldown,
-                handler(code, id, options) {
-                    id = normalizeId(id);
-                    assertPosixPath(id);
-                    assertPosixPath(config.root);
-                    if (!id.startsWith(config.root))
-                        return; // skip linked dependencies
-                    assert(filterFunction(id, code));
-                    const isBuild = config.command === 'build';
-                    const isClientSide = !isViteServerSide_extraSafe(config, this.environment, options);
-                    const { magicString, getMagicStringResult } = getMagicString(code, id);
-                    // Find & check
-                    const replacements = Object.entries(envsAll)
-                        .filter(([key]) => {
-                        // Already handled by Vite
-                        const envPrefix = !config.envPrefix
-                            ? []
-                            : isArray(config.envPrefix)
-                                ? config.envPrefix
-                                : [config.envPrefix];
-                        return !envPrefix.some((prefix) => key.startsWith(prefix));
-                    })
-                        .map(([envName, envVal]) => {
-                        const envStatement = `import.meta.env.${envName}`;
-                        const envStatementRegExpStr = escapeRegex(envStatement) + '\\b';
-                        // Security check
-                        {
-                            const isPrivate = !envName.startsWith(PUBLIC_ENV_PREFIX) && !PUBLIC_ENV_ALLOWLIST.includes(envName);
-                            if (isPrivate && isClientSide) {
-                                if (!new RegExp(envStatementRegExpStr).test(code))
-                                    return;
-                                const modulePath = getModuleFilePathAbsolute(id, config);
-                                const errMsgAddendum = isBuild
-                                    ? ''
-                                    : ' (Vike will prevent your app from building for production)';
-                                const keyPublic = `${PUBLIC_ENV_PREFIX}${envName}`;
-                                const errMsg = `${envStatement} is used in client-side file ${modulePath} which means that the environment variable ${envName} will be included in client-side bundles and, therefore, ${envName} will be publicly exposed which can be a security leak${errMsgAddendum}. Use ${envStatement} only in server-side files, or rename ${envName} to ${keyPublic}, see https://vike.dev/env`;
-                                if (isBuild) {
-                                    assertUsage(false, errMsg);
-                                }
-                                else {
-                                    // - Only a warning for faster development DX (e.g. when user toggles `ssr: boolean` or `onBeforeRenderIsomorph: boolean`).
-                                    // - But only showing a warning can be confusing: https://github.com/vikejs/vike/issues/1641
-                                    assertWarning(false, errMsg, { onlyOnce: true });
-                                }
-                            }
-                            // Double check
-                            assert(!(isPrivate && isClientSide) || !isBuild);
-                        }
-                        return { regExpStr: envStatementRegExpStr, replacement: envVal };
-                    })
-                        .filter(isNotNullish);
-                    // Apply
-                    replacements.forEach(({ regExpStr, replacement }) => {
-                        magicString.replaceAll(new RegExp(regExpStr, 'g'), JSON.stringify(replacement));
-                    });
-                    return getMagicStringResult();
-                },
-            },
-        },
-    ];
-}

package/dist/esm/node/vite/plugins/pluginReplaceGlobalThisConstants.d.ts

@@ -1,9 +0,0 @@
-export { pluginReplaceGlobalThisConstants };
-import type { Plugin } from 'vite';
-declare global {
-    /** Like `import.meta.env.DEV` but works inside `node_modules/` (even if package is `ssr.external`). The value `undefined` is to be interpreted as `false`. */
-    var __VIKE__IS_DEV: boolean | undefined;
-    /** Like `import.meta.env.SSR` but works inside `node_modules/` (even if package is `ssr.external`). The value `undefined` is to be interpreted as `false`. */
-    var __VIKE__IS_CLIENT: boolean | undefined;
-}
-declare function pluginReplaceGlobalThisConstants(): Plugin[];

package/dist/esm/node/vite/plugins/pluginReplaceGlobalThisConstants.js

@@ -1,45 +0,0 @@
-export { pluginReplaceGlobalThisConstants };
-import { assert } from '../utils.js';
-// === Explanation: globalThis.__VIKE__IS_DEV
-// If client-side => always noExternal => globalThis.__VIKE__IS_DEV is set by the `define` config below.
-// If server-side:
-//   If ssr.noExternal => globalThis.__VIKE__IS_DEV is set by the `define` config below.
-//   If `ssr.external`:
-//     If not RunnableDevEnvironment (e.g. `@cloudflare/vite-plugin`) => always ssr.noExternal => globalThis.__VIKE__IS_DEV is set by the `define` config below.
-//     If RunnableDevEnvironment (the default setup):
-//       If dev/preview/pre-rendering => Vite is loaded, and server and Vite run inside the same process (because RunnableDevEnvironment) => globalThis.__VIKE__IS_DEV is set by the assignment below.
-//       If production => Vite isn't loaded => globalThis.__VIKE__IS_DEV is `undefined` (it's never set) => value `undefined` is to be interpreted as `false`.
-// === Explanation: globalThis.__VIKE__IS_CLIENT
-// If client-side => always noExternal => globalThis.__VIKE__IS_CLIENT is set to `true` by the `define` config below.
-// If server-side => globalThis.__VIKE__IS_CLIENT is either `false` or `undefined` (the value `undefined` is to be interpreted as `false`).
-globalThis.__VIKE__IS_CLIENT = false;
-function pluginReplaceGlobalThisConstants() {
-    return [
-        {
-            name: 'vike:pluginReplaceGlobalThisConstants',
-            config: {
-                handler(config) {
-                    const isDev = config._isDev;
-                    assert(typeof isDev === 'boolean');
-                    globalThis.__VIKE__IS_DEV = isDev;
-                    return {
-                        define: {
-                            'globalThis.__VIKE__IS_DEV': JSON.stringify(isDev),
-                        },
-                    };
-                },
-            },
-            configEnvironment: {
-                handler(name, config) {
-                    const consumer = config.consumer ?? (name === 'client' ? 'client' : 'server');
-                    const isClientSide = consumer === 'client';
-                    return {
-                        define: {
-                            'globalThis.__VIKE__IS_CLIENT': JSON.stringify(isClientSide),
-                        },
-                    };
-                },
-            },
-        },
-    ];
-}

package/dist/esm/node/vite/plugins/pluginReplaceIsClientSide.d.ts

@@ -1,3 +0,0 @@
-export { pluginReplaceIsClientSide };
-import type { Plugin } from 'vite';
-declare function pluginReplaceIsClientSide(): Plugin[];