vike 0.4.220-commit-af5c91f → 0.4.221-commit-8577456

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

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleErrorWithoutErrorPage = handleErrorWithoutErrorPage;
 const stringify_1 = require("@brillout/json-serializer/stringify");
-const globalContext_js_1 = require("../globalContext.js");
 const utils_js_1 = require("../utils.js");
 const createHttpResponse_js_1 = require("./createHttpResponse.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
@@ -15,7 +14,7 @@ async function handleErrorWithoutErrorPage(pageContext) {
     (0, utils_js_1.assert)(pageContext.errorWhileRendering || pageContext.is404);
     {
         const isV1 = pageContext._pageConfigs.length > 0;
-        warnMissingErrorPage(isV1);
+        await warnMissingErrorPage(isV1, pageContext._globalContext.isProduction);
     }
     if (!pageContext.isClientSideNavigation) {
         const httpResponse = (0, createHttpResponse_js_1.createHttpResponseError)(pageContext);
@@ -30,9 +29,8 @@ async function handleErrorWithoutErrorPage(pageContext) {
         return pageContext;
     }
 }
-function warnMissingErrorPage(isV1) {
-    const globalContext = (0, globalContext_js_1.getGlobalContext)();
-    if (!globalContext.isProduction) {
+async function warnMissingErrorPage(isV1, isProduction) {
+    if (!isProduction) {
         const msg = [
             `No ${isV1 ? 'error page' : picocolors_1.default.cyan('_error.page.js')} found,`,
             'we recommend defining one',

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

@@ -2,21 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadUserFilesServerSide = loadUserFilesServerSide;
 const getPageFiles_js_1 = require("../../../shared/getPageFiles.js");
+const getPageConfigUserFriendly_js_1 = require("../../../shared/page-configs/getPageConfigUserFriendly.js");
 const analyzePageClientSide_js_1 = require("../../../shared/getPageFiles/analyzePageClientSide.js");
 const utils_js_1 = require("../utils.js");
 const getPageAssets_js_1 = require("./getPageAssets.js");
 const debugPageFiles_js_1 = require("./debugPageFiles.js");
 const findPageConfig_js_1 = require("../../../shared/page-configs/findPageConfig.js");
 const analyzePage_js_1 = require("./analyzePage.js");
-const globalContext_js_1 = require("../globalContext.js");
 const loadConfigValues_js_1 = require("../../../shared/page-configs/loadConfigValues.js");
 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, !(0, globalContext_js_1.getGlobalContext)().isProduction),
+        loadPageUserFiles(pageContext._pageFilesAll, pageConfig, pageContext.pageId, !globalContext.isProduction),
         (0, analyzePageClientSide_js_1.analyzePageClientSideInit)(pageContext._pageFilesAll, pageContext.pageId, { sharedPageFilesAlreadyLoaded: true })
     ]);
-    const { isHtmlOnly, isClientRouting, clientEntries, clientDependencies, pageFilesClientSide, pageFilesServerSide } = (0, analyzePage_js_1.analyzePage)(pageContext._pageFilesAll, pageConfig, pageContext.pageId);
+    const { isHtmlOnly, isClientRouting, clientEntries, clientDependencies, pageFilesClientSide, pageFilesServerSide } = await (0, analyzePage_js_1.analyzePage)(pageContext._pageFilesAll, pageConfig, pageContext.pageId, globalContext);
     const isV1Design = !!pageConfig;
     const passToClient = [];
     const errMsg = ' should be an array of strings.';
@@ -101,7 +102,7 @@ async function loadPageUserFiles(pageFilesAll, pageConfig, 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, getPageFiles_js_1.getPageConfigUserFriendly)(pageFilesServerSide, pageConfigLoaded);
+    const pageContextExports = (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyOld)(pageFilesServerSide, pageConfigLoaded);
     return {
         pageContextExports,
         pageFilesLoaded: pageFilesServerSide

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.log404 = log404;
 exports.getRoutesInfo = getRoutesInfo;
 const noRouteMatch_js_1 = require("../../../../shared/route/noRouteMatch.js");
-const globalContext_js_1 = require("../../globalContext.js");
 const utils_js_1 = require("../../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 async function log404(pageContext) {
@@ -17,7 +16,7 @@ async function log404(pageContext) {
     'No page found. Create at least one /pages/some-page/+Page.js file.'
     */
     );
-    const globalContext = (0, globalContext_js_1.getGlobalContext)();
+    const globalContext = pageContext._globalContext;
     if (!globalContext.isProduction && !isFileRequest(urlPathname) && !pageContext.isClientSideNavigation) {
         const routesInfo = getRoutesInfo(pageRoutes);
         let msg = `URL ${picocolors_1.default.cyan(urlPathname)} ${noRouteMatch_js_1.noRouteMatch}`;

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

@@ -12,7 +12,6 @@ const renderHtml_js_1 = require("../html/renderHtml.js");
 const utils_js_1 = require("../utils.js");
 const serializePageContextClientSide_js_1 = require("../html/serializePageContextClientSide.js");
 const getPageContextUrlComputed_js_1 = require("../../../shared/getPageContextUrlComputed.js");
-const globalContext_js_1 = require("../globalContext.js");
 const createHttpResponse_js_1 = require("./createHttpResponse.js");
 const loadUserFilesServerSide_js_1 = require("./loadUserFilesServerSide.js");
 const executeOnRenderHtmlHook_js_1 = require("./executeOnRenderHtmlHook.js");
@@ -86,8 +85,7 @@ async function prerenderPage(pageContext) {
         return { documentHtml, pageContextSerialized, pageContext };
     }
 }
-async function prerender404Page(pageContextInit_) {
-    const globalContext = (0, globalContext_js_1.getGlobalContext)();
+async function prerender404Page(pageContextInit_, globalContext) {
     const errorPageId = (0, error_page_js_1.getErrorPageId)(globalContext.pageFilesAll, globalContext.pageConfigs);
     if (!errorPageId) {
         return null;
@@ -107,20 +105,19 @@ async function prerender404Page(pageContextInit_) {
     };
     (0, utils_js_1.objectAssign)(pageContextInit, pageContextInit_);
     {
-        const pageContextInitEnhanced = getPageContextInitEnhanced(pageContextInit);
+        const pageContextInitEnhanced = await getPageContextInitEnhanced(pageContextInit, globalContext);
         (0, utils_js_1.objectAssign)(pageContext, pageContextInitEnhanced);
     }
     (0, utils_js_1.objectAssign)(pageContext, await (0, loadUserFilesServerSide_js_1.loadUserFilesServerSide)(pageContext));
     return prerenderPage(pageContext);
 }
-function getPageContextInitEnhanced(pageContextInit, { ssr: { urlRewrite, urlHandler, isClientSideNavigation } = {
+async function getPageContextInitEnhanced(pageContextInit, globalContext, { ssr: { urlRewrite, urlHandler, isClientSideNavigation } = {
     urlRewrite: null,
     urlHandler: null,
     isClientSideNavigation: false
 } } = {}) {
     (0, utils_js_1.assert)(pageContextInit.urlOriginal);
-    const globalContext = (0, globalContext_js_1.getGlobalContext)();
-    const { baseServer, baseAssets } = (0, resolveBase_js_1.resolveBaseRuntime)();
+    const { baseServer, baseAssets } = (0, resolveBase_js_1.resolveBaseRuntime)(globalContext);
     const pageContextInitEnhanced = {};
     (0, utils_js_1.objectAssign)(pageContextInitEnhanced, pageContextInit);
     (0, utils_js_1.objectAssign)(pageContextInitEnhanced, {
@@ -129,14 +126,18 @@ function getPageContextInitEnhanced(pageContextInit, { ssr: { urlRewrite, urlHan
         _baseServer: baseServer,
         _baseAssets: baseAssets,
         // TODO/now: add meta.default
-        _includeAssetsImportedByServer: globalContext.vikeConfig.global.config.includeAssetsImportedByServer ?? true,
-        // TODO: use GloablContext instead
+        _includeAssetsImportedByServer: globalContext.config.includeAssetsImportedByServer ?? true,
+        // TODO/soon: use GloablContext instead
         _pageFilesAll: globalContext.pageFilesAll,
         _pageConfigs: globalContext.pageConfigs,
         _pageConfigGlobal: globalContext.pageConfigGlobal,
         _allPageIds: globalContext.allPageIds,
         _pageRoutes: globalContext.pageRoutes,
         _onBeforeRouteHook: globalContext.onBeforeRouteHook,
+        _globalContext: globalContext,
+        // TODO/now: add PageContext['globalContext']
+        /** @experimental This is a beta feature https://vike.dev/getGlobalContext */
+        globalContext: globalContext.globalContext_public,
         _pageContextInit: pageContextInit,
         _urlRewrite: urlRewrite,
         _urlHandler: urlHandler,

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

@@ -82,25 +82,26 @@ async function renderPageAndPrepare(pageContextInit, httpRequestId) {
         return handleInvalidConfig(isConfigInvalid_js_1.isConfigInvalid.err);
     }
     else {
-        // From now on, gloablContext contains all the configuration data; getVikeConfig() isn't called anymore for this request
+        // From now on, globalContext contains all the configuration data; getVikeConfig() isn't called anymore for this request
     }
+    const globalContext = await (0, globalContext_js_1.getGlobalContextInternal)();
     // Check Base URL
-    assertBaseUrl(pageContextInit);
+    await assertBaseUrl(pageContextInit, globalContext);
     // Normalize URL
     {
-        const pageContextHttpResponse = normalizeUrl(pageContextInit, httpRequestId);
+        const pageContextHttpResponse = await normalizeUrl(pageContextInit, globalContext, httpRequestId);
         if (pageContextHttpResponse)
             return pageContextHttpResponse;
     }
     // Permanent redirects (HTTP status code `301`)
     {
-        const pageContextHttpResponse = getPermanentRedirect(pageContextInit, httpRequestId);
+        const pageContextHttpResponse = await getPermanentRedirect(pageContextInit, globalContext, httpRequestId);
         if (pageContextHttpResponse)
             return pageContextHttpResponse;
     }
-    return await renderPageAlreadyPrepared(pageContextInit, httpRequestId, []);
+    return await renderPageAlreadyPrepared(pageContextInit, globalContext, httpRequestId, []);
 }
-async function renderPageAlreadyPrepared(pageContextInit, httpRequestId, pageContextsFromRewrite) {
+async function renderPageAlreadyPrepared(pageContextInit, globalContext, httpRequestId, pageContextsFromRewrite) {
     (0, abort_js_1.assertNoInfiniteAbortLoop)(pageContextsFromRewrite.length, 
     // There doesn't seem to be a way to count the number of HTTP redirects (vike don't have access to the HTTP request headers/cookies)
     // https://stackoverflow.com/questions/9683007/detect-infinite-http-redirect-loop-on-server-side
@@ -112,7 +113,7 @@ async function renderPageAlreadyPrepared(pageContextInit, httpRequestId, pageCon
         (0, utils_js_1.objectAssign)(pageContextNominalPageInit, pageContextFromAllRewrites);
     }
     {
-        const pageContextInitEnhanced = getPageContextInitEnhancedSSR(pageContextInit, pageContextNominalPageInit._urlRewrite, httpRequestId);
+        const pageContextInitEnhanced = await getPageContextInitEnhancedSSR(pageContextInit, globalContext, pageContextNominalPageInit._urlRewrite, httpRequestId);
         (0, utils_js_1.objectAssign)(pageContextNominalPageInit, pageContextInitEnhanced);
     }
     let errNominalPage;
@@ -144,10 +145,10 @@ async function renderPageAlreadyPrepared(pageContextInit, httpRequestId, pageCon
         (0, utils_js_1.assert)(pageContextNominalPageSuccess === undefined);
         (0, utils_js_1.assert)(pageContextNominalPageInit);
         (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageContextNominalPageInit, 'urlOriginal', 'string'));
-        const pageContextErrorPageInit = await getPageContextErrorPageInit(pageContextInit, errNominalPage, pageContextNominalPageInit, httpRequestId);
+        const pageContextErrorPageInit = await getPageContextErrorPageInit(pageContextInit, globalContext, errNominalPage, pageContextNominalPageInit, httpRequestId);
         // Handle `throw redirect()` and `throw render()` while rendering nominal page
         if ((0, abort_js_1.isAbortError)(errNominalPage)) {
-            const handled = await handleAbortError(errNominalPage, pageContextsFromRewrite, pageContextInit, pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit);
+            const handled = await handleAbortError(errNominalPage, pageContextsFromRewrite, pageContextInit, pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit, globalContext);
             if (handled.pageContextReturn) {
                 // - throw redirect()
                 // - throw render(url)
@@ -160,7 +161,6 @@ async function renderPageAlreadyPrepared(pageContextInit, httpRequestId, pageCon
             Object.assign(pageContextErrorPageInit, handled.pageContextAbort);
         }
         {
-            const globalContext = (0, globalContext_js_1.getGlobalContext)();
             const errorPageId = (0, error_page_js_1.getErrorPageId)(globalContext.pageFilesAll, globalContext.pageConfigs);
             if (!errorPageId) {
                 (0, utils_js_1.objectAssign)(pageContextErrorPageInit, { pageId: null });
@@ -177,7 +177,7 @@ async function renderPageAlreadyPrepared(pageContextInit, httpRequestId, pageCon
         catch (errErrorPage) {
             // Handle `throw redirect()` and `throw render()` while rendering error page
             if ((0, abort_js_1.isAbortError)(errErrorPage)) {
-                const handled = await handleAbortError(errErrorPage, pageContextsFromRewrite, pageContextInit, pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit);
+                const handled = await handleAbortError(errErrorPage, pageContextsFromRewrite, pageContextInit, pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit, globalContext);
                 // throw render(abortStatusCode)
                 if (!handled.pageContextReturn) {
                     const pageContextAbort = errErrorPage._pageContextAbort;
@@ -293,8 +293,8 @@ async function renderPageNominal(pageContext) {
     (0, utils_js_1.assert)(pageContext === pageContextAfterRender);
     return pageContextAfterRender;
 }
-async function getPageContextErrorPageInit(pageContextInit, errNominalPage, pageContextNominalPagePartial, httpRequestId) {
-    const pageContextInitEnhanced = getPageContextInitEnhancedSSR(pageContextInit, null, httpRequestId);
+async function getPageContextErrorPageInit(pageContextInit, globalContext, errNominalPage, pageContextNominalPagePartial, httpRequestId) {
+    const pageContextInitEnhanced = await getPageContextInitEnhancedSSR(pageContextInit, globalContext, null, httpRequestId);
     (0, utils_js_1.assert)(errNominalPage);
     const pageContext = {};
     (0, utils_js_1.objectAssign)(pageContext, pageContextInitEnhanced);
@@ -309,9 +309,9 @@ async function getPageContextErrorPageInit(pageContextInit, errNominalPage, page
     (0, utils_js_1.assert)(pageContext.errorWhileRendering);
     return pageContext;
 }
-function getPageContextInitEnhancedSSR(pageContextInit, urlRewrite, httpRequestId) {
+async function getPageContextInitEnhancedSSR(pageContextInit, globalContext, urlRewrite, httpRequestId) {
     const { isClientSideNavigation, _urlHandler } = handlePageContextUrl(pageContextInit.urlOriginal);
-    const pageContextInitEnhanced = (0, renderPageAlreadyRouted_js_1.getPageContextInitEnhanced)(pageContextInit, {
+    const pageContextInitEnhanced = await (0, renderPageAlreadyRouted_js_1.getPageContextInitEnhanced)(pageContextInit, globalContext, {
         ssr: {
             urlRewrite,
             urlHandler: _urlHandler,
@@ -342,10 +342,9 @@ function assertIsNotViteRequest(urlPathname, urlOriginal) {
         return;
     (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')}`);
 }
-function normalizeUrl(pageContextInit, httpRequestId) {
-    const globalContext = (0, globalContext_js_1.getGlobalContext)();
-    const { baseServer } = (0, resolveBase_js_1.resolveBaseRuntime)();
-    const { trailingSlash, disableUrlNormalization } = globalContext.vikeConfig.global.config;
+async function normalizeUrl(pageContextInit, globalContext, httpRequestId) {
+    const { baseServer } = (0, resolveBase_js_1.resolveBaseRuntime)(globalContext);
+    const { trailingSlash, disableUrlNormalization } = globalContext.config;
     if (disableUrlNormalization)
         return null;
     const { urlOriginal } = pageContextInit;
@@ -361,14 +360,13 @@ function normalizeUrl(pageContextInit, httpRequestId) {
     (0, utils_js_1.objectAssign)(pageContextHttpResponse, { httpResponse });
     return pageContextHttpResponse;
 }
-function getPermanentRedirect(pageContextInit, httpRequestId) {
-    const globalContext = (0, globalContext_js_1.getGlobalContext)();
-    const { baseServer } = (0, resolveBase_js_1.resolveBaseRuntime)();
+async function getPermanentRedirect(pageContextInit, globalContext, httpRequestId) {
+    const { baseServer } = (0, resolveBase_js_1.resolveBaseRuntime)(globalContext);
     const urlWithoutBase = (0, utils_js_1.removeBaseServer)(pageContextInit.urlOriginal, baseServer);
     let origin = null;
     let urlTargetExternal = null;
     let urlTarget = (0, utils_js_1.modifyUrlPathname)(urlWithoutBase, (urlPathname) => {
-        const urlTarget = (0, resolveRedirects_js_1.resolveRedirects)(globalContext.vikeConfig.global.config.redirects ?? [], urlPathname);
+        const urlTarget = (0, resolveRedirects_js_1.resolveRedirects)(globalContext.config.redirects ?? [], urlPathname);
         if (urlTarget === null)
             return null;
         if (!(0, utils_js_1.isUrl)(urlTarget)) {
@@ -395,7 +393,7 @@ function getPermanentRedirect(pageContextInit, httpRequestId) {
         }
         if (normalize(urlTarget) === normalize(urlWithoutBase))
             return null;
-        const { baseServer } = (0, resolveBase_js_1.resolveBaseRuntime)();
+        const { baseServer } = (0, resolveBase_js_1.resolveBaseRuntime)(globalContext);
         if (!originChanged)
             urlTarget = (0, utils_js_1.prependBase)(urlTarget, baseServer);
         (0, utils_js_1.assert)(urlTarget !== pageContextInit.urlOriginal);
@@ -411,13 +409,12 @@ function normalize(url) {
 }
 async function handleAbortError(errAbort, pageContextsFromRewrite, pageContextInit, 
 // handleAbortError() creates a new pageContext object and we don't merge pageContextNominalPageInit to it: we only use some pageContextNominalPageInit information.
-pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit) {
-    (0, abort_js_1.logAbortErrorHandled)(errAbort, (0, globalContext_js_1.getGlobalContext)().isProduction, pageContextNominalPageInit);
+pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit, globalContext) {
+    (0, abort_js_1.logAbortErrorHandled)(errAbort, globalContext.isProduction, pageContextNominalPageInit);
     const pageContextAbort = errAbort._pageContextAbort;
     let pageContextSerialized;
     if (pageContextNominalPageInit.isClientSideNavigation) {
         if (pageContextAbort.abortStatusCode) {
-            const globalContext = (0, globalContext_js_1.getGlobalContext)();
             const errorPageId = (0, error_page_js_1.getErrorPageId)(globalContext.pageFilesAll, globalContext.pageConfigs);
             const abortCall = pageContextAbort._abortCall;
             (0, utils_js_1.assert)(abortCall);
@@ -438,7 +435,7 @@ pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit) {
         return { pageContextReturn };
     }
     if (pageContextAbort._urlRewrite) {
-        const pageContextReturn = await renderPageAlreadyPrepared(pageContextInit, httpRequestId, [
+        const pageContextReturn = await renderPageAlreadyPrepared(pageContextInit, globalContext, httpRequestId, [
             ...pageContextsFromRewrite,
             pageContextAbort
         ]);
@@ -461,8 +458,8 @@ pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit) {
     (0, utils_js_1.assert)(pageContextAbort.abortStatusCode);
     return { pageContextAbort };
 }
-function assertBaseUrl(pageContextInit) {
-    const { baseServer } = (0, resolveBase_js_1.resolveBaseRuntime)();
+async function assertBaseUrl(pageContextInit, globalContext) {
+    const { baseServer } = (0, resolveBase_js_1.resolveBaseRuntime)(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/utils.js

@@ -35,6 +35,7 @@ __exportStar(require("../../utils/projectInfo.js"), exports);
 __exportStar(require("../../utils/isArray.js"), exports);
 __exportStar(require("../../utils/isObject.js"), exports);
 __exportStar(require("../../utils/objectAssign.js"), exports);
+__exportStar(require("../../utils/objectAssignSafe.js"), exports);
 __exportStar(require("../../utils/objectReplace.js"), exports);
 __exportStar(require("../../utils/PromiseType.js"), exports);
 __exportStar(require("../../utils/compareString.js"), exports);

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

@@ -3,13 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDevMiddleware = createDevMiddleware;
 const vite_1 = require("vite");
 const prepareViteApiCall_js_1 = require("../api/prepareViteApiCall.js");
+const globalContext_js_1 = require("../runtime/globalContext.js");
 /*
  * Create server middleware for development with HMR and lazy-transpiling.
  *
  * https://vike.dev/createDevMiddleware
  */
 async function createDevMiddleware(options = {}) {
-    const viteConfig = {
+    (0, globalContext_js_1.setGlobalContext_isProduction)(false);
+    const viteConfigFromOptions = {
         ...options.viteConfig,
         server: {
             ...options.viteConfig?.server,
@@ -17,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

@@ -8,17 +8,15 @@ exports.resolveBaseRuntime = resolveBaseRuntime;
 exports.resolveBaseFromResolvedConfig = resolveBaseFromResolvedConfig;
 const utils_js_1 = require("./utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const globalContext_js_1 = require("../runtime/globalContext.js");
 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() {
-    const globalContext = (0, globalContext_js_1.getGlobalContext)();
+function resolveBaseRuntime(globalContext) {
     const baseViteOriginal = globalContext.viteConfigRuntime._baseViteOriginal;
-    const baseServerUnresolved = globalContext.vikeConfig.global.config.baseServer ?? null;
-    const baseAssetsUnresolved = globalContext.vikeConfig.global.config.baseAssets ?? null;
+    const baseServerUnresolved = globalContext.config.baseServer ?? null;
+    const baseAssetsUnresolved = globalContext.config.baseAssets ?? null;
     return resolveBase(baseViteOriginal, baseServerUnresolved, baseAssetsUnresolved);
 }
 function resolveBase(baseViteOriginal, baseServerUnresolved, baseAssetsUnresolved) {

package/dist/cjs/shared/getPageConfigsRuntime.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPageConfigsRuntime = getPageConfigsRuntime;
+exports.getAllPageIds = getAllPageIds;
+const parseGlobResults_js_1 = require("./getPageFiles/parseGlobResults.js");
+const getPageConfigUserFriendly_js_1 = require("./page-configs/getPageConfigUserFriendly.js");
+const utils_js_1 = require("./utils.js");
+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 };
+}
+function getAllPageIds(pageFilesAll, pageConfigs) {
+    const fileIds = pageFilesAll.filter(({ isDefaultPageFile }) => !isDefaultPageFile).map(({ pageId }) => pageId);
+    const allPageIds = (0, utils_js_1.unique)(fileIds);
+    const allPageIds2 = pageConfigs.map((p) => p.pageId);
+    return [...allPageIds, ...allPageIds2];
+}

package/dist/cjs/shared/getPageFiles/parseGlobResults.js

@@ -7,6 +7,7 @@ const assert_exports_old_design_js_1 = require("./assert_exports_old_design.js")
 const getPageFileObject_js_1 = require("./getPageFileObject.js");
 const fileTypes_js_1 = require("./fileTypes.js");
 const parsePageConfigs_js_1 = require("../page-configs/serialize/parsePageConfigs.js");
+// TODO/now: rename
 function parseGlobResults(pageFilesExports) {
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageFilesExports, 'pageFilesLazy', 'object'));
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageFilesExports, 'pageFilesEager', 'object'));
@@ -62,11 +63,11 @@ function parseGlobResults(pageFilesExports) {
     pageFilesExports.pageFilesList.forEach((filePath) => {
         pageFilesMap[filePath] = pageFilesMap[filePath] ?? (0, getPageFileObject_js_1.getPageFileObject)(filePath);
     });
-    const pageFiles = Object.values(pageFilesMap);
-    pageFiles.forEach(({ filePath }) => {
+    const pageFilesAll = Object.values(pageFilesMap);
+    pageFilesAll.forEach(({ filePath }) => {
         (0, utils_js_1.assert)(!filePath.includes('\\'));
     });
-    return { pageFiles, pageConfigs, pageConfigGlobal };
+    return { pageFilesAll, pageConfigs, pageConfigGlobal };
 }
 function parseGlobResult(globObject) {
     const ret = [];

package/dist/cjs/shared/getPageFiles.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPageConfigUserFriendly = exports.getPageFilesServerSide = exports.getPageFilesClientSide = void 0;
+exports.getPageFilesServerSide = exports.getPageFilesClientSide = void 0;
 var getAllPageIdFiles_js_1 = require("./getPageFiles/getAllPageIdFiles.js");
 Object.defineProperty(exports, "getPageFilesClientSide", { enumerable: true, get: function () { return getAllPageIdFiles_js_1.getPageFilesClientSide; } });
 var getAllPageIdFiles_js_2 = require("./getPageFiles/getAllPageIdFiles.js");
 Object.defineProperty(exports, "getPageFilesServerSide", { enumerable: true, get: function () { return getAllPageIdFiles_js_2.getPageFilesServerSide; } });
-var getPageConfigUserFriendly_js_1 = require("./page-configs/getPageConfigUserFriendly.js");
-Object.defineProperty(exports, "getPageConfigUserFriendly", { enumerable: true, get: function () { return getPageConfigUserFriendly_js_1.getPageConfigUserFriendly; } });

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

@@ -3,14 +3,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPageConfigUserFriendly = getPageConfigUserFriendly;
+exports.getPageConfigUserFriendlyOld = getPageConfigUserFriendlyOld;
 exports.getPageConfigUserFriendlyNew = getPageConfigUserFriendlyNew;
 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 getPageConfigUserFriendly(pageFiles, pageConfig) {
+function getPageConfigUserFriendlyNew(pageConfig) {
+    const res = getPageConfigUserFriendlyV1Desin(pageConfig);
+    return {
+        config: res.config,
+        _source: res.source,
+        _sources: res.sources,
+        _from: res.from
+    };
+}
+function getPageConfigUserFriendlyOld(pageFiles, pageConfig) {
     const config = {};
     const configEntries = {}; // TODO/v1-release: remove
     const exportsAll = {}; // TODO/v1-release: remove
@@ -35,7 +44,7 @@ function getPageConfigUserFriendly(pageFiles, pageConfig) {
     let sources;
     let from;
     if (pageConfig) {
-        const res = getPageConfigUserFriendlyNew(pageConfig);
+        const res = getPageConfigUserFriendlyV1Desin(pageConfig);
         source = res.source;
         sources = res.sources;
         from = res.from;
@@ -81,7 +90,7 @@ function getPageConfigUserFriendly(pageFiles, pageConfig) {
     return pageContextExports;
 }
 // V1 design
-function getPageConfigUserFriendlyNew(pageConfig) {
+function getPageConfigUserFriendlyV1Desin(pageConfig) {
     const config = {};
     const configEntries = {};
     const exportsAll = {};

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

@@ -12,6 +12,7 @@ const getHook_js_1 = require("../hooks/getHook.js");
 async function loadPageRoutes(
 // Remove all arguments and use GlobalContext 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?.()));
     const { onBeforeRouteHook, filesystemRoots } = getGlobalHooks(pageFilesAll, pageConfigs, pageConfigGlobal);
     const pageRoutes = getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds);

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.220-commit-af5c91f';
+exports.PROJECT_VERSION = '0.4.221-commit-8577456';

package/dist/cjs/utils/assertSetup.js

@@ -37,7 +37,7 @@ function onSetupRuntime() {
     if (!isViteLoaded()) {
         // TODO: make it assertUsage() again once https://github.com/vikejs/vike/issues/1528 is implemented.
         (0, assert_js_1.assertWarning)(!isNodeEnvDev(), `The ${getEnvDescription()}, which is contradictory because the environment seems to be a production environment (Vite isn't loaded), see https://vike.dev/NODE_ENV`, { onlyOnce: true });
-        (0, assert_js_1.assertUsage)(!setup.vikeVitePlugin, "Loading Vike's Vite plugin (the vike/plugin module) is prohibited in production.");
+        (0, assert_js_1.assertUsage)(!setup.vikeVitePlugin, `Loading Vike's Vite plugin (the ${picocolors_1.default.cyan('vike/plugin')} module) is prohibited in production.`);
         // This assert() one of the main goal of this file: it ensures assertIsNotProductionRuntime()
         (0, assert_js_1.assert)(!setup.shouldNotBeProduction);
     }

package/dist/cjs/utils/debug.js

@@ -18,6 +18,7 @@ const isArray_js_1 = require("./isArray.js");
 globalThis.__brillout_debug_createDebugger = createDebugger;
 const flags = [
     'vike:error',
+    'vike:esbuild-resolve',
     'vike:extractAssets',
     'vike:extractExportNames',
     'vike:glob',
@@ -30,9 +31,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 +78,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 +143,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 +151,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/cjs/utils/findFile.js

@@ -8,6 +8,7 @@ const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const isArray_js_1 = require("./isArray.js");
 const path_js_1 = require("./path.js");
+// We need to be able to crawl the filesystem, regardless of Vike's `$ git ls-files` command call, because we need to fallback if the user didn't setup Git (e.g. we cannot remove the fast-glob fallback).
 function findFile(arg, cwd) {
     (0, path_js_1.assertPosixPath)(cwd);
     const filenames = (0, isArray_js_1.isArray)(arg) ? arg : [arg];

package/dist/cjs/utils/objectAssignSafe.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.objectAssignSafe = objectAssignSafe;
+// Same as `Object.assign(obj, objNewVals)` but ensure that `objNewVals` properties alreay exist on `obj`
+function objectAssignSafe(obj, objNewVals) {
+    Object.assign(obj, objNewVals);
+}

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

@@ -1,12 +1,13 @@
 export { setGlobalContext_buildEntry } from '../node/runtime/globalContext.js';
 export { route, getPagesAndRoutes };
 export type { PageRoutes, PageFile, PageConfigRuntime as PageConfig };
-export { getMiddlewares };
 import { route as routeInternal, type PageRoutes } from '../shared/route/index.js';
 import type { PageFile } from '../shared/getPageFiles/getPageFileObject.js';
 import { PageConfigRuntime } from '../shared/page-configs/PageConfig.js';
 /**
  * Used by {@link https://github.com/magne4000/vite-plugin-vercel|vite-plugin-vercel} to compute some rewrite rules and extract { isr } configs.
+ *
+ * TODO/eventually: remove
  */
 declare function getPagesAndRoutes(): Promise<{
     pageRoutes: PageRoutes;
@@ -14,7 +15,6 @@ declare function getPagesAndRoutes(): Promise<{
     pageConfigs: PageConfigRuntime[];
     allPageIds: string[];
 }>;
-declare function getMiddlewares(): Promise<unknown[]>;
 declare function route(pageContext: Parameters<typeof routeInternal>[0]): Promise<{
     pageContextAddendum: import("../shared/route/index.js").PageContextFromRoute;
 }>;