vike 0.4.238 → 0.4.239

package/dist/esm/node/runtime/renderPage/renderPageAfterRoute.d.ts

@@ -40,23 +40,51 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
         headers?: Record<string, string>;
     } & {
         _globalContext: {
-            isGlobalContext: true;
-            _isOriginalObject: true;
-            _virtualFileExportsGlobalEntry: unknown;
-            _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
-            _pageConfigs: import("../../../types/PageConfig.js").PageConfigRuntime[];
-            _pageConfigGlobal: import("../../../types/PageConfig.js").PageConfigGlobalRuntime;
-            _allPageIds: string[];
-            _vikeConfigPublicGlobal: {
+            _globalConfigPublic: {
+                pages: {
+                    [k: string]: {
+                        config: import("../../../types/index.js").ConfigResolved;
+                        _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                        _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                        _from: import("../../../shared/page-configs/resolveVikeConfigPublic.js").From;
+                    } & ({
+                        route: import("../../../types/Config.js").Route;
+                        isErrorPage?: undefined;
+                    } | {
+                        route?: undefined;
+                        isErrorPage: true;
+                    });
+                };
                 config: import("../../../types/index.js").ConfigResolved;
                 _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
                 _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
                 _from: import("../../../shared/page-configs/resolveVikeConfigPublic.js").From;
             };
-            config: import("../../../types/index.js").ConfigResolved;
             pages: {
-                [k: string]: import("../../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
+                [k: string]: {
+                    config: import("../../../types/index.js").ConfigResolved;
+                    _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                    _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                    _from: import("../../../shared/page-configs/resolveVikeConfigPublic.js").From;
+                } & ({
+                    route: import("../../../types/Config.js").Route;
+                    isErrorPage?: undefined;
+                } | {
+                    route?: undefined;
+                    isErrorPage: true;
+                });
             };
+            config: import("../../../types/index.js").ConfigResolved;
+            _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+            _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+            _from: import("../../../shared/page-configs/resolveVikeConfigPublic.js").From;
+            isGlobalContext: true;
+            _isOriginalObject: true;
+            _virtualFileExportsGlobalEntry: unknown;
+            _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
+            _pageConfigs: import("../../../types/PageConfig.js").PageConfigRuntime[];
+            _pageConfigGlobal: import("../../../types/PageConfig.js").PageConfigGlobalRuntime;
+            _allPageIds: string[];
         } & (({
             _isProduction: false;
             _isPrerendering: false;
@@ -108,6 +136,20 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
     } & {
+        pages: {
+            [k: string]: {
+                config: import("../../../types/index.js").ConfigResolved;
+                _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                _from: import("../../../shared/page-configs/resolveVikeConfigPublic.js").From;
+            } & ({
+                route: import("../../../types/Config.js").Route;
+                isErrorPage?: undefined;
+            } | {
+                route?: undefined;
+                isErrorPage: true;
+            });
+        };
         config: import("../../../types/index.js").ConfigResolved;
         _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
         _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
@@ -123,14 +165,15 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
         pageId: string;
     } & {
         _pageConfig: import("../../../types/PageConfig.js").PageConfigRuntime | null;
-    } & {
-        _pageConfig: null | import("../../../types/PageConfig.js").PageConfigRuntime;
-    } & import("../../../shared/getPageFiles.js").VikeConfigPublicPageLazyLoaded & {
+    } & import("../../../shared/getPageFiles.js").PageContextConfig & {
         _pageConfig: null | import("../../../types/PageConfig.js").PageConfigRuntime;
+    } & {
+        cspNonce: string | null;
     } & {
         Page: unknown;
         _isHtmlOnly: boolean;
-        _passToClient: import("../html/serializeContext.js").PassToClient;
+        _passToClient: import("./html/serializeContext.js").PassToClient;
+    } & {
         headersResponse: Headers;
     } & {
         __getPageAssets: () => Promise<import("./getPageAssets.js").PageAsset[]>;
@@ -159,23 +202,51 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
         headers?: Record<string, string>;
     } & {
         _globalContext: {
-            isGlobalContext: true;
-            _isOriginalObject: true;
-            _virtualFileExportsGlobalEntry: unknown;
-            _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
-            _pageConfigs: import("../../../types/PageConfig.js").PageConfigRuntime[];
-            _pageConfigGlobal: import("../../../types/PageConfig.js").PageConfigGlobalRuntime;
-            _allPageIds: string[];
-            _vikeConfigPublicGlobal: {
+            _globalConfigPublic: {
+                pages: {
+                    [k: string]: {
+                        config: import("../../../types/index.js").ConfigResolved;
+                        _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                        _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                        _from: import("../../../shared/page-configs/resolveVikeConfigPublic.js").From;
+                    } & ({
+                        route: import("../../../types/Config.js").Route;
+                        isErrorPage?: undefined;
+                    } | {
+                        route?: undefined;
+                        isErrorPage: true;
+                    });
+                };
                 config: import("../../../types/index.js").ConfigResolved;
                 _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
                 _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
                 _from: import("../../../shared/page-configs/resolveVikeConfigPublic.js").From;
             };
-            config: import("../../../types/index.js").ConfigResolved;
             pages: {
-                [k: string]: import("../../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
+                [k: string]: {
+                    config: import("../../../types/index.js").ConfigResolved;
+                    _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                    _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                    _from: import("../../../shared/page-configs/resolveVikeConfigPublic.js").From;
+                } & ({
+                    route: import("../../../types/Config.js").Route;
+                    isErrorPage?: undefined;
+                } | {
+                    route?: undefined;
+                    isErrorPage: true;
+                });
             };
+            config: import("../../../types/index.js").ConfigResolved;
+            _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+            _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+            _from: import("../../../shared/page-configs/resolveVikeConfigPublic.js").From;
+            isGlobalContext: true;
+            _isOriginalObject: true;
+            _virtualFileExportsGlobalEntry: unknown;
+            _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
+            _pageConfigs: import("../../../types/PageConfig.js").PageConfigRuntime[];
+            _pageConfigGlobal: import("../../../types/PageConfig.js").PageConfigGlobalRuntime;
+            _allPageIds: string[];
         } & (({
             _isProduction: false;
             _isPrerendering: false;
@@ -227,6 +298,20 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
     } & {
+        pages: {
+            [k: string]: {
+                config: import("../../../types/index.js").ConfigResolved;
+                _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                _from: import("../../../shared/page-configs/resolveVikeConfigPublic.js").From;
+            } & ({
+                route: import("../../../types/Config.js").Route;
+                isErrorPage?: undefined;
+            } | {
+                route?: undefined;
+                isErrorPage: true;
+            });
+        };
         config: import("../../../types/index.js").ConfigResolved;
         _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
         _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
@@ -242,14 +327,15 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
         pageId: string;
     } & {
         _pageConfig: import("../../../types/PageConfig.js").PageConfigRuntime | null;
-    } & {
-        _pageConfig: null | import("../../../types/PageConfig.js").PageConfigRuntime;
-    } & import("../../../shared/getPageFiles.js").VikeConfigPublicPageLazyLoaded & {
+    } & import("../../../shared/getPageFiles.js").PageContextConfig & {
         _pageConfig: null | import("../../../types/PageConfig.js").PageConfigRuntime;
+    } & {
+        cspNonce: string | null;
     } & {
         Page: unknown;
         _isHtmlOnly: boolean;
-        _passToClient: import("../html/serializeContext.js").PassToClient;
+        _passToClient: import("./html/serializeContext.js").PassToClient;
+    } & {
         headersResponse: Headers;
     } & {
         __getPageAssets: () => Promise<import("./getPageAssets.js").PageAsset[]>;

package/dist/esm/node/runtime/renderPage/renderPageAfterRoute.js

@@ -1,9 +1,9 @@
 export { renderPageAfterRoute };
 export { prerenderPage };
 import { getErrorPageId } from '../../../shared/error-page.js';
-import { getHtmlString } from '../html/renderHtml.js';
+import { getHtmlString } from './html/renderHtml.js';
 import { assert, assertUsage, updateType, hasProp, objectAssign } from '../utils.js';
-import { getPageContextClientSerialized } from '../html/serializeContext.js';
+import { getPageContextClientSerialized } from './html/serializeContext.js';
 import { createHttpResponsePage, createHttpResponsePageContextJson } from './createHttpResponse.js';
 import { loadPageConfigsLazyServerSide, } from './loadPageConfigsLazyServerSide.js';
 import { execHookOnRenderHtml } from './execHookOnRenderHtml.js';

package/dist/esm/node/runtime/renderPage.d.ts

@@ -32,23 +32,51 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
     /** @deprecated Set pageContextInit.headersOriginal instead */ headers?: Record<string, string>;
 } & {
     _globalContext: {
-        isGlobalContext: true;
-        _isOriginalObject: true;
-        _virtualFileExportsGlobalEntry: unknown;
-        _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-        _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
-        _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
-        _allPageIds: string[];
-        _vikeConfigPublicGlobal: {
+        _globalConfigPublic: {
+            pages: {
+                [k: string]: {
+                    config: import("../../types/index.js").ConfigResolved;
+                    _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                    _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                    _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+                } & ({
+                    route: import("../../types/Config.js").Route;
+                    isErrorPage?: undefined;
+                } | {
+                    route?: undefined;
+                    isErrorPage: true;
+                });
+            };
             config: import("../../types/index.js").ConfigResolved;
             _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
             _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
             _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
         };
-        config: import("../../types/index.js").ConfigResolved;
         pages: {
-            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
+            [k: string]: {
+                config: import("../../types/index.js").ConfigResolved;
+                _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+            } & ({
+                route: import("../../types/Config.js").Route;
+                isErrorPage?: undefined;
+            } | {
+                route?: undefined;
+                isErrorPage: true;
+            });
         };
+        config: import("../../types/index.js").ConfigResolved;
+        _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+        _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+        _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+        isGlobalContext: true;
+        _isOriginalObject: true;
+        _virtualFileExportsGlobalEntry: unknown;
+        _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
+        _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
+        _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
+        _allPageIds: string[];
     } & (({
         _isProduction: false;
         _isPrerendering: false;
@@ -100,6 +128,20 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
     _urlHandler: ((url: string) => string) | null;
     isClientSideNavigation: boolean;
 } & {
+    pages: {
+        [k: string]: {
+            config: import("../../types/index.js").ConfigResolved;
+            _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+            _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+            _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+        } & ({
+            route: import("../../types/Config.js").Route;
+            isErrorPage?: undefined;
+        } | {
+            route?: undefined;
+            isErrorPage: true;
+        });
+    };
     config: import("../../types/index.js").ConfigResolved;
     _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
     _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;

package/dist/esm/node/runtime/renderPage.js

@@ -13,7 +13,7 @@ import { isNewError } from './renderPage/isNewError.js';
 import { assertArguments } from './renderPage/assertArguments.js';
 import { log404 } from './renderPage/log404/index.js';
 import pc from '@brillout/picocolors';
-import { getPageContextClientSerializedAbort, getPageContextClientSerialized } from './html/serializeContext.js';
+import { getPageContextClientSerializedAbort, getPageContextClientSerialized, } from './renderPage/html/serializeContext.js';
 import { getErrorPageId } from '../../shared/error-page.js';
 import { handleErrorWithoutErrorPage } from './renderPage/handleErrorWithoutErrorPage.js';
 import { loadPageConfigsLazyServerSide } from './renderPage/loadPageConfigsLazyServerSide.js';

package/dist/esm/node/vite/onLoad.js

@@ -13,7 +13,7 @@ function onLoad() {
     // TO-DO/eventually: let's also use this.meta.viteVersion
     // - https://github.com/vitejs/vite/pull/20088
     // - https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md#700-2025-06-24
-    assertVersion('Vite', version, '6.0.0');
+    assertVersion('Vite', version, ['6.0.0']);
     // Ensure we don't bloat the server runtime with heavy dependencies such Vite and esbuild
     assertIsNotProductionRuntime();
 }

package/dist/esm/node/vite/plugins/pluginBuild/handleAssetsManifest.js

@@ -19,7 +19,7 @@ import { getManifestFilePathRelative } from '../../shared/getManifestFilePathRel
 const globalObject = getGlobalObject('build/handleAssetsManifest.ts', {
     assetsJsonFilePath: undefined,
 });
-// true  => use workaround config.build.ssrEmitAssets
+// yes  => use workaround config.build.ssrEmitAssets
 // false => use workaround extractAssets plugin
 function handleAssetsManifest_isFixEnabled() {
     // Allow user to toggle between the two workarounds? E.g. based on https://vike.dev/includeAssetsImportedByServer.

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

@@ -107,7 +107,7 @@ function setDefault(setting, value, configFromUser, configFromVike) {
 /*
 import { version } from 'vite'
 function overrideViteDefaultSsrExternal(config: ResolvedConfig) {
-  if (!isVersionOrAbove(version, '5.0.12')) return
+  if (!isVersionMatch(version, ['5.0.12'])) return
   // @ts-ignore Not released yet: https://github.com/vitejs/vite/pull/10939/files#diff-5a3d42620df2c6b17e25f440ffdb67683dee7ef57317674d19f41d5f30502310L5
   config.ssr.external ??= true
 }

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

@@ -32,15 +32,16 @@ function pluginNonRunnableDev() {
         transform(code, id) {
             if (!config._isDev)
                 return;
-            if (id !== distFileIsNonRunnableDev && id !== distFileGlobalContext)
+            const idWithoutQuery = id.split('?')[0];
+            if (idWithoutQuery !== distFileIsNonRunnableDev && idWithoutQuery !== distFileGlobalContext)
                 return;
             if (isRunnableDevEnvironment(this.environment))
                 return;
             const { magicString, getMagicStringResult } = getMagicString(code, id);
-            if (id === distFileIsNonRunnableDev) {
+            if (idWithoutQuery === distFileIsNonRunnableDev) {
                 magicString.replaceAll('__VIKE__IS_NON_RUNNABLE_DEV', JSON.stringify(true));
             }
-            if (id === distFileGlobalContext) {
+            if (idWithoutQuery === distFileGlobalContext) {
                 magicString.replaceAll('__VIKE__DYNAMIC_IMPORT', 'import');
             }
             return getMagicStringResult();

package/dist/esm/node/vite/plugins/pluginVirtualFiles/generateVirtualFileGlobalEntryWithOldDesign.js

@@ -1,5 +1,5 @@
 export { generateVirtualFileGlobalEntryWithOldDesign };
-import { assert, assertPosixPath, scriptFileExtensionPattern, debugGlob, isVersionOrAbove, assertWarning, } from '../../utils.js';
+import { assert, assertPosixPath, scriptFileExtensionPattern, debugGlob, isVersionMatch, assertWarning, } from '../../utils.js';
 import { parseVirtualFileId } from '../../../shared/virtualFileId.js';
 import { version as viteVersion } from 'vite';
 import { fileTypes } from '../../../../shared/getPageFiles/fileTypes.js';
@@ -139,7 +139,7 @@ function getGlobs(globRoots, isBuild, fileType, query, isV1Design) {
             const globExcludePath = globRoot.excludeDir ? `'!${getGlobPath(globRoot.excludeDir, fileType)}'` : null;
             const globOptions = { eager: isEager };
             if (query) {
-                const isNewViteInterface = isVersionOrAbove(viteVersion, '5.1.0');
+                const isNewViteInterface = isVersionMatch(viteVersion, ['5.1.0']);
                 if (isNewViteInterface &&
                     // When used for the old design, the new syntax breaks Vike's CI (surprinsigly so). I couldn't reproduce locally (I didn't dig much).
                     isV1Design) {

package/dist/esm/node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js

@@ -171,6 +171,9 @@ const configDefinitionsBuiltIn = {
         env: { config: true },
         global: true,
     },
+    csp: {
+        env: { server: true },
+    },
     injectScriptsAt: {
         env: { server: true },
     },

package/dist/esm/node/vite/shared/resolveVikeConfigInternal/crawlPlusFiles.js

@@ -1,7 +1,7 @@
 export { crawlPlusFiles };
 export { isPlusFile };
 export { getPlusFileValueConfigName };
-import { assertPosixPath, assert, scriptFileExtensionPattern, assertIsNotProductionRuntime, isVersionOrAbove, isScriptFile, scriptFileExtensionList, createDebugger, deepEqual, assertUsage, assertFilePathAbsoluteFilesystem, assertWarning, hasProp, isNotNullish, getGlobalObject, } from '../../utils.js';
+import { assertPosixPath, assert, scriptFileExtensionPattern, assertIsNotProductionRuntime, isVersionMatch, isScriptFile, scriptFileExtensionList, createDebugger, deepEqual, assertUsage, assertFilePathAbsoluteFilesystem, assertWarning, hasProp, isNotNullish, getGlobalObject, } from '../../utils.js';
 import path from 'node:path';
 import { glob } from 'tinyglobby';
 import { exec } from 'node:child_process';
@@ -147,7 +147,7 @@ async function isGitNotUsable(userRootDir) {
         //    - We didn't bother test which is the earliest version that works.
         //  - Git 2.32.0 doesn't seem to work: https://github.com/vikejs/vike/discussions/1549
         //    - Maybe it's because of StackBlitz: looking at the release notes, Git 2.32.0 should be working.
-        if (!isVersionOrAbove(gitVersion, '2.43.1'))
+        if (!isVersionMatch(gitVersion, ['2.43.1']))
             return true;
     }
     // Is userRootDir inside a Git repository?

package/dist/esm/node/vite/shared/resolveVikeConfigInternal.d.ts

@@ -1,3 +1,5 @@
+export { getVikeConfig };
+export type { VikeConfig };
 export { getVikeConfigInternal };
 export { getVikeConfigInternalOptional };
 export { getVikeConfigInternalSync };
@@ -9,11 +11,9 @@ export { getConfigDefinitionOptional };
 export { getVikeConfigFromCliOrEnv };
 export type { VikeConfigInternal };
 export type { PageConfigBuildTimeBeforeComputed };
-export { getVikeConfig };
-export type { VikeConfig };
 import type { PageConfigGlobalBuildTime, PageConfigBuildTime } from '../../../types/PageConfig.js';
 import { type ConfigDefinitionsInternal, type ConfigDefinitionInternal } from './resolveVikeConfigInternal/configDefinitionsBuiltIn.js';
-import { type VikeConfigPublicGlobal, type VikeConfigPublicPageEagerLoaded } from '../../../shared/page-configs/resolveVikeConfigPublic.js';
+import { type GlobalConfigPublic } from '../../../shared/page-configs/resolveVikeConfigPublic.js';
 import { type PlusFile } from './resolveVikeConfigInternal/getPlusFilesAll.js';
 import type { PrerenderContextPublic } from '../../prerender/runPrerender.js';
 import type { ResolvedConfig, UserConfig } from 'vite';
@@ -28,13 +28,9 @@ type PrerenderContext = {
 } & ({
     [K in keyof PrerenderContextPublic]: null;
 } | PrerenderContextPublic);
-type VikeConfigInternal = {
+type VikeConfigInternal = GlobalConfigPublic & {
     _pageConfigs: PageConfigBuildTime[];
     _pageConfigGlobal: PageConfigGlobalBuildTime;
-    config: VikeConfigPublicGlobal['config'];
-    _from: VikeConfigPublicGlobal['_from'];
-    pages: Record<string, // pageId
-    VikeConfigPublicPageEagerLoaded>;
     _vikeConfigDependencies: Set<string>;
     prerenderContext: PrerenderContext;
 };

package/dist/esm/node/vite/shared/resolveVikeConfigInternal.js

@@ -1,3 +1,5 @@
+// Public usage
+export { getVikeConfig };
 // Internal usage
 export { getVikeConfigInternal };
 export { getVikeConfigInternalOptional };
@@ -8,8 +10,6 @@ export { isV1Design };
 export { getConfVal };
 export { getConfigDefinitionOptional };
 export { getVikeConfigFromCliOrEnv };
-// Public usage
-export { getVikeConfig };
 import { assertPosixPath, assert, isObject, assertUsage, assertWarning, objectEntries, hasProp, includes, assertIsNotProductionRuntime, getMostSimilar, joinEnglish, assertKeys, objectKeys, objectFromEntries, unique, isCallable, makeFirst, lowerFirst, makeLast, genPromise, checkType, objectAssign, getGlobalObject, } from '../utils.js';
 import { configDefinitionsBuiltIn, } from './resolveVikeConfigInternal/configDefinitionsBuiltIn.js';
 import { getLocationId, getFilesystemRouteString, getFilesystemRouteDefinedBy, isInherited, sortAfterInheritanceOrder, applyFilesystemRoutingRootEffect, } from './resolveVikeConfigInternal/filesystemRouting.js';
@@ -22,7 +22,7 @@ import { loadPointerImport, loadValueFile } from './resolveVikeConfigInternal/lo
 import { resolvePointerImport } from './resolveVikeConfigInternal/resolvePointerImport.js';
 import { getFilePathResolved } from './getFilePath.js';
 import { getConfigValueBuildTime } from '../../../shared/page-configs/getConfigValueBuildTime.js';
-import { resolveVikeConfigPublicGlobal, resolveVikeConfigPublicPageEagerLoaded, } from '../../../shared/page-configs/resolveVikeConfigPublic.js';
+import { resolveGlobalConfigPublic, } from '../../../shared/page-configs/resolveVikeConfigPublic.js';
 import { getConfigValuesBase, isJsonValue } from '../../../shared/page-configs/serialize/serializeConfigValues.js';
 import { getPlusFilesAll, } from './resolveVikeConfigInternal/getPlusFilesAll.js';
 import { getEnvVarObject } from './getEnvVarObject.js';
@@ -170,31 +170,26 @@ async function resolveVikeConfigInternal(userRootDir, vikeVitePluginOptions, esb
     // Backwards compatibility for vike(options) in vite.config.js
     temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, userRootDir);
     setCliAndApiOptions(pageConfigGlobal, configDefinitionsResolved);
-    // global
-    const pageConfigGlobalValues = getConfigValues(pageConfigGlobal);
-    const vikeConfigPublicGlobal = resolveVikeConfigPublicGlobal({ pageConfigGlobalValues });
-    // pages
-    const vikeConfigPublicPagesEager = objectFromEntries(pageConfigs.map((pageConfig) => {
-        const pageConfigValues = getConfigValues(pageConfig, true);
-        return resolveVikeConfigPublicPageEagerLoaded(pageConfigGlobalValues, pageConfig, pageConfigValues);
-    }));
+    const globalConfigPublic = resolveGlobalConfig(pageConfigGlobal, pageConfigs);
     const prerenderContext = resolvePrerenderContext({
-        config: vikeConfigPublicGlobal.config,
-        _from: vikeConfigPublicGlobal._from,
+        config: globalConfigPublic.config,
+        _from: globalConfigPublic._from,
         _pageConfigs: pageConfigs,
     });
     const vikeConfig = {
+        ...globalConfigPublic,
+        prerenderContext,
         _pageConfigs: pageConfigs,
         _pageConfigGlobal: pageConfigGlobal,
-        config: vikeConfigPublicGlobal.config,
-        _from: vikeConfigPublicGlobal._from,
-        pages: vikeConfigPublicPagesEager,
-        prerenderContext,
         _vikeConfigDependencies: esbuildCache.vikeConfigDependencies,
     };
     globalObject.vikeConfigSync = vikeConfig;
     return vikeConfig;
 }
+function resolveGlobalConfig(pageConfigGlobal, pageConfigs) {
+    const globalConfigPublic = resolveGlobalConfigPublic(pageConfigs, pageConfigGlobal, getConfigValues);
+    return globalConfigPublic;
+}
 async function resolveConfigDefinitions(plusFilesAll, userRootDir, esbuildCache) {
     const plusFilesAllOrdered = Object.values(plusFilesAll)
         .flat()
@@ -358,7 +353,8 @@ function assertOnBeforeRenderEnv(pageConfig) {
     // When using Server Routing, loading a onBeforeRender() hook on the client-side hasn't any effect (the Server Routing's client runtime never calls it); it unnecessarily bloats client bundle sizes
     assertUsage(!(onBeforeRenderEnv.client && !isClientRouting), `Page ${pageConfig.pageId} has an onBeforeRender() hook with env ${pc.cyan(JSON.stringify(onBeforeRenderEnv))} which doesn't make sense because the page is using Server Routing: onBeforeRender() can be run in the client only when using Client Routing.`);
 }
-function getConfigValues(pageConfig, tolerateMissingValue) {
+function getConfigValues(pageConfig, isGlobalConfig) {
+    const tolerateMissingValue = !isGlobalConfig;
     const configValues = {};
     getConfigValuesBase(pageConfig, { isForConfig: true }, null).forEach((entry) => {
         if (entry.configValueBase.type === 'computed') {
@@ -1125,11 +1121,15 @@ function restartViteDevServer() {
     removeSuperfluousViteLog_disable();
 }
 function getVikeConfigDummy(esbuildCache) {
-    const globalDummy = resolveVikeConfigPublicGlobal({ pageConfigGlobalValues: {} });
     const pageConfigsDummy = [];
+    const pageConfigGlobalDummy = {
+        configValueSources: {},
+        configDefinitions: {},
+    };
+    const globalConfigPublicDummy = resolveGlobalConfig(pageConfigGlobalDummy, pageConfigsDummy);
     const prerenderContextDummy = resolvePrerenderContext({
-        config: globalDummy.config,
-        _from: globalDummy._from,
+        config: globalConfigPublicDummy.config,
+        _from: globalConfigPublicDummy._from,
         _pageConfigs: pageConfigsDummy,
     });
     const vikeConfigDummy = {
@@ -1138,9 +1138,7 @@ function getVikeConfigDummy(esbuildCache) {
             configDefinitions: {},
             configValueSources: {},
         },
-        config: globalDummy.config,
-        _from: globalDummy._from,
-        pages: {},
+        ...globalConfigPublicDummy,
         prerenderContext: prerenderContextDummy,
         _vikeConfigDependencies: esbuildCache.vikeConfigDependencies,
     };