vike 0.4.221 → 0.4.222-commit-6647d1e

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js

@@ -37,6 +37,7 @@ function reloadVikeConfig(config) {
     const userRootDir = config.root;
     const vikeVitePluginOptions = config._vikeVitePluginOptions;
     (0, utils_js_1.assert)(vikeVitePluginOptions);
+    // TODO/now: unify with esbuildCache
     vikeConfigDependencies.clear();
     vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, true, vikeVitePluginOptions);
     handleReloadSideEffects();
@@ -132,7 +133,8 @@ async function loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePlug
                     configDefinitions: {},
                     configValueSources: {}
                 },
-                global: (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyNew)({ configValues: {} })
+                global: (0, getPageConfigUserFriendly_js_1.getPageConfigGlobalUserFriendly)({ pageConfigGlobalValues: {} }),
+                pages: {}
             };
             return dummyData;
         }
@@ -141,15 +143,20 @@ async function loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePlug
 async function loadVikeConfig(userRootDir, vikeVitePluginOptions) {
     const esbuildCache = {};
     const plusFilesAll = await (0, getPlusFilesAll_js_1.getPlusFilesAll)(userRootDir, esbuildCache);
-    assertKnownConfigs(plusFilesAll);
     const configDefinitionsResolved = await resolveConfigDefinitions(plusFilesAll, userRootDir, esbuildCache);
+    assertKnownConfigs(configDefinitionsResolved, plusFilesAll);
     const { pageConfigGlobal, pageConfigs } = getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRootDir);
     // interop vike(options) in vite.config.js
     temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, userRootDir);
     // global
-    const configValues = getConfigValues(pageConfigGlobal);
-    const global = (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyNew)({ configValues });
-    return { pageConfigs, pageConfigGlobal, global };
+    const pageConfigGlobalValues = getConfigValues(pageConfigGlobal);
+    const global = (0, getPageConfigUserFriendly_js_1.getPageConfigGlobalUserFriendly)({ pageConfigGlobalValues });
+    // pages
+    const pages = (0, utils_js_1.objectFromEntries)(pageConfigs.map((pageConfig) => {
+        const pageConfigValues = getConfigValues(pageConfig, true);
+        return (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendly)(pageConfigGlobalValues, pageConfig, pageConfigValues);
+    }));
+    return { pageConfigs, pageConfigGlobal, global, pages };
 }
 async function resolveConfigDefinitions(plusFilesAll, userRootDir, esbuildCache) {
     const configDefinitionsGlobal = getConfigDefinitions(
@@ -212,13 +219,12 @@ function getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRo
                 return;
             configValueSources[configName] = sources;
         });
-        const { routeFilesystem, isErrorPage } = determineRouteFilesystem(locationId, configValueSources);
+        const pageConfigRoute = determineRouteFilesystem(locationId, configValueSources);
         applyEffectsAll(configValueSources, configDefinitionsLocal);
         const configValuesComputed = getComputed(configValueSources, configDefinitionsLocal);
         const pageConfig = {
             pageId: locationId,
-            isErrorPage,
-            routeFilesystem,
+            ...pageConfigRoute,
             configDefinitions: configDefinitionsLocal,
             plusFiles: plusFilesRelevant,
             configValueSources,
@@ -235,10 +241,9 @@ function assertPageConfigGlobal(pageConfigGlobal, plusFilesAll) {
     });
 }
 function assertGlobalConfigLocation(configName, sources, plusFilesAll, configDefinitionsGlobal) {
-    const locationIdsAll = (0, utils_js_1.objectKeys)(plusFilesAll);
     // Determine existing global +config.js files
     const configFilePathsGlobal = [];
-    const plusFilesGlobal = Object.values((0, utils_js_1.objectFromEntries)((0, utils_js_1.objectEntries)(plusFilesAll).filter(([locationId]) => (0, filesystemRouting_js_1.isGlobalLocation)(locationId, locationIdsAll)))).flat();
+    const plusFilesGlobal = Object.values((0, utils_js_1.objectFromEntries)((0, utils_js_1.objectEntries)(plusFilesAll).filter(([locationId]) => isGlobalLocation(locationId, plusFilesAll)))).flat();
     plusFilesGlobal
         .filter((i) => i.isConfigFile)
         .forEach((plusFile) => {
@@ -257,7 +262,7 @@ function assertGlobalConfigLocation(configName, sources, plusFilesAll, configDef
         if (!filePathAbsoluteUserRootDir)
             return;
         (0, utils_js_1.assert)(!plusFile.isExtensionConfig);
-        if (!(0, filesystemRouting_js_1.isGlobalLocation)(source.locationId, locationIdsAll)) {
+        if (!isGlobalLocation(source.locationId, plusFilesAll)) {
             const configDef = configDefinitionsGlobal[configName];
             (0, utils_js_1.assert)(configDef);
             const isConditionallyGlobal = (0, utils_js_1.isCallable)(configDef.global);
@@ -290,7 +295,7 @@ 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) {
+function getConfigValues(pageConfig, tolerateMissingValue) {
     const configValues = {};
     (0, serializeConfigValues_js_1.getConfigValuesBase)(pageConfig, (configEnv) => !!configEnv.config, null).forEach((entry) => {
         if (entry.configValueBase.type === 'computed') {
@@ -301,7 +306,11 @@ function getConfigValues(pageConfig) {
         if (entry.configValueBase.type === 'standard') {
             (0, utils_js_1.assert)('sourceRelevant' in entry); // Help TS
             const { configValueBase, sourceRelevant, configName } = entry;
-            (0, utils_js_1.assert)('value' in sourceRelevant);
+            if (!sourceRelevant.valueIsLoaded) {
+                if (tolerateMissingValue)
+                    return;
+                (0, utils_js_1.assert)(false);
+            }
             const { value } = sourceRelevant;
             configValues[configName] = { ...configValueBase, value };
         }
@@ -310,9 +319,18 @@ function getConfigValues(pageConfig) {
             const { configValueBase, sourcesRelevant, configName } = entry;
             const values = [];
             sourcesRelevant.forEach((source) => {
-                (0, utils_js_1.assert)('value' in source);
+                if (!source.valueIsLoaded) {
+                    if (tolerateMissingValue)
+                        return;
+                    (0, utils_js_1.assert)(false);
+                }
                 values.push(source.value);
             });
+            if (values.length === 0) {
+                if (tolerateMissingValue)
+                    return;
+                (0, utils_js_1.assert)(false);
+            }
             configValues[configName] = { ...configValueBase, value: values };
         }
     });
@@ -357,10 +375,9 @@ function getPlusFilesRelevant(plusFilesAll, locationIdPage) {
     return plusFilesRelevant;
 }
 function sortForGlobal(plusFilesAll) {
-    const locationIdsAll = (0, utils_js_1.objectKeys)(plusFilesAll);
     const plusFilesAllSorted = Object.fromEntries((0, utils_js_1.objectEntries)(plusFilesAll)
         .sort((0, utils_js_1.lowerFirst)(([locationId]) => locationId.split('/').length))
-        .sort((0, utils_js_1.makeFirst)(([locationId]) => (0, filesystemRouting_js_1.isGlobalLocation)(locationId, locationIdsAll))));
+        .sort((0, utils_js_1.makeFirst)(([locationId]) => isGlobalLocation(locationId, plusFilesAll))));
     return plusFilesAllSorted;
 }
 function resolveConfigValueSources(configName, configDef, plusFilesRelevant, userRootDir, isGlobal) {
@@ -754,13 +771,13 @@ function getComputed(configValueSources, configDefinitions) {
     return configValuesComputed;
 }
 // Show error message upon unknown config
-function assertKnownConfigs(plusFilesAll) {
+function assertKnownConfigs(configDefinitionsResolved, plusFilesAll) {
     const configDefinitionsAll = getConfigDefinitions(plusFilesAll);
     const configNamesKnownAll = Object.keys(configDefinitionsAll);
-    (0, utils_js_1.objectEntries)(plusFilesAll).forEach(([locationId, plusFiles]) => {
-        const plusFilesRelevant = getPlusFilesRelevant(plusFilesAll, locationId);
-        const configDefinitionsLocal = getConfigDefinitions(plusFilesRelevant);
-        const configNamesKnownLocal = Object.keys(configDefinitionsLocal);
+    const configNamesGlobal = Object.keys(configDefinitionsResolved.configDefinitionsGlobal);
+    (0, utils_js_1.objectEntries)(configDefinitionsResolved.configDefinitionsLocal).forEach(([_locationId, { configDefinitions, plusFiles }]) => {
+        const configDefinitionsLocal = configDefinitions;
+        const configNamesKnownLocal = [...Object.keys(configDefinitionsLocal), ...configNamesGlobal];
         plusFiles.forEach((plusFile) => {
             const configNames = getDefiningConfigNames(plusFile);
             configNames.forEach((configName) => {
@@ -932,3 +949,10 @@ function resolveConfigEnv(configEnv, filePath) {
     }
     return configEnvResolved;
 }
+/** Whether configs defined in `locationId` apply to every page */
+function isGlobalLocation(locationId, plusFilesAll) {
+    const locationIdsPage = (0, utils_js_1.objectEntries)(plusFilesAll)
+        .filter(([_locationId, plusFiles]) => isDefiningPage(plusFiles))
+        .map(([locationId]) => locationId);
+    return locationIdsPage.every((locId) => (0, filesystemRouting_js_1.isInherited)(locationId, locId));
+}

package/dist/cjs/node/runtime/globalContext.js

@@ -21,7 +21,7 @@ exports.assertBuildInfo = assertBuildInfo;
 exports.getViteConfigRuntime = getViteConfigRuntime;
 exports.updateUserFiles = updateUserFiles;
 // The core logic revolves around:
-// - globalObject.userFiles which is the main requirement for assembleGlobalContext()
+// - globalObject.userFiles which is the main requirement for resolveGlobalContext()
 // - In production: globalObject.buildEntry which is the production entry set by @brillout/vite-plugin-server-entry
 //   - loadBuildEntry() sets globalObject.buildEntry and then sets globalObject.userFiles
 //   - With vike-server it's set at server start: @brillout/vite-plugin-server-entry injects `import './entry.mjs'` (the production entry generated by @brillout/vite-plugin-server-entry) as first line of code of dist/server/index.mjs while dist/server/entry.mjs calls setGlobalContext_buildEntry()
@@ -35,6 +35,7 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const loadPageRoutes_js_1 = require("../../shared/route/loadPageRoutes.js");
 const assertV1Design_js_1 = require("../shared/assertV1Design.js");
 const getPageConfigsRuntime_js_1 = require("../../shared/getPageConfigsRuntime.js");
+const resolveBase_js_1 = require("../shared/resolveBase.js");
 const debug = (0, utils_js_1.createDebugger)('vike:globalContext');
 const globalObject = (0, utils_js_1.getGlobalObject)('globalContext.ts', getInitialGlobalContext());
 async function getGlobalContextInternal() {
@@ -78,8 +79,14 @@ async function getGlobalContextAsync(isProduction) {
     return globalContext_public;
 }
 function makePublic(globalContext) {
-    // TODO/soon: add `pages`
-    const globalContextPublic = (0, utils_js_1.makePublicCopy)(globalContext, 'globalContext', ['assetsManifest', 'config', 'viteConfig']);
+    const globalContextPublic = (0, utils_js_1.makePublicCopy)(globalContext, 'globalContext', [
+        'assetsManifest',
+        'config',
+        'viteConfig',
+        'pages',
+        'baseServer',
+        'baseAssets'
+    ]);
     return globalContextPublic;
 }
 async function setGlobalContext_viteDevServer(viteDevServer) {
@@ -183,7 +190,7 @@ function setIsProduction(isProduction) {
     globalObject.isProduction = isProduction;
 }
 function defineGlobalContext() {
-    const globalContext = assembleGlobalContext();
+    const globalContext = resolveGlobalContext();
     assertIsDefined(globalContext);
     const globalContext_public = makePublic(globalContext);
     (0, utils_js_1.objectAssign)(globalContext, { globalContext_public });
@@ -192,7 +199,7 @@ function defineGlobalContext() {
     assertGlobalContextIsDefined();
     (0, utils_js_1.onSetupRuntime)();
 }
-function assembleGlobalContext() {
+function resolveGlobalContext() {
     const { viteDevServer, viteConfig, isPrerendering, isProduction, userFiles } = globalObject;
     (0, utils_js_1.assert)(typeof isProduction === 'boolean');
     let globalContext;
@@ -211,7 +218,8 @@ function assembleGlobalContext() {
             viteDevServer,
             viteConfig,
             ...userFiles,
-            viteConfigRuntime
+            viteConfigRuntime,
+            ...resolveBaseRuntime(viteConfigRuntime, userFiles.config)
         };
     }
     else {
@@ -228,7 +236,8 @@ function assembleGlobalContext() {
             ...userFiles,
             viteDevServer: null,
             viteConfigRuntime: buildInfo.viteConfigRuntime,
-            usesClientRouter: buildInfo.usesClientRouter
+            usesClientRouter: buildInfo.usesClientRouter,
+            ...resolveBaseRuntime(buildInfo.viteConfigRuntime, userFiles.config)
         };
         if (isPrerendering) {
             (0, utils_js_1.assert)(viteConfig);
@@ -253,7 +262,7 @@ async function getUserFiles() {
     const globalObject_ = globalObject;
     const { pageConfigsRuntime } = globalObject_;
     (0, utils_js_1.assert)(pageConfigsRuntime);
-    const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, globalConfig } = pageConfigsRuntime;
+    const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, globalConfig, pageConfigsUserFriendly } = pageConfigsRuntime;
     const { pageRoutes, onBeforeRouteHook } = await (0, loadPageRoutes_js_1.loadPageRoutes)(pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds);
     const userFiles = {
         pageFilesAll,
@@ -262,6 +271,7 @@ async function getUserFiles() {
         allPageIds,
         pageRoutes,
         onBeforeRouteHook,
+        pages: pageConfigsUserFriendly,
         config: globalConfig.config
     };
     (0, assertV1Design_js_1.assertV1Design)(
@@ -396,3 +406,9 @@ function getInitialGlobalContext() {
         viteDevServerPromiseResolve
     };
 }
+function resolveBaseRuntime(viteConfigRuntime, config) {
+    const baseViteOriginal = viteConfigRuntime._baseViteOriginal;
+    const baseServerUnresolved = config.baseServer ?? null;
+    const baseAssetsUnresolved = config.baseAssets ?? null;
+    return (0, resolveBase_js_1.resolveBase)(baseViteOriginal, baseServerUnresolved, baseAssetsUnresolved);
+}

package/dist/cjs/node/runtime/renderPage/loadUserFilesServerSide.js

@@ -14,7 +14,7 @@ async function loadUserFilesServerSide(pageContext) {
     const pageConfig = (0, findPageConfig_js_1.findPageConfig)(pageContext._pageConfigs, pageContext.pageId); // Make pageConfig globally available as pageContext._pageConfig?
     const globalContext = pageContext._globalContext;
     const [{ pageFilesLoaded, pageContextExports }] = await Promise.all([
-        loadPageUserFiles(pageContext._pageFilesAll, pageConfig, pageContext.pageId, !globalContext.isProduction),
+        loadPageUserFiles(pageContext._pageFilesAll, pageConfig, globalContext.pageConfigGlobal, pageContext.pageId, !globalContext.isProduction),
         (0, analyzePageClientSide_js_1.analyzePageClientSideInit)(pageContext._pageFilesAll, pageContext.pageId, { sharedPageFilesAlreadyLoaded: true })
     ]);
     const { isHtmlOnly, isClientRouting, clientEntries, clientDependencies, pageFilesClientSide, pageFilesServerSide } = await (0, analyzePage_js_1.analyzePage)(pageContext._pageFilesAll, pageConfig, pageContext.pageId, globalContext);
@@ -98,11 +98,11 @@ async function loadUserFilesServerSide(pageContext) {
     }
     return pageContextAddendum;
 }
-async function loadPageUserFiles(pageFilesAll, pageConfig, pageId, isDev) {
+async function loadPageUserFiles(pageFilesAll, pageConfig, pageConfigGlobal, pageId, isDev) {
     const pageFilesServerSide = (0, getPageFiles_js_1.getPageFilesServerSide)(pageFilesAll, pageId);
     const pageConfigLoaded = !pageConfig ? null : await (0, loadConfigValues_js_1.loadConfigValues)(pageConfig, isDev);
     await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
-    const pageContextExports = (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyOld)(pageFilesServerSide, pageConfigLoaded);
+    const pageContextExports = (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendly_oldDesign)(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
     return {
         pageContextExports,
         pageFilesLoaded: pageFilesServerSide

package/dist/cjs/node/runtime/renderPage/renderPageAlreadyRouted.js

@@ -22,7 +22,6 @@ const preparePageContextForUserConsumptionServerSide_js_1 = require("./preparePa
 const executeGuardHook_js_1 = require("../../../shared/route/executeGuardHook.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const isServerSideError_js_1 = require("../../../shared/misc/isServerSideError.js");
-const resolveBase_js_1 = require("../../shared/resolveBase.js");
 async function renderPageAlreadyRouted(pageContext) {
     // pageContext.pageId can either be the:
     //  - ID of the page matching the routing, or the
@@ -117,14 +116,13 @@ async function getPageContextInitEnhanced(pageContextInit, globalContext, { ssr:
     isClientSideNavigation: false
 } } = {}) {
     (0, utils_js_1.assert)(pageContextInit.urlOriginal);
-    const { baseServer, baseAssets } = (0, resolveBase_js_1.resolveBaseRuntime)(globalContext);
     const pageContextInitEnhanced = {};
     (0, utils_js_1.objectAssign)(pageContextInitEnhanced, pageContextInit);
     (0, utils_js_1.objectAssign)(pageContextInitEnhanced, {
         _objectCreatedByVike: true,
         // The following is defined on `pageContext` because we can eventually make these non-global
-        _baseServer: baseServer,
-        _baseAssets: baseAssets,
+        _baseServer: globalContext.baseServer,
+        _baseAssets: globalContext.baseAssets,
         // TODO/now: add meta.default
         _includeAssetsImportedByServer: globalContext.config.includeAssetsImportedByServer ?? true,
         // TODO/soon: use GloablContext instead

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

@@ -23,7 +23,6 @@ const error_page_js_1 = require("../../shared/error-page.js");
 const handleErrorWithoutErrorPage_js_1 = require("./renderPage/handleErrorWithoutErrorPage.js");
 const loadUserFilesServerSide_js_1 = require("./renderPage/loadUserFilesServerSide.js");
 const resolveRedirects_js_1 = require("./renderPage/resolveRedirects.js");
-const resolveBase_js_1 = require("../shared/resolveBase.js");
 const globalObject = (0, utils_js_1.getGlobalObject)('runtime/renderPage.ts', {
     httpRequestsCount: 0
 });
@@ -343,7 +342,6 @@ function assertIsNotViteRequest(urlPathname, urlOriginal) {
     (0, utils_js_1.assertUsage)(false, `${picocolors_1.default.code('renderPage(pageContextInit)')} called with ${picocolors_1.default.code(`pageContextInit.urlOriginal===${JSON.stringify(urlOriginal)}`)} which is unexpected because the URL ${picocolors_1.default.bold(urlOriginal)} should have already been handled by the development middleware: make sure the ${picocolors_1.default.cyan('createDevMiddleware()')} middleware is executed *before* the ${picocolors_1.default.cyan('renderPage()')} middleware, see ${picocolors_1.default.underline('https://vike.dev/renderPage')}`);
 }
 async function normalizeUrl(pageContextInit, globalContext, httpRequestId) {
-    const { baseServer } = (0, resolveBase_js_1.resolveBaseRuntime)(globalContext);
     const { trailingSlash, disableUrlNormalization } = globalContext.config;
     if (disableUrlNormalization)
         return null;
@@ -351,7 +349,7 @@ async function normalizeUrl(pageContextInit, globalContext, httpRequestId) {
     const { isPageContextRequest } = (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(urlOriginal);
     if (isPageContextRequest)
         return null;
-    const urlNormalized = (0, utils_js_1.normalizeUrlPathname)(urlOriginal, trailingSlash ?? false, baseServer);
+    const urlNormalized = (0, utils_js_1.normalizeUrlPathname)(urlOriginal, trailingSlash ?? false, globalContext.baseServer);
     if (!urlNormalized)
         return null;
     (0, loggerRuntime_js_1.logRuntimeInfo)?.(`URL normalized from ${picocolors_1.default.cyan(urlOriginal)} to ${picocolors_1.default.cyan(urlNormalized)} (https://vike.dev/url-normalization)`, httpRequestId, 'info');
@@ -361,8 +359,7 @@ async function normalizeUrl(pageContextInit, globalContext, httpRequestId) {
     return pageContextHttpResponse;
 }
 async function getPermanentRedirect(pageContextInit, globalContext, httpRequestId) {
-    const { baseServer } = (0, resolveBase_js_1.resolveBaseRuntime)(globalContext);
-    const urlWithoutBase = (0, utils_js_1.removeBaseServer)(pageContextInit.urlOriginal, baseServer);
+    const urlWithoutBase = (0, utils_js_1.removeBaseServer)(pageContextInit.urlOriginal, globalContext.baseServer);
     let origin = null;
     let urlTargetExternal = null;
     let urlTarget = (0, utils_js_1.modifyUrlPathname)(urlWithoutBase, (urlPathname) => {
@@ -393,9 +390,8 @@ async function getPermanentRedirect(pageContextInit, globalContext, httpRequestI
         }
         if (normalize(urlTarget) === normalize(urlWithoutBase))
             return null;
-        const { baseServer } = (0, resolveBase_js_1.resolveBaseRuntime)(globalContext);
         if (!originChanged)
-            urlTarget = (0, utils_js_1.prependBase)(urlTarget, baseServer);
+            urlTarget = (0, utils_js_1.prependBase)(urlTarget, globalContext.baseServer);
         (0, utils_js_1.assert)(urlTarget !== pageContextInit.urlOriginal);
     }
     (0, loggerRuntime_js_1.logRuntimeInfo)?.(`Permanent redirection defined by config.redirects (https://vike.dev/redirects)`, httpRequestId, 'info');
@@ -459,7 +455,7 @@ pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit, globalConte
     return { pageContextAbort };
 }
 async function assertBaseUrl(pageContextInit, globalContext) {
-    const { baseServer } = (0, resolveBase_js_1.resolveBaseRuntime)(globalContext);
+    const { baseServer } = globalContext;
     const { urlOriginal } = pageContextInit;
     const { urlWithoutPageContextRequestSuffix } = (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(urlOriginal);
     const { hasBaseServer } = (0, utils_js_1.parseUrl)(urlWithoutPageContextRequestSuffix, baseServer);

package/dist/cjs/node/runtime-dev/createDevMiddleware.js

@@ -11,7 +11,7 @@ const globalContext_js_1 = require("../runtime/globalContext.js");
  */
 async function createDevMiddleware(options = {}) {
     (0, globalContext_js_1.setGlobalContext_isProduction)(false);
-    const viteConfig = {
+    const viteConfigFromOptions = {
         ...options.viteConfig,
         server: {
             ...options.viteConfig?.server,
@@ -19,8 +19,8 @@ async function createDevMiddleware(options = {}) {
         }
     };
     if (options.root)
-        viteConfig.root = options.root;
-    const { viteConfigEnhanced } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(viteConfig, 'dev');
+        viteConfigFromOptions.root = options.root;
+    const { viteConfigEnhanced } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(viteConfigFromOptions, 'dev');
     const server = await (0, vite_1.createServer)(viteConfigEnhanced);
     const devMiddleware = server.middlewares;
     return { devMiddleware, viteServer: server, viteConfig: server.config };

package/dist/cjs/node/shared/resolveBase.js

@@ -4,21 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveBase = resolveBase;
-exports.resolveBaseRuntime = resolveBaseRuntime;
-exports.resolveBaseFromResolvedConfig = resolveBaseFromResolvedConfig;
 const utils_js_1 = require("./utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-function resolveBaseFromResolvedConfig(baseServer, baseAssets, config) {
-    let baseViteOriginal = config._baseViteOriginal;
-    (0, utils_js_1.assert)(baseViteOriginal === null || typeof baseViteOriginal == 'string');
-    return resolveBase(baseViteOriginal, baseServer, baseAssets);
-}
-function resolveBaseRuntime(globalContext) {
-    const baseViteOriginal = globalContext.viteConfigRuntime._baseViteOriginal;
-    const baseServerUnresolved = globalContext.config.baseServer ?? null;
-    const baseAssetsUnresolved = globalContext.config.baseAssets ?? null;
-    return resolveBase(baseViteOriginal, baseServerUnresolved, baseAssetsUnresolved);
-}
 function resolveBase(baseViteOriginal, baseServerUnresolved, baseAssetsUnresolved) {
     if (baseViteOriginal === '/__UNSET__')
         baseViteOriginal = null;

package/dist/cjs/shared/getPageConfigsRuntime.js

@@ -9,8 +9,11 @@ function getPageConfigsRuntime(virtualFileExports) {
     const { pageFilesAll, pageConfigs, pageConfigGlobal } = (0, parseGlobResults_js_1.parseGlobResults)(virtualFileExports);
     const allPageIds = getAllPageIds(pageFilesAll, pageConfigs);
     // TODO/now: re-use this call, instead of calling it twice
-    const globalConfig = (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyNew)(pageConfigGlobal);
-    return { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, globalConfig };
+    const globalConfig = (0, getPageConfigUserFriendly_js_1.getPageConfigGlobalUserFriendly)({ pageConfigGlobalValues: pageConfigGlobal.configValues });
+    const pageConfigsUserFriendly = Object.fromEntries(pageConfigs.map((pageConfig) => {
+        return (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendly)(pageConfigGlobal.configValues, pageConfig, pageConfig.configValues);
+    }));
+    return { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, globalConfig, pageConfigsUserFriendly };
 }
 function getAllPageIds(pageFilesAll, pageConfigs) {
     const fileIds = pageFilesAll.filter(({ isDefaultPageFile }) => !isDefaultPageFile).map(({ pageId }) => pageId);

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

@@ -3,23 +3,54 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPageConfigUserFriendlyOld = getPageConfigUserFriendlyOld;
-exports.getPageConfigUserFriendlyNew = getPageConfigUserFriendlyNew;
+exports.getPageConfigUserFriendly = getPageConfigUserFriendly;
+exports.getPageConfigUserFriendly_oldDesign = getPageConfigUserFriendly_oldDesign;
+exports.getPageConfigGlobalUserFriendly = getPageConfigGlobalUserFriendly;
 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 getPageConfigUserFriendlyNew(pageConfig) {
-    const res = getPageConfigUserFriendlyV1Desin(pageConfig);
+function getPageConfigUserFriendly(pageConfigGlobalValues, pageConfig, pageConfigValues) {
+    const pageConfigUserFriendly = getPageConfigUserFriendly_public({ pageConfigGlobalValues, pageConfigValues });
+    let page;
+    if (!pageConfig.isErrorPage) {
+        const route = pageConfigUserFriendly.config.route ?? pageConfig.routeFilesystem.routeString;
+        page = {
+            ...pageConfigUserFriendly,
+            route
+        };
+    }
+    else {
+        page = {
+            ...pageConfigUserFriendly,
+            isErrorPage: true
+        };
+    }
+    return [pageConfig.pageId, page];
+}
+function getPageConfigUserFriendly_public({ pageConfigGlobalValues, pageConfigValues }) {
+    const pageConfigUserFriendly = getPageConfigUserFriendly_base({ pageConfigGlobalValues, pageConfigValues });
+    return getPublicCopy(pageConfigUserFriendly);
+}
+function getPublicCopy(pageConfigUserFriendly) {
+    const p = pageConfigUserFriendly;
     return {
-        config: res.config,
-        _source: res.source,
-        _sources: res.sources,
-        _from: res.from
+        config: p.config,
+        _source: p.source,
+        _sources: p.sources,
+        _from: p.from
     };
 }
-function getPageConfigUserFriendlyOld(pageFiles, pageConfig) {
+function getPageConfigUserFriendly_base({ pageConfigGlobalValues, pageConfigValues }) {
+    const configValues = { ...pageConfigGlobalValues, ...pageConfigValues };
+    return getPageConfigUserFriendly_V1Design({ configValues });
+}
+function getPageConfigGlobalUserFriendly({ pageConfigGlobalValues }) {
+    const pageConfigGlobalUserFriendly = getPageConfigUserFriendly_V1Design({ configValues: pageConfigGlobalValues });
+    return getPublicCopy(pageConfigGlobalUserFriendly);
+}
+function getPageConfigUserFriendly_oldDesign(pageFiles, pageConfig, pageConfigGlobal) {
     const config = {};
     const configEntries = {}; // TODO/v1-release: remove
     const exportsAll = {}; // TODO/v1-release: remove
@@ -44,7 +75,10 @@ function getPageConfigUserFriendlyOld(pageFiles, pageConfig) {
     let sources;
     let from;
     if (pageConfig) {
-        const res = getPageConfigUserFriendlyV1Desin(pageConfig);
+        const res = getPageConfigUserFriendly_base({
+            pageConfigGlobalValues: pageConfigGlobal.configValues,
+            pageConfigValues: pageConfig.configValues
+        });
         source = res.source;
         sources = res.sources;
         from = res.from;
@@ -90,7 +124,7 @@ function getPageConfigUserFriendlyOld(pageFiles, pageConfig) {
     return pageContextExports;
 }
 // V1 design
-function getPageConfigUserFriendlyV1Desin(pageConfig) {
+function getPageConfigUserFriendly_V1Design(pageConfig) {
     const config = {};
     const configEntries = {};
     const exportsAll = {};

package/dist/cjs/shared/page-configs/serialize/parsePageConfigs.js

@@ -14,15 +14,9 @@ function parsePageConfigs(pageConfigsSerialized, pageConfigGlobalSerialized) {
     // pageConfigs
     const pageConfigs = pageConfigsSerialized.map((pageConfigSerialized) => {
         const configValues = parseConfigValuesSerialized(pageConfigSerialized.configValuesSerialized);
-        const { pageId, isErrorPage, routeFilesystem, loadConfigValuesAll } = pageConfigSerialized;
         assertRouteConfigValue(configValues);
-        return {
-            pageId,
-            isErrorPage,
-            routeFilesystem,
-            configValues,
-            loadConfigValuesAll
-        };
+        const pageConfig = { ...pageConfigSerialized, configValues };
+        return pageConfig;
     });
     // pageConfigsGlobal
     const pageConfigGlobal = { configValues: {} };

package/dist/cjs/shared/route/loadPageRoutes.js

@@ -10,7 +10,7 @@ const getConfigDefinedAt_js_1 = require("../page-configs/getConfigDefinedAt.js")
 const resolveRouteFunction_js_1 = require("./resolveRouteFunction.js");
 const getHook_js_1 = require("../hooks/getHook.js");
 async function loadPageRoutes(
-// Remove all arguments and use GlobalContext instead?
+// Remove all arguments and use GlobalContextInternal instead?
 pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds) {
     // TODO/next-major: remove & make this function sync
     await Promise.all(pageFilesAll.filter((p) => p.fileType === '.page.route').map((p) => p.loadFile?.()));

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.221';
+exports.PROJECT_VERSION = '0.4.222-commit-6647d1e';

package/dist/cjs/utils/assertSingleInstance.js

@@ -27,7 +27,7 @@ function assertSingleInstance() {
         const versions = (0, unique_js_1.unique)(globalObject.instances);
         assertUsage(versions.length <= 1, 
         // DO *NOT* patch vike to remove this error: because of multiple conflicting versions, you *will* eventually encounter insidious issues that hard to debug and potentially a security hazard, see for example https://github.com/vikejs/vike/issues/1108
-        `vike@${picocolors_1.default.bold(versions[0])} and vike@${picocolors_1.default.bold(versions[1])} loaded but only one version should be loaded`);
+        `vike@${picocolors_1.default.bold(versions[0])} and vike@${picocolors_1.default.bold(versions[1])} loaded but it's forbidden to load different versions`);
     }
     if (globalObject.checkSingleInstance && globalObject.instances.length > 1) {
         /*/ Not sure whether circular dependency can cause problems? In principle not since client-side code is ESM.

package/dist/cjs/utils/debug.js

@@ -17,7 +17,9 @@ const isArray_js_1 = require("./isArray.js");
 (0, assert_js_1.assert)(!(0, isBrowser_js_1.isBrowser)());
 globalThis.__brillout_debug_createDebugger = createDebugger;
 const flags = [
+    'vike:crawl',
     'vike:error',
+    'vike:esbuild-resolve',
     'vike:extractAssets',
     'vike:extractExportNames',
     'vike:glob',
@@ -30,9 +32,9 @@ const flags = [
     'vike:routing',
     'vike:setup',
     'vike:stream',
-    'vike:virtual-files',
-    'vike:esbuild-resolve'
+    'vike:virtual-files'
 ];
+const flagsSkipWildcard = ['vike:log'];
 const flagRegex = /\bvike:[a-zA-Z-]+/g;
 assertFlagsActivated();
 function createDebugger(flag, optionsGlobal) {
@@ -77,8 +79,8 @@ function debug_(flag, options, ...msgs) {
 function isDebugActivated(flag) {
     (0, checkType_js_1.checkType)(flag);
     (0, assert_js_1.assert)(flags.includes(flag));
-    const flagsActivated = getFlagsActivated();
-    const isActivated = flagsActivated.includes(flag);
+    const { flagsActivated, all } = getFlagsActivated();
+    const isActivated = flagsActivated.includes(flag) || (all && !flagsSkipWildcard.includes(flag));
     return isActivated;
 }
 function formatMsg(info, options, padding, position) {
@@ -142,7 +144,7 @@ function replaceFunctionSerializer(_key, value) {
     return value;
 }
 function assertFlagsActivated() {
-    const flagsActivated = getFlagsActivated();
+    const { flagsActivated } = getFlagsActivated();
     flagsActivated.forEach((flag) => {
         (0, assert_js_1.assertUsage)(flags.includes(flag), `Unknown DEBUG flag ${picocolors_1.default.cyan(flag)}. Valid flags:\n${flags.map((f) => `  ${picocolors_1.default.cyan(f)}`).join('\n')}`);
     });
@@ -150,7 +152,8 @@ function assertFlagsActivated() {
 function getFlagsActivated() {
     const DEBUG = getDEBUG() ?? '';
     const flagsActivated = DEBUG.match(flagRegex) ?? [];
-    return flagsActivated;
+    const all = DEBUG.includes('vike:*');
+    return { flagsActivated, all };
 }
 function getDEBUG() {
     let DEBUG;

package/dist/esm/client/client-routing-runtime/getPageContextCurrent.d.ts

@@ -1,7 +1,7 @@
 export { setPageContextCurrent };
 export { getPageContextCurrent };
-import type { PageConfigUserFriendly } from '../../shared/getPageFiles.js';
-type PageContextCurrent = PageConfigUserFriendly & {
+import type { PageConfigUserFriendlyOld } from '../../shared/getPageFiles.js';
+type PageContextCurrent = PageConfigUserFriendlyOld & {
     urlPathname: string;
 };
 declare function getPageContextCurrent(): null | PageContextCurrent;