vike 0.4.238 → 0.4.239-commit-050a4a3

package/dist/cjs/node/vite/plugins/pluginPreview.js

@@ -19,32 +19,38 @@ function pluginPreview() {
     return {
         name: 'vike:pluginPreview',
         apply: utils_js_1.applyPreview,
-        config() {
-            return {
-                appType: 'custom',
-            };
+        config: {
+            handler() {
+                return {
+                    appType: 'custom',
+                };
+            },
         },
-        async configResolved(config_) {
-            config = config_;
-            vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
-            (0, pluginDev_js_1.logDockerHint)(config.preview.host);
-            // vikeConfig = await getVikeConfig(config)
+        configResolved: {
+            async handler(config_) {
+                config = config_;
+                vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
+                (0, pluginDev_js_1.logDockerHint)(config.preview.host);
+                // vikeConfig = await getVikeConfig(config)
+            },
         },
-        configurePreviewServer(server) {
-            /* - Couldn't make `appType: 'mpa'` work as of npm:@brillout/vite@5.0.0-beta.14.0426910c
-               - This ugly hack to set appType for preview won't be need once https://github.com/vitejs/vite/pull/14855 is merged.
-            config.appType = 'mpa'
-            */
-            return () => {
-                const { isPrerenderingEnabledForAllPages, isPrerenderingEnabled } = vikeConfig.prerenderContext;
-                assertDist(isPrerenderingEnabledForAllPages);
-                // We cannot re-use Vite's static middleware: https://github.com/vitejs/vite/pull/14836#issuecomment-1788540300
-                addStaticAssetsMiddleware(server.middlewares);
-                if (!isPrerenderingEnabledForAllPages) {
-                    (0, addSsrMiddleware_js_1.addSsrMiddleware)(server.middlewares, config, true, isPrerenderingEnabled);
-                }
-                addStatic404Middleware(server.middlewares);
-            };
+        configurePreviewServer: {
+            handler(server) {
+                /* - Couldn't make `appType: 'mpa'` work as of npm:@brillout/vite@5.0.0-beta.14.0426910c
+                 - This ugly hack to set appType for preview won't be need once https://github.com/vitejs/vite/pull/14855 is merged.
+              config.appType = 'mpa'
+              */
+                return () => {
+                    const { isPrerenderingEnabledForAllPages, isPrerenderingEnabled } = vikeConfig.prerenderContext;
+                    assertDist(isPrerenderingEnabledForAllPages);
+                    // We cannot re-use Vite's static middleware: https://github.com/vitejs/vite/pull/14836#issuecomment-1788540300
+                    addStaticAssetsMiddleware(server.middlewares);
+                    if (!isPrerenderingEnabledForAllPages) {
+                        (0, addSsrMiddleware_js_1.addSsrMiddleware)(server.middlewares, config, true, isPrerenderingEnabled);
+                    }
+                    addStatic404Middleware(server.middlewares);
+                };
+            },
         },
     };
     function assertDist(isPrerenderingEnabledForAllPages) {

package/dist/cjs/node/vite/plugins/pluginReplaceConstants.js

@@ -11,41 +11,49 @@ function pluginReplaceConstants() {
         name: 'vike:pluginReplaceConstants',
         enforce: 'post',
         apply: 'build',
-        configResolved(config_) {
-            config = config_;
+        configResolved: {
+            handler(config_) {
+                config = config_;
+            },
         },
-        transform(code, id, options) {
-            id = (0, normalizeId_js_1.normalizeId)(id);
-            (0, utils_js_1.assertPosixPath)(id);
-            if (id.includes('/node_modules/'))
-                return;
-            (0, utils_js_1.assertPosixPath)(config.root);
-            if (!id.startsWith(config.root))
-                return;
-            if (!code.includes('({}).'))
-                return;
-            const isBuild = config.command === 'build';
-            (0, utils_js_1.assert)(isBuild);
-            // Used by vike.dev
-            // https://github.com/vikejs/vike/blob/08a1ff55c80ddca64ca6d4417fefd45fefeb4ffb/docs/vite.config.ts#L12
-            // @ts-expect-error
-            if (config._skipVikeReplaceConstants?.(id))
-                return;
-            const { magicString, getMagicStringResult } = (0, getMagicString_js_1.getMagicString)(code, id);
-            const constantsMap = [];
-            constantsMap.push({
-                constants: ['pageContext.isClientSide', 'globalContext.isClientSide', 'pageContext.globalContext.isClientSide'],
-                replacement: !(0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, this.environment, options),
-            });
-            constantsMap.forEach(({ constants, replacement }) => {
-                if (!constants.some((c) => code.includes(c)))
+        transform: {
+            handler(code, id, options) {
+                id = (0, normalizeId_js_1.normalizeId)(id);
+                (0, utils_js_1.assertPosixPath)(id);
+                if (id.includes('/node_modules/'))
                     return;
-                const regExp = getConstantRegExp(constants);
-                magicString.replaceAll(regExp, JSON.stringify(replacement));
-            });
-            if (!magicString.hasChanged())
-                return null;
-            return getMagicStringResult();
+                (0, utils_js_1.assertPosixPath)(config.root);
+                if (!id.startsWith(config.root))
+                    return;
+                if (!code.includes('({}).'))
+                    return;
+                const isBuild = config.command === 'build';
+                (0, utils_js_1.assert)(isBuild);
+                // Used by vike.dev
+                // https://github.com/vikejs/vike/blob/08a1ff55c80ddca64ca6d4417fefd45fefeb4ffb/docs/vite.config.ts#L12
+                // @ts-expect-error
+                if (config._skipVikeReplaceConstants?.(id))
+                    return;
+                const { magicString, getMagicStringResult } = (0, getMagicString_js_1.getMagicString)(code, id);
+                const constantsMap = [];
+                constantsMap.push({
+                    constants: [
+                        'pageContext.isClientSide',
+                        'globalContext.isClientSide',
+                        'pageContext.globalContext.isClientSide',
+                    ],
+                    replacement: !(0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, this.environment, options),
+                });
+                constantsMap.forEach(({ constants, replacement }) => {
+                    if (!constants.some((c) => code.includes(c)))
+                        return;
+                    const regExp = getConstantRegExp(constants);
+                    magicString.replaceAll(regExp, JSON.stringify(replacement));
+                });
+                if (!magicString.hasChanged())
+                    return null;
+                return getMagicStringResult();
+            },
         },
     };
 }

package/dist/cjs/node/vite/plugins/pluginSetGlobalContext.js

@@ -22,8 +22,10 @@ function pluginSetGlobalContext() {
                     (0, utils_js_1.markSetup_viteDevServer)();
                 },
             },
-            configurePreviewServer() {
-                (0, utils_js_1.markSetup_vitePreviewServer)();
+            configurePreviewServer: {
+                handler() {
+                    (0, utils_js_1.markSetup_vitePreviewServer)();
+                },
             },
             config: {
                 order: 'pre',

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

@@ -144,7 +144,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 = (0, utils_js_1.isVersionOrAbove)(vite_1.version, '5.1.0');
+                const isNewViteInterface = (0, utils_js_1.isVersionMatch)(vite_1.version, ['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/cjs/node/vite/plugins/pluginVirtualFiles.js

@@ -21,47 +21,57 @@ function pluginVirtualFiles() {
     let config;
     return {
         name: 'vike:pluginVirtualFiles',
-        async configResolved(config_) {
-            config = config_;
-            // TO-DO/next-major-release: remove
-            if (!(0, resolveVikeConfigInternal_js_1.isV1Design)())
-                config.experimental.importGlobRestoreExtension = true;
+        configResolved: {
+            async handler(config_) {
+                config = config_;
+                // TO-DO/next-major-release: remove
+                if (!(0, resolveVikeConfigInternal_js_1.isV1Design)())
+                    config.experimental.importGlobRestoreExtension = true;
+            },
         },
-        resolveId(id) {
-            if ((0, utils_js_1.isVirtualFileId)(id)) {
-                return (0, utils_js_1.addVirtualFileIdPrefix)(id);
-            }
-        },
-        async handleHotUpdate(ctx) {
-            try {
-                return await handleHotUpdate(ctx, config);
-            }
-            catch (err) {
-                // Vite swallows errors thrown by handleHotUpdate()
-                console.error(err);
-                throw err;
-            }
+        resolveId: {
+            handler(id) {
+                if ((0, utils_js_1.isVirtualFileId)(id)) {
+                    return (0, utils_js_1.addVirtualFileIdPrefix)(id);
+                }
+            },
         },
-        async load(id, options) {
-            if (!(0, utils_js_1.isVirtualFileId)(id))
-                return undefined;
-            id = (0, utils_js_1.removeVirtualFileIdPrefix)(id);
-            const isDev = config._isDev;
-            (0, utils_js_1.assert)(typeof isDev === 'boolean');
-            const idParsed = (0, virtualFileId_js_1.parseVirtualFileId)(id);
-            if (idParsed) {
-                if (idParsed.type === 'page-entry') {
-                    const code = await (0, generateVirtualFilePageEntry_js_1.generateVirtualFilePageEntry)(id, isDev);
-                    return code;
+        handleHotUpdate: {
+            async handler(ctx) {
+                try {
+                    return await handleHotUpdate(ctx, config);
                 }
-                if (idParsed.type === 'global-entry') {
-                    const code = await (0, generateVirtualFileGlobalEntryWithOldDesign_js_1.generateVirtualFileGlobalEntryWithOldDesign)(id, options, config, this.environment, isDev);
-                    return code;
+                catch (err) {
+                    // Vite swallows errors thrown by handleHotUpdate()
+                    console.error(err);
+                    throw err;
                 }
-            }
+            },
+        },
+        load: {
+            async handler(id, options) {
+                if (!(0, utils_js_1.isVirtualFileId)(id))
+                    return undefined;
+                id = (0, utils_js_1.removeVirtualFileIdPrefix)(id);
+                const isDev = config._isDev;
+                (0, utils_js_1.assert)(typeof isDev === 'boolean');
+                const idParsed = (0, virtualFileId_js_1.parseVirtualFileId)(id);
+                if (idParsed) {
+                    if (idParsed.type === 'page-entry') {
+                        const code = await (0, generateVirtualFilePageEntry_js_1.generateVirtualFilePageEntry)(id, isDev);
+                        return code;
+                    }
+                    if (idParsed.type === 'global-entry') {
+                        const code = await (0, generateVirtualFileGlobalEntryWithOldDesign_js_1.generateVirtualFileGlobalEntryWithOldDesign)(id, options, config, this.environment, isDev);
+                        return code;
+                    }
+                }
+            },
         },
-        configureServer(server) {
-            handleFileAddRemove(server, config);
+        configureServer: {
+            handler(server) {
+                handleFileAddRemove(server, config);
+            },
         },
     };
 }
@@ -130,7 +140,10 @@ async function handleHotUpdate(ctx, config) {
             // Ensure we invalidate `file` *before* server.ssrLoadModule() in updateUserFiles()
             // Vite already invalidates it, but *after* handleHotUpdate() and thus after server.ssrLoadModule()
             ctx.modules.forEach((mod) => server.moduleGraph.invalidateModule(mod));
-            (0, globalContext_js_1.updateUserFiles)();
+            if ((0, globalContext_js_1.isRunnable)(server)) {
+                // TODO/now: await
+                (0, globalContext_js_1.updateUserFiles)();
+            }
         }
     }
 }

package/dist/cjs/node/vite/plugins/pluginWorkaroundCssModuleHmr.js

@@ -4,12 +4,14 @@ exports.pluginWorkaroundCssModuleHmr = pluginWorkaroundCssModuleHmr;
 function pluginWorkaroundCssModuleHmr() {
     return {
         name: 'vike:pluginWorkaroundCssModuleHmr',
-        handleHotUpdate(ctx) {
-            // prevent full reload due to non self-accepting css module.
-            // here only "?direct" module should be filtered out as it doesn't have a parent module.
-            if (ctx.file.includes('module.css')) {
-                return ctx.modules.filter((m) => !m.id?.includes('?direct'));
-            }
+        handleHotUpdate: {
+            handler(ctx) {
+                // prevent full reload due to non self-accepting css module.
+                // here only "?direct" module should be filtered out as it doesn't have a parent module.
+                if (ctx.file.includes('module.css')) {
+                    return ctx.modules.filter((m) => !m.id?.includes('?direct'));
+                }
+            },
         },
     };
 }

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

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

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

@@ -152,7 +152,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 (!(0, utils_js_1.isVersionOrAbove)(gitVersion, '2.43.1'))
+        if (!(0, utils_js_1.isVersionMatch)(gitVersion, ['2.43.1']))
             return true;
     }
     // Is userRootDir inside a Git repository?

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

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getVikeConfig = getVikeConfig;
 exports.getVikeConfigInternal = getVikeConfigInternal;
 exports.getVikeConfigInternalOptional = getVikeConfigInternalOptional;
 exports.getVikeConfigInternalSync = getVikeConfigInternalSync;
@@ -12,7 +13,6 @@ exports.isV1Design = isV1Design;
 exports.getConfVal = getConfVal;
 exports.getConfigDefinitionOptional = getConfigDefinitionOptional;
 exports.getVikeConfigFromCliOrEnv = getVikeConfigFromCliOrEnv;
-exports.getVikeConfig = getVikeConfig;
 const utils_js_1 = require("../utils.js");
 const configDefinitionsBuiltIn_js_1 = require("./resolveVikeConfigInternal/configDefinitionsBuiltIn.js");
 const filesystemRouting_js_1 = require("./resolveVikeConfigInternal/filesystemRouting.js");
@@ -173,31 +173,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 = (0, resolveVikeConfigPublic_js_1.resolveVikeConfigPublicGlobal)({ pageConfigGlobalValues });
-    // pages
-    const vikeConfigPublicPagesEager = (0, utils_js_1.objectFromEntries)(pageConfigs.map((pageConfig) => {
-        const pageConfigValues = getConfigValues(pageConfig, true);
-        return (0, resolveVikeConfigPublic_js_1.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 = (0, resolveVikeConfigPublic_js_1.resolveGlobalConfigPublic)(pageConfigs, pageConfigGlobal, getConfigValues);
+    return globalConfigPublic;
+}
 async function resolveConfigDefinitions(plusFilesAll, userRootDir, esbuildCache) {
     const plusFilesAllOrdered = Object.values(plusFilesAll)
         .flat()
@@ -361,7 +356,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
     (0, utils_js_1.assertUsage)(!(onBeforeRenderEnv.client && !isClientRouting), `Page ${pageConfig.pageId} has an onBeforeRender() hook with env ${picocolors_1.default.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 = {};
     (0, serializeConfigValues_js_1.getConfigValuesBase)(pageConfig, { isForConfig: true }, null).forEach((entry) => {
         if (entry.configValueBase.type === 'computed') {
@@ -1128,11 +1124,15 @@ function restartViteDevServer() {
     (0, removeSuperfluousViteLog_js_1.removeSuperfluousViteLog_disable)();
 }
 function getVikeConfigDummy(esbuildCache) {
-    const globalDummy = (0, resolveVikeConfigPublic_js_1.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 = {
@@ -1141,9 +1141,7 @@ function getVikeConfigDummy(esbuildCache) {
             configDefinitions: {},
             configValueSources: {},
         },
-        config: globalDummy.config,
-        _from: globalDummy._from,
-        pages: {},
+        ...globalConfigPublicDummy,
         prerenderContext: prerenderContextDummy,
         _vikeConfigDependencies: esbuildCache.vikeConfigDependencies,
     };

package/dist/cjs/shared/createGlobalContextShared.js

@@ -73,7 +73,9 @@ addGlobalContextTmp, addGlobalContextAsync) {
     return globalObject.globalContext;
 }
 function createGlobalContextBase(virtualFileExportsGlobalEntry) {
-    const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, vikeConfigPublicGlobal, vikeConfigPublicPagesEager, } = getConfigsAll(virtualFileExportsGlobalEntry);
+    const { pageFilesAll, pageConfigs, pageConfigGlobal } = (0, parseVirtualFileExportsGlobalEntry_js_1.parseVirtualFileExportsGlobalEntry)(virtualFileExportsGlobalEntry);
+    const allPageIds = getAllPageIds(pageFilesAll, pageConfigs);
+    const globalContextAddendum = (0, resolveVikeConfigPublic_js_1.resolveGlobalContextConfig)(pageConfigs, pageConfigGlobal);
     const globalContext = {
         /**
          * Useful for distinguishing `globalContext` from other objects and narrowing down TypeScript unions.
@@ -87,31 +89,11 @@ function createGlobalContextBase(virtualFileExportsGlobalEntry) {
         _pageConfigs: pageConfigs,
         _pageConfigGlobal: pageConfigGlobal,
         _allPageIds: allPageIds,
-        _vikeConfigPublicGlobal: vikeConfigPublicGlobal,
-        config: vikeConfigPublicGlobal.config,
-        pages: vikeConfigPublicPagesEager,
+        ...globalContextAddendum,
     };
     (0, utils_js_1.changeEnumerable)(globalContext, '_isOriginalObject', false);
     return globalContext;
 }
-function getConfigsAll(virtualFileExportsGlobalEntry) {
-    const { pageFilesAll, pageConfigs, pageConfigGlobal } = (0, parseVirtualFileExportsGlobalEntry_js_1.parseVirtualFileExportsGlobalEntry)(virtualFileExportsGlobalEntry);
-    const allPageIds = getAllPageIds(pageFilesAll, pageConfigs);
-    const vikeConfigPublicGlobal = (0, resolveVikeConfigPublic_js_1.resolveVikeConfigPublicGlobal)({
-        pageConfigGlobalValues: pageConfigGlobal.configValues,
-    });
-    const vikeConfigPublicPagesEager = Object.fromEntries(pageConfigs.map((pageConfig) => {
-        return (0, resolveVikeConfigPublic_js_1.resolveVikeConfigPublicPageEagerLoaded)(pageConfigGlobal.configValues, pageConfig, pageConfig.configValues);
-    }));
-    return {
-        pageFilesAll,
-        allPageIds,
-        pageConfigs,
-        pageConfigGlobal,
-        vikeConfigPublicGlobal,
-        vikeConfigPublicPagesEager,
-    };
-}
 function getAllPageIds(pageFilesAll, pageConfigs) {
     const fileIds = pageFilesAll.filter(({ isDefaultPageFile }) => !isDefaultPageFile).map(({ pageId }) => pageId);
     const allPageIds = (0, utils_js_1.unique)(fileIds);

package/dist/cjs/shared/createPageContextShared.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPageContextShared = createPageContextShared;
 exports.createPageContextObject = createPageContextObject;
 const utils_js_1 = require("./utils.js");
-function createPageContextShared(pageContextCreated, vikeConfigPublicGlobal) {
-    (0, utils_js_1.objectAssign)(pageContextCreated, vikeConfigPublicGlobal);
+function createPageContextShared(pageContextCreated, globalConfigPublic) {
+    (0, utils_js_1.objectAssign)(pageContextCreated, globalConfigPublic);
     return pageContextCreated;
 }
 function createPageContextObject() {

package/dist/cjs/shared/page-configs/resolveVikeConfigPublic.js

@@ -1,57 +1,51 @@
 "use strict";
-// TO-DO/soon: rename PageConfig names
-// - Use `Internal` suffix, i.e. {Page,Global}ConfigInternal
-//   - While keeping {Page,Global}ConfigPublic or remove Public suffix and rename it to {Page,Global}Config ?
-// - rename EagerLoaded EagerlyLoaded
-// - remove `LazyLoaded` suffix
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveVikeConfigPublicGlobal = resolveVikeConfigPublicGlobal;
-exports.resolveVikeConfigPublicPageEagerLoaded = resolveVikeConfigPublicPageEagerLoaded;
-exports.resolveVikeConfigPublicPageLazyLoaded = resolveVikeConfigPublicPageLazyLoaded;
+exports.resolveGlobalConfigPublic = resolveGlobalConfigPublic;
+exports.resolvePageContextConfig = resolvePageContextConfig;
+exports.resolveGlobalContextConfig = resolveGlobalContextConfig;
 const assert_exports_old_design_js_1 = require("../getPageFiles/assert_exports_old_design.js");
 const getConfigDefinedAt_js_1 = require("./getConfigDefinedAt.js");
 const helpers_js_1 = require("./helpers.js");
 const utils_js_1 = require("../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-function resolveVikeConfigPublicPageEagerLoaded(pageConfigGlobalValues, pageConfig, pageConfigValues) {
-    const vikeConfigPublicPage_ = resolveVikeConfigPublic_base({ pageConfigGlobalValues, pageConfigValues });
-    const vikeConfigPublicPage = getPublicCopy(vikeConfigPublicPage_);
-    let page;
-    if (!pageConfig.isErrorPage) {
-        const route = vikeConfigPublicPage.config.route ?? pageConfig.routeFilesystem.routeString;
-        page = {
-            ...vikeConfigPublicPage,
-            route,
-        };
-    }
-    else {
-        page = {
-            ...vikeConfigPublicPage,
-            isErrorPage: true,
-        };
-    }
+function resolveGlobalConfigPublicPage(pageConfigGlobalValues, pageConfig, pageConfigValues) {
+    const pageConfigPublic_ = resolvePageConfigPublic({ pageConfigGlobalValues, pageConfigValues });
+    const pageConfigPublic = getPublicCopy(pageConfigPublic_);
+    const page = (() => {
+        if (!pageConfig.isErrorPage) {
+            const route = pageConfigPublic.config.route ?? pageConfig.routeFilesystem.routeString;
+            return {
+                ...pageConfigPublic,
+                route,
+            };
+        }
+        else {
+            return {
+                ...pageConfigPublic,
+                isErrorPage: true,
+            };
+        }
+    })();
     return [pageConfig.pageId, page];
 }
-function getPublicCopy(vikeConfigPublic) {
-    return {
-        config: vikeConfigPublic.config,
-        _source: vikeConfigPublic.source,
-        _sources: vikeConfigPublic.sources,
-        _from: vikeConfigPublic.from,
+function getPublicCopy(configInternal) {
+    const configPublic = {
+        config: configInternal.config,
+        // TO-DO/soon/flat-pageContext: expose publicly?
+        _source: configInternal.source,
+        _sources: configInternal.sources,
+        _from: configInternal.from,
     };
+    return configPublic;
 }
-function resolveVikeConfigPublic_base({ pageConfigGlobalValues, pageConfigValues, }) {
+function resolvePageConfigPublic({ pageConfigGlobalValues, pageConfigValues, }) {
     const configValues = { ...pageConfigGlobalValues, ...pageConfigValues };
-    return resolveVikeConfigPublic_V1Design({ configValues });
+    return resolveConfigPublic_V1Design({ configValues });
 }
-function resolveVikeConfigPublicGlobal({ pageConfigGlobalValues, }) {
-    const vikeConfigPublicGlobal = resolveVikeConfigPublic_V1Design({ configValues: pageConfigGlobalValues });
-    return getPublicCopy(vikeConfigPublicGlobal);
-}
-function resolveVikeConfigPublicPageLazyLoaded(pageFiles, // V0.4 design
+function resolvePageContextConfig(pageFiles, // V0.4 design
 pageConfig, // V1 design
 pageConfigGlobal) {
     const config = {};
@@ -78,7 +72,7 @@ pageConfigGlobal) {
     let sources;
     let from;
     if (pageConfig) {
-        const res = resolveVikeConfigPublic_base({
+        const res = resolvePageConfigPublic({
             pageConfigGlobalValues: pageConfigGlobal.configValues,
             pageConfigValues: pageConfig.configValues,
         });
@@ -113,7 +107,7 @@ pageConfigGlobal) {
     });
     (0, utils_js_1.assert)(!('default' in exports));
     (0, utils_js_1.assert)(!('default' in exportsAll));
-    const configPublicPageLazy = {
+    const pageContextAddendum = {
         config: config,
         from,
         source,
@@ -124,7 +118,7 @@ pageConfigGlobal) {
         exportsAll,
     };
     // TO-DO/next-major-release: remove
-    (0, utils_js_1.objectDefineProperty)(configPublicPageLazy, 'pageExports', {
+    (0, utils_js_1.objectDefineProperty)(pageContextAddendum, 'pageExports', {
         get: () => {
             // We only show the warning in Node.js because when using Client Routing Vue integration uses `Object.assign(pageContextReactive, pageContext)` which will wrongully trigger the warning. There is no cross-browser way to catch whether the property accessor was initiated by an `Object.assign()` call.
             if (!(0, utils_js_1.isBrowser)()) {
@@ -138,10 +132,33 @@ pageConfigGlobal) {
         enumerable: false,
         configurable: true,
     });
-    return configPublicPageLazy;
+    return pageContextAddendum;
+}
+function resolveGlobalContextConfig(pageConfigs, pageConfigGlobal) {
+    const globalContextAddendum = resolveGlobalConfigPublic(pageConfigs, pageConfigGlobal, (c) => c.configValues);
+    return globalContextAddendum;
+}
+function resolveGlobalConfigPublic(pageConfigs, pageConfigGlobal, getConfigValues) {
+    // global
+    const pageConfigGlobalValues = getConfigValues(pageConfigGlobal, true);
+    const globalConfigPublicBase_ = resolveConfigPublic_V1Design({ configValues: pageConfigGlobalValues });
+    const globalConfigPublicBase = getPublicCopy(globalConfigPublicBase_);
+    // pages
+    const pages = Object.fromEntries(pageConfigs.map((pageConfig) => {
+        const pageConfigValues = getConfigValues(pageConfig);
+        return resolveGlobalConfigPublicPage(pageConfigGlobalValues, pageConfig, pageConfigValues);
+    }));
+    const globalConfigPublic = {
+        ...globalConfigPublicBase,
+        pages,
+    };
+    return {
+        ...globalConfigPublic,
+        _globalConfigPublic: globalConfigPublic,
+    };
 }
 // V1 design
-function resolveVikeConfigPublic_V1Design(pageConfig) {
+function resolveConfigPublic_V1Design(pageConfig) {
     const config = {};
     const configEntries = {};
     const exportsAll = {};
@@ -229,6 +246,8 @@ function resolveVikeConfigPublic_V1Design(pageConfig) {
         from,
     };
 }
+// V0.4 design
+// TO-DO/next-major-release: remove
 function getExportValues(pageFile) {
     const { filePath, fileExports } = pageFile;
     (0, utils_js_1.assert)(fileExports); // assume pageFile.loadFile() was called

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.238';
+exports.PROJECT_VERSION = '0.4.239-commit-050a4a3';