vike 0.4.236-commit-eab75f6 → 0.4.237-commit-85e89b1

package/dist/esm/shared/page-configs/serialize/serializeConfigValues.js

@@ -7,19 +7,19 @@ import { parsePointerImportData } from '../../../node/vite/shared/resolveVikeCon
 import { getConfigValueFilePathToShowToUser } from '../helpers.js';
 import { stringify } from '@brillout/json-serializer/stringify';
 import pc from '@brillout/picocolors';
-import { isOverridden } from '../../../node/vite/shared/resolveVikeConfigInternal.js';
+import { getConfigValueSourcesRelevant, isRuntimeEnvMatch, } from '../../../node/vite/plugins/pluginVirtualFiles/getConfigValueSourcesRelevant.js';
 const stringifyOptions = { forbidReactElements: true };
 const REPLACE_ME_BEFORE = '__VIKE__REPLACE_ME_BEFORE__';
 const REPLACE_ME_AFTER = '__VIKE__REPLACE_ME_AFTER__';
-// This file is never loaded on the client-side but we save it under the vike/shared/ directory in order to collocate it with parsePageConfigs()
-// - vike/shared/page-configs/serialize/parsePageConfigs.ts
-// - parsePageConfigs() is loaded on both the client- and server-side.
+// This file is never loaded on the client-side but we save it under the vike/shared/ directory in order to collocate it with parsePageConfigsSerialized()
+// - vike/shared/page-configs/serialize/parsePageConfigsSerialized.ts
+// - parsePageConfigsSerialized() is loaded on both the client- and server-side.
 assertIsNotBrowser();
 assertIsNotProductionRuntime();
-function serializeConfigValues(pageConfig, importStatements, filesEnv, isEnvMatch, tabspace, isEager) {
+function serializeConfigValues(pageConfig, importStatements, filesEnv, runtimeEnv, tabspace, isEager) {
     const lines = [];
     tabspace += '  ';
-    getConfigValuesBase(pageConfig, isEnvMatch, isEager).forEach((entry) => {
+    getConfigValuesBase(pageConfig, runtimeEnv, isEager).forEach((entry) => {
         if (entry.configValueBase.type === 'computed') {
             assert('value' in entry); // Help TS
             const { configValueBase, value, configName, configEnv } = entry;
@@ -176,12 +176,12 @@ function logJsonSerializeError(err, configName, definedAtData) {
     assert(configValueFilePathToShowToUser);
     assertUsage(false, `${pc.cyan(configName)} defined by ${configValueFilePathToShowToUser} must be defined using a separate file ${pc.bold(`+${configName}.js`)}, see https://vike.dev/error/runtime-in-config`);
 }
-function getConfigValuesBase(pageConfig, isEnvMatch, isEager) {
+function getConfigValuesBase(pageConfig, runtimeEnv, isEager) {
     const fromComputed = Object.entries(pageConfig.configValuesComputed ?? {}).map(([configName, valueInfo]) => {
         const { configEnv, value } = valueInfo;
-        if (!isEnvMatch(configEnv))
+        if (!isRuntimeEnvMatch(configEnv, runtimeEnv))
             return 'SKIP';
-        // Is there a use case for overriding computed values? If yes, then configValeSources has higher precedence
+        // AFAICT this should never happen: I ain't aware of a use case for overriding computed values. If there is a use case, then configValueSources has higher precedence.
         if (pageConfig.configValueSources[configName])
             return 'SKIP';
         const configValueBase = {
@@ -190,16 +190,17 @@ function getConfigValuesBase(pageConfig, isEnvMatch, isEager) {
         };
         return { configValueBase, value, configName, configEnv };
     });
-    const fromSources = Object.entries(pageConfig.configValueSources).map(([configName, sources]) => {
+    const fromSources = Object.entries(pageConfig.configValueSources).map(([configName]) => {
         const configDef = pageConfig.configDefinitions[configName];
         assert(configDef);
         if (isEager !== null && isEager !== !!configDef.eager)
             return 'SKIP';
         if (!configDef.cumulative) {
-            const source = sources[0];
-            assert(source);
-            if (!isEnvMatch(source.configEnv))
+            const sourcesRelevant = getConfigValueSourcesRelevant(configName, runtimeEnv, pageConfig);
+            const source = sourcesRelevant[0];
+            if (!source)
                 return 'SKIP';
+            assert(sourcesRelevant.length === 1);
             const definedAtFile = getDefinedAtFileSource(source);
             const configValueBase = {
                 type: 'standard',
@@ -208,9 +209,7 @@ function getConfigValuesBase(pageConfig, isEnvMatch, isEager) {
             return { configValueBase, sourceRelevant: source, configName };
         }
         else {
-            const sourcesRelevant = sources
-                .filter((source) => !isOverridden(source, configName, pageConfig))
-                .filter((source) => isEnvMatch(source.configEnv));
+            const sourcesRelevant = getConfigValueSourcesRelevant(configName, runtimeEnv, pageConfig);
             if (sourcesRelevant.length === 0)
                 return 'SKIP';
             const definedAtData = [];

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

@@ -25,3 +25,5 @@ export * from '../utils/objectDefineProperty.js';
 export * from '../utils/isScriptFile.js';
 export * from '../utils/objectFilter.js';
 export * from '../utils/getPropAccessNotation.js';
+export * from '../utils/getGlobalObject.js';
+export * from '../utils/genPromise.js';

package/dist/esm/shared/utils.js

@@ -29,3 +29,5 @@ export * from '../utils/objectDefineProperty.js';
 export * from '../utils/isScriptFile.js';
 export * from '../utils/objectFilter.js';
 export * from '../utils/getPropAccessNotation.js';
+export * from '../utils/getGlobalObject.js';
+export * from '../utils/genPromise.js';

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

@@ -9,6 +9,8 @@ export type { HookNameOld };
 export type { HookNamePage };
 export type { HookNameGlobal };
 export type { ImportString };
+export type { Route };
+export type { KeepScrollPosition };
 export type { DataAsync };
 export type { DataSync };
 export type { GuardAsync };
@@ -33,8 +35,6 @@ export type { OnRenderHtmlAsync };
 export type { OnRenderHtmlSync };
 export type { RouteAsync };
 export type { RouteSync };
-export type { Route };
-export type { KeepScrollPosition };
 import type { PrefetchSetting, PrefetchStaticAssets } from '../client/runtime-client-routing/prefetch/PrefetchSetting.js';
 import type { ConfigDefinition } from '../node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js';
 import type { DocumentHtml } from '../node/runtime/html/renderHtml.js';
@@ -44,73 +44,46 @@ import type { Vike, VikePackages } from './VikeNamespace.js';
 import type { HooksTimeoutProvidedByUser } from '../shared/hooks/getHook.js';
 import type { GlobalContext, PageContextClient, PageContextServer } from './PageContext.js';
 import type { InlineConfig } from 'vite';
-import type { PassToClient } from '../node/runtime/html/serializeContext.js';
+import type { PassToClientPublic } from '../node/runtime/html/serializeContext.js';
 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 HookNameOldDesign = 'render' | 'prerender' | 'onBeforePrerender';
-type ConfigNameBuiltIn = Exclude<keyof Config, keyof VikeVitePluginOptions | 'onBeforeRoute' | 'onPrerenderStart' | 'vite' | 'redirects'> | 'prerender' | 'isClientRuntimeLoaded' | 'onBeforeRenderEnv' | 'dataEnv' | 'hooksTimeout' | 'clientHooks' | 'middleware';
+type ConfigNameBuiltIn = Exclude<keyof ConfigBuiltIn, keyof VikeVitePluginOptions | 'onBeforeRoute' | 'onPrerenderStart' | 'vite' | 'redirects'> | 'prerender' | 'serverOnlyHooks' | 'isClientRuntimeLoaded' | 'onBeforeRenderEnv' | 'dataEnv' | 'hooksTimeout' | 'clientHooks' | 'middleware';
 type ConfigNameGlobal = 'onPrerenderStart' | 'onBeforeRoute' | 'prerender' | 'disableAutoFullBuild' | 'includeAssetsImportedByServer' | 'baseAssets' | 'baseServer' | 'redirects' | 'trailingSlash' | 'disableUrlNormalization' | 'vite';
 type Config = ConfigBuiltIn & Vike.Config & (VikePackages.ConfigVikeReact | VikePackages.ConfigVikeVue | VikePackages.ConfigVikeSolid | VikePackages.ConfigVikeSvelte | VikePackages.ConfigVikeAngular);
-/** Hook for fetching data.
- *
- *  https://vike.dev/data
- */
+/** @deprecated This type is deprecated, see https://vike.dev/data */
 type DataAsync<Data = unknown> = (pageContext: PageContextServer) => Promise<Data>;
-/** Hook for fetching data.
- *
- *  https://vike.dev/data
- */
+/** @deprecated This type is deprecated, see https://vike.dev/data */
 type DataSync<Data = unknown> = (pageContext: PageContextServer) => Data;
-/** Protect page(s), e.g. forbid unauthorized access.
- *
- *  https://vike.dev/guard
- */
+/** @deprecated This type is deprecated, see https://vike.dev/guard */
 type GuardAsync = (pageContext: PageContextServer) => Promise<void>;
-/** Protect page(s), e.g. forbid unauthorized access.
- *
- *  https://vike.dev/guard
- */
+/** @deprecated This type is deprecated, see https://vike.dev/guard */
 type GuardSync = (pageContext: PageContextServer) => void;
-/** Global Hook called before the whole pre-rendering process starts.
- *
- * https://vike.dev/onBeforePrerenderStart
- */
+/** @deprecated This type is deprecated, see https://vike.dev/onBeforePrerenderStart */
 type OnBeforePrerenderStartAsync<Data = unknown> = () => Promise<(string | {
     url: string;
     pageContext: Partial<Vike.PageContext & {
         data: Data;
     }>;
 })[]>;
-/** Global Hook called before the whole pre-rendering process starts.
- *
- * https://vike.dev/onBeforePrerenderStart
- */
+/** @deprecated This type is deprecated, see https://vike.dev/onBeforePrerenderStart */
 type OnBeforePrerenderStartSync<Data = unknown> = () => (string | {
     url: string;
     pageContext: Partial<Vike.PageContext & {
         data: Data;
     }>;
 })[];
-/** Hook called before the page is rendered.
- *
- *  https://vike.dev/onBeforeRender
- */
+/** @deprecated This type is deprecated, see https://vike.dev/onBeforeRender */
 type OnBeforeRenderAsync = (pageContext: PageContextServer) => Promise<{
     pageContext: Partial<Vike.PageContext>;
 } | void>;
-/** Hook called before the page is rendered.
- *
- *  https://vike.dev/onBeforeRender
- */
+/** @deprecated This type is deprecated, see https://vike.dev/onBeforeRender */
 type OnBeforeRenderSync = (pageContext: PageContextServer) => {
     pageContext: Partial<Vike.PageContext>;
 } | void;
-/** Hook called before the URL is routed to a page.
- *
- * https://vike.dev/onBeforeRoute
- */
+/** @deprecated This type is deprecated, see https://vike.dev/onBeforeRoute */
 type OnBeforeRouteAsync = (pageContext: PageContextServer) => Promise<{
     pageContext: Partial<{
         /** The URL you provided to Vike when calling `renderPage({ urlOriginal })` in your server middleware.
@@ -120,10 +93,7 @@ type OnBeforeRouteAsync = (pageContext: PageContextServer) => Promise<{
         urlOriginal: string;
     } | Vike.PageContext>;
 }>;
-/** Hook called before the URL is routed to a page.
- *
- * https://vike.dev/onBeforeRoute
- */
+/** @deprecated This type is deprecated, see https://vike.dev/onBeforeRoute */
 type OnBeforeRouteSync = (pageContext: PageContextServer) => {
     pageContext: Partial<{
         /** The URL you provided to Vike when calling `renderPage({ urlOriginal })` in your server middleware.
@@ -133,40 +103,19 @@ type OnBeforeRouteSync = (pageContext: PageContextServer) => {
         urlOriginal: string;
     } | Vike.PageContext>;
 };
-/** Hook called after the page is hydrated.
- *
- * https://vike.dev/onHydrationEnd
- */
+/** @deprecated This type is deprecated, see https://vike.dev/onHydrationEnd */
 type OnHydrationEndAsync = (pageContext: PageContextClient) => Promise<void>;
-/** Hook called after the page is hydrated.
- *
- * https://vike.dev/onHydrationEnd
- */
+/** @deprecated This type is deprecated, see https://vike.dev/onHydrationEnd */
 type OnHydrationEndSync = (pageContext: PageContextClient) => void;
-/** Hook called after the user navigates to a new page.
- *
- * https://vike.dev/onPageTransitionEnd
- */
+/** @deprecated This type is deprecated, see https://vike.dev/onPageTransitionEnd */
 type OnPageTransitionEndAsync = (pageContext: PageContextClient) => Promise<void>;
-/** Hook called after the user navigates to a new page.
- *
- * https://vike.dev/onPageTransitionEnd
- */
+/** @deprecated This type is deprecated, see https://vike.dev/onPageTransitionEnd */
 type OnPageTransitionEndSync = (pageContext: PageContextClient) => void;
-/** Hook called before the user navigates to a new page.
- *
- * https://vike.dev/onPageTransitionStart
- */
+/** @deprecated This type is deprecated, see https://vike.dev/onPageTransitionStart */
 type OnPageTransitionStartAsync = (pageContext: PageContextClient) => Promise<void>;
-/** Hook called before the user navigates to a new page.
- *
- * https://vike.dev/onPageTransitionStart
- */
+/** @deprecated This type is deprecated, see https://vike.dev/onPageTransitionStart */
 type OnPageTransitionStartSync = (pageContext: PageContextClient) => void;
-/** Page Hook called when pre-rendering starts.
- *
- * https://vike.dev/onPrerenderStart
- */
+/** @deprecated This type is deprecated, see https://vike.dev/onPrerenderStart */
 type OnPrerenderStartAsync = (prerenderContext: {
     pageContexts: PageContextServer[];
 }) => Promise<{
@@ -174,10 +123,7 @@ type OnPrerenderStartAsync = (prerenderContext: {
         pageContexts: PageContextServer[];
     };
 }>;
-/** Page Hook called when pre-rendering starts.
- *
- * https://vike.dev/onPrerenderStart
- */
+/** @deprecated This type is deprecated, see https://vike.dev/onPrerenderStart */
 type OnPrerenderStartSync = (prerenderContext: {
     pageContexts: PageContextServer[];
 }) => {
@@ -185,25 +131,13 @@ type OnPrerenderStartSync = (prerenderContext: {
         pageContexts: PageContextServer[];
     };
 };
-/** Hook called when page is rendered on the client-side.
- *
- * https://vike.dev/onRenderClient
- */
+/** @deprecated This type is deprecated, see https://vike.dev/onRenderClient */
 type OnRenderClientAsync = (pageContext: PageContextClient) => Promise<void>;
-/** Hook called when page is rendered on the client-side.
- *
- * https://vike.dev/onRenderClient
- */
+/** @deprecated This type is deprecated, see https://vike.dev/onRenderClient */
 type OnRenderClientSync = (pageContext: PageContextClient) => void;
-/** Hook called when page is rendered to HTML on the server-side.
- *
- * https://vike.dev/onRenderHtml
- */
+/** @deprecated This type is deprecated, see https://vike.dev/onRenderHtml */
 type OnRenderHtmlAsync = (pageContext: PageContextServer) => Promise<OnRenderHtmlReturn>;
-/** Hook called when page is rendered to HTML on the server-side.
- *
- * https://vike.dev/onRenderHtml
- */
+/** @deprecated This type is deprecated, see https://vike.dev/onRenderHtml */
 type OnRenderHtmlSync = (pageContext: PageContextServer) => OnRenderHtmlReturn;
 type OnRenderHtmlReturn = DocumentHtml | {
     injectFilter?: (assets: InjectFilterEntry[]) => void;
@@ -219,20 +153,21 @@ type RouteAsync = (pageContext: PageContextServer | PageContextClient) => Promis
     routeParams?: Record<string, string>;
     precedence?: number;
 } | boolean>;
-/** The page's URL(s).
- *
- *  https://vike.dev/route
- */
+/** @deprecated This type is deprecated, see https://vike.dev/route */
 type RouteSync = (pageContext: PageContextServer | PageContextClient) => {
     routeParams?: Record<string, string>;
     precedence?: number;
 } | boolean;
-type Route = string | RouteSync | RouteAsync;
 /** Whether the page scrolls to the top upon navigation.
  *
  * https://vike.dev/keepScrollPosition
  */
 type KeepScrollPosition = boolean | string | string[] | ((pageContext: PageContextClient) => boolean | string | string[]);
+/** The page's route.
+ *
+ * https://vike.dev/routing
+ */
+type Route = string | RouteSync | RouteAsync;
 /** Page configuration.
  *
  * https://vike.dev/config
@@ -363,7 +298,7 @@ type ConfigBuiltIn = {
      *
      * https://vike.dev/passToClient
      */
-    passToClient?: PassToClient | ImportString;
+    passToClient?: PassToClientPublic | ImportString;
     /** Hook called when page is rendered on the client-side.
      *
      * https://vike.dev/onRenderClient

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

@@ -20,6 +20,7 @@ export type { DefinedAtFile };
 export type { DefinedAt };
 export type { DefinedBy };
 export type { DefinedAtFilePath };
+export type { VirtualFileExportsPageEntry };
 import type { ConfigValueSerialized } from '../shared/page-configs/serialize/PageConfigSerialized.js';
 import type { LocationId } from '../node/vite/shared/resolveVikeConfigInternal/filesystemRouting.js';
 import type { FilePath } from './FilePath.js';
@@ -43,7 +44,7 @@ type PageConfigRoute = {
 type PageConfigRuntime = PageConfigCommon & {
     configValues: ConfigValues;
     /** Load config values that are lazily loaded such as config.Page */
-    loadConfigLazy: LoadConfigLazy;
+    loadVirtualFilePageEntry: LoadVirtualFilePageEntry;
 };
 /** Global config that applies to all pages, runtime data structure */
 type PageConfigGlobalRuntime = {
@@ -64,14 +65,15 @@ type PageConfigGlobalBuildTime = {
 };
 /** Same as PageConfigRuntime but also contains all lazily loaded config values such as config.Page */
 type PageConfigRuntimeLoaded = PageConfigRuntime & {
-    /** Whether loadConfigLazy() was called */
-    isAllLoaded: true;
+    /** Whether loadVirtualFilePageEntry() was called */
+    isPageEntryLoaded: true;
 };
-type LoadConfigLazy = () => {
+type LoadVirtualFilePageEntry = () => {
     moduleId: string;
-    moduleExports: Promise<{
-        configValuesSerialized: Record<string, ConfigValueSerialized>;
-    }>;
+    moduleExportsPromise: Promise<VirtualFileExportsPageEntry>;
+};
+type VirtualFileExportsPageEntry = {
+    configValuesSerialized: Record<string, ConfigValueSerialized>;
 };
 /** In what environment(s) the config value is loaded.
  *

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

@@ -8,6 +8,7 @@ declare global {
          *  https://vike.dev/meta#typescript
          */
         interface Config {
+            _interfaceIsNotAny?: never;
         }
         /** Refine the `pageContext.config` type.
          *
@@ -16,42 +17,49 @@ declare global {
          *  https://vike.dev/meta#typescript
          */
         interface ConfigResolved {
+            _interfaceIsNotAny?: never;
         }
         /** Extend the `PageContext` type (`import type { PageContext } from 'vike/types'`).
          *
          *  https://vike.dev/pageContext#typescript
          */
         interface PageContext {
+            _interfaceIsNotAny?: never;
         }
         /** Extend the `PageContextClient` type (`import type { PageContextClient } from 'vike/types'`).
          *
          *  https://vike.dev/pageContext#typescript
          */
         interface PageContextClient {
+            _interfaceIsNotAny?: never;
         }
         /** Extend the `PageContextServer` type (`import type { PageContextServer } from 'vike/types'`).
          *
          *  https://vike.dev/pageContext#typescript
          */
         interface PageContextServer {
+            _interfaceIsNotAny?: never;
         }
         /** Extend the `GlobalContext` type (`import type { GlobalContext } from 'vike/types'`).
          *
          *  https://vike.dev/globalContext#typescript
          */
         interface GlobalContext {
+            _interfaceIsNotAny?: never;
         }
         /** Extend the `GlobalContextClient` type (`import type { GlobalContextClient } from 'vike/types'`).
          *
          *  https://vike.dev/globalContext#typescript
          */
         interface GlobalContextClient {
+            _interfaceIsNotAny?: never;
         }
         /** Extend the `GlobalContextServer` type (`import type { GlobalContextServer } from 'vike/types'`).
          *
          *  https://vike.dev/globalContext#typescript
          */
         interface GlobalContextServer {
+            _interfaceIsNotAny?: never;
         }
     }
     /** This namespace is only used by:
@@ -65,14 +73,19 @@ declare global {
      */
     namespace VikePackages {
         interface ConfigVikeReact {
+            _interfaceIsNotAny?: never;
         }
         interface ConfigVikeVue {
+            _interfaceIsNotAny?: never;
         }
         interface ConfigVikeSolid {
+            _interfaceIsNotAny?: never;
         }
         interface ConfigVikeSvelte {
+            _interfaceIsNotAny?: never;
         }
         interface ConfigVikeAngular {
+            _interfaceIsNotAny?: never;
         }
     }
 }

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

@@ -1,8 +1,10 @@
 export type { PageContext, PageContextServer, PageContextClient, GlobalContext, GlobalContextServer, GlobalContextClient, PageContextWithServerRouting, PageContextClientWithServerRouting, GlobalContextClientWithServerRouting, } from './PageContext.js';
+export type { PrerenderContextPublic as PrerenderContext } from '../node/prerender/runPrerender.js';
 export type { PageContextBuiltInServer } from './PageContext.js';
 export type { PageContextBuiltInClientWithClientRouting } from './PageContext.js';
 export type { PageContextBuiltInClientWithServerRouting } from './PageContext.js';
-export type { Config, ConfigMeta as Meta, ImportString, DataAsync, DataSync, GuardAsync, GuardSync, OnBeforePrerenderStartAsync, OnBeforePrerenderStartSync, OnBeforeRenderAsync, OnBeforeRenderSync, OnBeforeRouteAsync, OnBeforeRouteSync, OnHydrationEndAsync, OnHydrationEndSync, OnPageTransitionEndAsync, OnPageTransitionEndSync, OnPageTransitionStartAsync, OnPageTransitionStartSync, OnPrerenderStartAsync, OnPrerenderStartSync, OnRenderClientAsync, OnRenderClientSync, OnRenderHtmlAsync, OnRenderHtmlSync, RouteAsync, RouteSync, KeepScrollPosition, } from './Config.js';
+export type { Config, ConfigMeta as Meta, ImportString, KeepScrollPosition, } from './Config.js';
+export type { DataAsync, DataSync, GuardAsync, GuardSync, OnBeforePrerenderStartAsync, OnBeforePrerenderStartSync, OnBeforeRenderAsync, OnBeforeRenderSync, OnBeforeRouteAsync, OnBeforeRouteSync, OnHydrationEndAsync, OnHydrationEndSync, OnPageTransitionEndAsync, OnPageTransitionEndSync, OnPageTransitionStartAsync, OnPageTransitionStartSync, OnPrerenderStartAsync, OnPrerenderStartSync, OnRenderClientAsync, OnRenderClientSync, OnRenderHtmlAsync, OnRenderHtmlSync, RouteAsync, RouteSync, } from './Config.js';
 export type { ConfigResolved } from './Config/PageContextConfig.js';
 export type { ConfigEnv } from './PageConfig.js';
 export type { ConfigDefinition, ConfigEffect, } from '../node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js';

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.236-commit-eab75f6";
+export declare const PROJECT_VERSION: "0.4.237-commit-85e89b1";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.236-commit-eab75f6';
+export const PROJECT_VERSION = '0.4.237-commit-85e89b1';

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

@@ -1,4 +1,4 @@
 export { cast };
 export { castProp };
-declare function cast<T>(_thing: unknown): asserts _thing is T;
-declare function castProp<PropType, ObjectType, PropName extends PropertyKey>(_obj: ObjectType, _prop: PropName): asserts _obj is ObjectType & Record<PropName, PropType>;
+declare function cast<Type>(_thing: unknown): asserts _thing is Type;
+declare function castProp<PropType>(_obj: object, prop: PropertyKey): asserts _obj is Record<typeof prop, PropType>;

package/dist/esm/utils/cast.js

@@ -1,4 +1,4 @@
 export { cast };
 export { castProp };
 function cast(_thing) { }
-function castProp(_obj, _prop) { }
+function castProp(_obj, prop) { }

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

@@ -1 +1 @@
-export declare function objectFilter<Val, Val2 extends Val, Obj extends Record<string, Val>>(obj: Obj, filter: (arg: [string, Val]) => arg is [string, Val2]): Record<string, Val2>;
+export declare function objectFilter<T, U extends T>(obj: Record<string, T>, filter: (entry: [string, T]) => entry is [string, U]): Record<string, U>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.236-commit-eab75f6",
+  "version": "0.4.237-commit-85e89b1",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -144,11 +144,11 @@
     "sirv": "^3.0.1",
     "source-map-support": "^0.5.0",
     "tinyglobby": "^0.2.10",
-    "vite": ">=5.1.0"
+    "vite": ">=6.0.0"
   },
   "peerDependencies": {
     "react-streaming": ">=0.3.42",
-    "vite": ">=5.1.0"
+    "vite": ">=6.0.0"
   },
   "peerDependenciesMeta": {
     "react-streaming": {

package/dist/cjs/node/shared/virtualFiles/virtualFileEntry.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.virtualFileIdEntryClientCR = exports.virtualFileIdEntryClientSR = exports.virtualFileIdEntryServer = void 0;
-exports.isVirtualFileIdEntry = isVirtualFileIdEntry;
-// TODO/now: merge virtualFileEntry.ts and virtualFilePageConfigLazy.ts
-// - One function parseVirtualFileIdEntry() to rule them all?
-const utils_js_1 = require("../utils.js");
-(0, utils_js_1.assertIsNotBrowser)();
-// TODO/now: rename:
-// ```diff
-// - virtual:vike:entry:server
-// + virtual:vike:entry:global:server
-// ```
-const virtualFileIdEntryServer = 'virtual:vike:entry:server';
-exports.virtualFileIdEntryServer = virtualFileIdEntryServer;
-const virtualFileIdEntryClientSR = 'virtual:vike:entry:client:server-routing';
-exports.virtualFileIdEntryClientSR = virtualFileIdEntryClientSR;
-const virtualFileIdEntryClientCR = 'virtual:vike:entry:client:client-routing';
-exports.virtualFileIdEntryClientCR = virtualFileIdEntryClientCR;
-const virtualFileIdEntries = [virtualFileIdEntryServer, virtualFileIdEntryClientCR, virtualFileIdEntryClientSR];
-const idBase = 'virtual:vike:entry';
-(0, utils_js_1.assert)(virtualFileIdEntries.every((v) => v.startsWith(`${idBase}:`)));
-function isVirtualFileIdEntry(id) {
-    id = (0, utils_js_1.removeVirtualFileIdPrefix)(id);
-    if (!id.startsWith(idBase))
-        return false;
-    (0, utils_js_1.assert)(virtualFileIdEntries.includes(id));
-    const isForClientSide = id !== virtualFileIdEntryServer;
-    const isClientRouting = id === virtualFileIdEntryClientCR;
-    return { isForClientSide, isClientRouting };
-}

package/dist/cjs/node/shared/virtualFiles/virtualFilePageConfigLazy.js

@@ -1,45 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isVirtualFileIdPageConfigLazy = isVirtualFileIdPageConfigLazy;
-exports.getVirtualFileIdPageConfigLazy = getVirtualFileIdPageConfigLazy;
-const extractAssetsQuery_js_1 = require("../extractAssetsQuery.js");
-const utils_js_1 = require("../utils.js");
-(0, utils_js_1.assertIsNotBrowser)();
-// TODO/now: rename:
-// ```diff
-// - virtual:vike:pageConfigLazy:server:
-// + virtual:vike:entry:page:server:
-// ```
-const idBaseClient = 'virtual:vike:pageConfigLazy:client:';
-const idBaseServer = 'virtual:vike:pageConfigLazy:server:';
-const idBase = 'virtual:vike:pageConfigLazy:';
-// TODO/now: rename to generateVirtualFileIdEntry()
-function getVirtualFileIdPageConfigLazy(pageId, isForClientSide) {
-    const id = `${isForClientSide ? idBaseClient : idBaseServer}${pageId}`;
-    return id;
-}
-function isVirtualFileIdPageConfigLazy(id) {
-    id = (0, utils_js_1.removeVirtualFileIdPrefix)(id);
-    if (!id.includes(idBase))
-        return false;
-    (0, utils_js_1.assert)(id.startsWith(idBase));
-    const idOriginal = id;
-    id = (0, extractAssetsQuery_js_1.extractAssetsRemoveQuery)(id);
-    const isExtractAssets = idOriginal !== id;
-    if (id.startsWith(idBaseClient)) {
-        (0, utils_js_1.assert)(isExtractAssets === false);
-        return {
-            pageId: id.slice(idBaseClient.length),
-            isForClientSide: true,
-            isExtractAssets,
-        };
-    }
-    if (id.startsWith(idBaseServer)) {
-        return {
-            pageId: id.slice(idBaseServer.length),
-            isForClientSide: false,
-            isExtractAssets,
-        };
-    }
-    (0, utils_js_1.assert)(false);
-}

package/dist/cjs/node/vite/plugins/pluginVirtualFiles/isRuntimeEnvMatch.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isRuntimeEnvMatch = isRuntimeEnvMatch;
-function isRuntimeEnvMatch(configEnv, runtime) {
-    // Runtime
-    if (!runtime.isForClientSide) {
-        if (!configEnv.server)
-            return false;
-    }
-    else {
-        if (!configEnv.client)
-            return false;
-        if (configEnv.client === 'if-client-routing' && !runtime.isClientRouting)
-            return false;
-    }
-    // Production/development
-    if (
-    //
-    (configEnv.production === true && runtime.isDev) ||
-        (configEnv.production === false && !runtime.isDev))
-        return false;
-    return true;
-}

package/dist/cjs/node/vite/shared/applyRegExWithMagicString.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.applyRegExpWithMagicString = applyRegExpWithMagicString;
-// TODO/now: replace with .replaceAll() ?
-function applyRegExpWithMagicString(magicString, regExp, replacement) {
-    const envStatementRegEx = typeof regExp === 'string' ? new RegExp(regExp, 'g') : regExp;
-    let match;
-    while ((match = envStatementRegEx.exec(magicString.original))) {
-        magicString.overwrite(match.index, match.index + match[0].length, JSON.stringify(replacement));
-    }
-}