vike 0.4.222 → 0.4.223-commit-586dbfb

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

@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderPage_addWrapper = void 0;
 exports.renderPage = renderPage;
+exports.renderPage_addAsyncHookwrapper = renderPage_addAsyncHookwrapper;
 const renderPageAlreadyRouted_js_1 = require("./renderPage/renderPageAlreadyRouted.js");
 const index_js_1 = require("../../shared/route/index.js");
 const utils_js_1 = require("./utils.js");
@@ -16,54 +16,48 @@ const loggerRuntime_js_1 = require("./renderPage/loggerRuntime.js");
 const isNewError_js_1 = require("./renderPage/isNewError.js");
 const assertArguments_js_1 = require("./renderPage/assertArguments.js");
 const index_js_2 = require("./renderPage/log404/index.js");
-const isConfigInvalid_js_1 = require("./renderPage/isConfigInvalid.js");
+const isVikeConfigInvalid_js_1 = require("./renderPage/isVikeConfigInvalid.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const serializePageContextClientSide_js_1 = require("./html/serializePageContextClientSide.js");
 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
 });
-let renderPage_wrapper = async (_httpRequestId, ret) => ({
-    pageContextReturn: await ret()
-});
-const renderPage_addWrapper = (wrapper) => {
-    renderPage_wrapper = wrapper;
-};
-exports.renderPage_addWrapper = renderPage_addWrapper;
 // `renderPage()` calls `renderPageNominal()` while ensuring that errors are `console.error(err)` instead of `throw err`, so that Vike never triggers a server shut down. (Throwing an error in an Express.js middleware shuts down the whole Express.js server.)
 async function renderPage(pageContextInit) {
     (0, assertArguments_js_1.assertArguments)(...arguments);
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageContextInit, 'urlOriginal', 'string')); // assertUsage() already implemented at assertArguments()
-    (0, utils_js_1.onSetupRuntime)();
     assertIsUrl(pageContextInit.urlOriginal);
-    const urlPathnameWithBase = (0, utils_js_1.parseUrl)(pageContextInit.urlOriginal, '/').pathname;
-    assertIsNotViteRequest(urlPathnameWithBase, pageContextInit.urlOriginal);
-    if (urlPathnameWithBase.endsWith('/favicon.ico'))
-        return getPageContextHttpResponseFavicon404(pageContextInit);
+    (0, utils_js_1.onSetupRuntime)();
+    const pageContextInvalidRequest = renderInvalidRequest(pageContextInit);
+    if (pageContextInvalidRequest)
+        return pageContextInvalidRequest;
     const httpRequestId = getRequestId();
     const urlOriginalPretty = (0, utils_js_1.getUrlPretty)(pageContextInit.urlOriginal);
     logHttpRequest(urlOriginalPretty, httpRequestId);
-    const { pageContextReturn } = await renderPage_wrapper(httpRequestId, () => renderPageAndPrepare(pageContextInit, httpRequestId));
+    const { pageContextReturn } = await asyncHookWrapper(httpRequestId, () => renderPageAndPrepare(pageContextInit, httpRequestId));
     logHttpResponse(urlOriginalPretty, httpRequestId, pageContextReturn);
     (0, utils_js_1.checkType)(pageContextReturn);
     (0, utils_js_1.assert)(pageContextReturn.httpResponse);
     return pageContextReturn;
 }
+// Fallback wrapper if node:async_hooks isn't available
+let asyncHookWrapper = async (_httpRequestId, ret) => ({
+    pageContextReturn: await ret()
+});
+// Add node:async_hooks wrapper
+function renderPage_addAsyncHookwrapper(wrapper) {
+    asyncHookWrapper = wrapper;
+}
 async function renderPageAndPrepare(pageContextInit, httpRequestId) {
     // Invalid config
-    const handleInvalidConfig = (err) => {
-        (0, loggerRuntime_js_1.logRuntimeInfo)?.(picocolors_1.default.bold(picocolors_1.default.red('Error while loading a Vike config file, see error above.')), httpRequestId, 'error');
-        const pageContextWithError = getPageContextHttpResponseError(err, pageContextInit, null);
-        return pageContextWithError;
-    };
-    if (isConfigInvalid_js_1.isConfigInvalid) {
+    if (isVikeConfigInvalid_js_1.isVikeConfigInvalid) {
         if (1 < 2 // Make TS happy
         ) {
-            return handleInvalidConfig(isConfigInvalid_js_1.isConfigInvalid.err);
+            return renderInvalidVikeConfig(isVikeConfigInvalid_js_1.isVikeConfigInvalid.err, pageContextInit, httpRequestId);
         }
     }
     // Prepare context
@@ -71,22 +65,29 @@ async function renderPageAndPrepare(pageContextInit, httpRequestId) {
         await (0, globalContext_js_1.initGlobalContext_renderPage)();
     }
     catch (err) {
-        // Errors are expected since assertUsage() is used in both initGlobalContext_renderPage() and getRenderContext().
-        // initGlobalContext_renderPage() and getRenderContext() don't call any user hooks => err isn't thrown from user code.
+        // Errors are expected since assertUsage() is used in initGlobalContext_renderPage() such as:
+        // ```bash
+        // Re-build your app (you're using 1.2.3 but your app was built with 1.2.2)
+        // ```
+        // initGlobalContext_renderPage() doens't call any user hook => err isn't thrown from user code.
         (0, utils_js_1.assert)(!(0, abort_js_1.isAbortError)(err));
         (0, loggerRuntime_js_1.logRuntimeError)(err, httpRequestId);
         const pageContextWithError = getPageContextHttpResponseError(err, pageContextInit, null);
         return pageContextWithError;
     }
-    if (isConfigInvalid_js_1.isConfigInvalid) {
-        return handleInvalidConfig(isConfigInvalid_js_1.isConfigInvalid.err);
+    if (isVikeConfigInvalid_js_1.isVikeConfigInvalid) {
+        return renderInvalidVikeConfig(isVikeConfigInvalid_js_1.isVikeConfigInvalid.err, pageContextInit, httpRequestId);
     }
     else {
-        // From now on, globalContext contains all the configuration data; getVikeConfig() isn't called anymore for this request
+        // `globalContext` now contains the entire Vike config and getVikeConfig() isn't called anymore for this request.
     }
     const globalContext = await (0, globalContext_js_1.getGlobalContextInternal)();
     // Check Base URL
-    await assertBaseUrl(pageContextInit, globalContext);
+    {
+        const pageContextHttpResponse = await checkBaseUrl(pageContextInit, globalContext);
+        if (pageContextHttpResponse)
+            return pageContextHttpResponse;
+    }
     // Normalize URL
     {
         const pageContextHttpResponse = await normalizeUrl(pageContextInit, globalContext, httpRequestId);
@@ -254,15 +255,6 @@ function getPageContextHttpResponseError(err, pageContextInit, pageContext) {
     });
     return pageContextWithError;
 }
-function getPageContextHttpResponseFavicon404(pageContextInit) {
-    const pageContext = createPageContext(pageContextInit);
-    const httpResponse = (0, createHttpResponse_js_1.createHttpResponseFavicon404)();
-    (0, utils_js_1.objectAssign)(pageContext, {
-        httpResponse
-    });
-    (0, utils_js_1.checkType)(pageContext);
-    return pageContext;
-}
 function createPageContext(pageContextInit) {
     const pageContext = {
         _isPageContextObject: true
@@ -343,7 +335,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 +342,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 +352,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 +383,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');
@@ -458,10 +447,35 @@ pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit, globalConte
     (0, utils_js_1.assert)(pageContextAbort.abortStatusCode);
     return { pageContextAbort };
 }
-async function assertBaseUrl(pageContextInit, globalContext) {
-    const { baseServer } = (0, resolveBase_js_1.resolveBaseRuntime)(globalContext);
+async function checkBaseUrl(pageContextInit, globalContext) {
+    const { baseServer } = globalContext;
     const { urlOriginal } = pageContextInit;
-    const { urlWithoutPageContextRequestSuffix } = (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(urlOriginal);
-    const { hasBaseServer } = (0, utils_js_1.parseUrl)(urlWithoutPageContextRequestSuffix, baseServer);
-    (0, utils_js_1.assertUsage)(hasBaseServer, `${picocolors_1.default.code('renderPage(pageContextInit)')} (https://vike.dev/renderPage) called with ${picocolors_1.default.code(`pageContextInit.urlOriginal===${JSON.stringify(urlOriginal)}`)} which doesn't start with Base URL ${picocolors_1.default.code(baseServer)} (https://vike.dev/base-url)`);
+    const { isBaseMissing } = (0, utils_js_1.parseUrl)(urlOriginal, baseServer);
+    if (!isBaseMissing)
+        return;
+    const pageContext = createPageContext(pageContextInit);
+    const httpResponse = (0, createHttpResponse_js_1.createHttpResponseBaseIsMissing)(urlOriginal, baseServer);
+    (0, utils_js_1.objectAssign)(pageContext, {
+        httpResponse,
+        isBaseMissing: true
+    });
+    (0, utils_js_1.checkType)(pageContext);
+    return pageContext;
+}
+function renderInvalidRequest(pageContextInit) {
+    const urlPathnameWithBase = (0, utils_js_1.parseUrl)(pageContextInit.urlOriginal, '/').pathname;
+    assertIsNotViteRequest(urlPathnameWithBase, pageContextInit.urlOriginal);
+    if (urlPathnameWithBase.endsWith('/favicon.ico')) {
+        const pageContext = createPageContext(pageContextInit);
+        const httpResponse = (0, createHttpResponse_js_1.createHttpResponseFavicon404)();
+        (0, utils_js_1.objectAssign)(pageContext, { httpResponse });
+        (0, utils_js_1.checkType)(pageContext);
+        return pageContext;
+    }
+    return null;
+}
+function renderInvalidVikeConfig(err, pageContextInit, httpRequestId) {
+    (0, loggerRuntime_js_1.logRuntimeInfo)?.(picocolors_1.default.bold(picocolors_1.default.red('Error while loading a Vike config file, see error above.')), httpRequestId, 'error');
+    const pageContextWithError = getPageContextHttpResponseError(err, pageContextInit, null);
+    return pageContextWithError;
 }

package/dist/cjs/node/runtime/universal-middleware.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = universalVikeHandler;
+const index_js_1 = require("./index.js");
+async function universalVikeHandler(request, context, runtime) {
+    const pageContextInit = { ...context, ...runtime, urlOriginal: request.url, headersOriginal: request.headers };
+    const pageContext = await (0, index_js_1.renderPage)(pageContextInit);
+    const response = pageContext.httpResponse;
+    const readable = response.getReadableWebStream();
+    return new Response(readable, {
+        status: response.statusCode,
+        headers: response.headers
+    });
+}

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,15 +9,9 @@ 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);
-    // TODO/now DEDUPE
+    const globalConfig = (0, getPageConfigUserFriendly_js_1.getPageConfigGlobalUserFriendly)({ pageConfigGlobalValues: pageConfigGlobal.configValues });
     const pageConfigsUserFriendly = Object.fromEntries(pageConfigs.map((pageConfig) => {
-        const configValues = { ...pageConfigGlobal.configValues, ...pageConfig.configValues };
-        const page = {
-            ...(0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyNew)({ configValues }),
-            route: pageConfig.routeFilesystem?.routeString ?? null
-        };
-        return [pageConfig.pageId, page];
+        return (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendly)(pageConfigGlobal.configValues, pageConfig, pageConfig.configValues);
     }));
     return { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, globalConfig, pageConfigsUserFriendly };
 }

package/dist/cjs/shared/getPageContextRequestUrl.js

@@ -9,7 +9,7 @@ exports.pageContextJsonFileExtension = pageContextJsonFileExtension;
 // `/some-base-url/index.pageContext.json` instead of `/some-base-url.pageContext.json` in order to comply to common reverse proxy setups, see https://github.com/vikejs/vike/issues/443
 const doNotCreateExtraDirectory = false;
 exports.doNotCreateExtraDirectory = doNotCreateExtraDirectory;
-// See node/renderPage/handlePageContextRequestUrl.ts
+// See also node/renderPage/handlePageContextRequestUrl.ts
 function getPageContextRequestUrl(url) {
     const pageContextRequestUrl = (0, urlToFile_js_1.urlToFile)(url, pageContextJsonFileExtension, doNotCreateExtraDirectory);
     return pageContextRequestUrl;

package/dist/cjs/shared/getPageContextUrlComputed.js

@@ -39,26 +39,29 @@ function getUrlParsed(pageContext) {
     //  6. The value of pageContext.urlPathname is now '/login': the pathname of `pageContext.urlLogical`. (While pageContext.urlOriginal is still '/fr-FR/admin'.)
     // Reproduction: https://github.com/vikejs/vike/discussions/1436#discussioncomment-8142023
     // Determine logical URL
-    // TODO/soon: revert https://github.com/vikejs/vike/issues/2138#issuecomment-2631713411
-    const assertUrlResolved = (src) => (0, utils_js_1.assert)(urlResolved && typeof urlResolved === 'string', { src, urlResolved });
+    const assertUrlResolved = (src) => (0, utils_js_1.assert)(typeof urlResolved === 'string', 
+    // TODO/eventually: remove debug logs, see:
+    // - https://github.com/vikejs/vike/issues/2138#issuecomment-2631713411
+    // - https://github.com/vikejs/vike/commit/5c7810f3080ab62536950f26e019bb2a3a517082
+    { src, urlResolved });
     let urlResolved;
-    let baseToBeRemoved;
+    let isBaseToBeRemoved;
     if (pageContext.urlLogical) {
         // Set by onBeforeRoute()
         urlResolved = pageContext.urlLogical;
-        baseToBeRemoved = false;
+        isBaseToBeRemoved = false;
         assertUrlResolved(1);
     }
     else if (pageContext._urlRewrite) {
         // Set by `throw render()`
         urlResolved = pageContext._urlRewrite;
-        baseToBeRemoved = false;
+        isBaseToBeRemoved = false;
         assertUrlResolved(2);
     }
     else {
         // Set by renderPage()
         urlResolved = pageContext.urlOriginal;
-        baseToBeRemoved = true;
+        isBaseToBeRemoved = true;
         assertUrlResolved(3);
     }
     assertUrlResolved(4);
@@ -71,7 +74,7 @@ function getUrlParsed(pageContext) {
     // - We assume there isn't any Base URL to the URLs set by the user at `throw render()` and onBeforeRoute()
     //   - This makes sense because the Base URL is merely a setting: ideally the user should write code that doesn't know anything about it (so that the user can remove/add/change Base URL without having to modify any code).
     // - pageContext.urlOriginal is the URL of the HTTP request and thus contains the Base URL.
-    const baseServer = !baseToBeRemoved ? '/' : pageContext._baseServer;
+    const baseServer = !isBaseToBeRemoved ? '/' : pageContext._baseServer;
     // Parse URL
     return (0, utils_js_1.parseUrl)(urlResolved, baseServer);
 }
@@ -88,8 +91,8 @@ function urlGetter() {
 }
 function urlParsedGetter() {
     const { 
-    // remove hasBaseServer as it isn't part of UrlPublic
-    hasBaseServer: _, ...urlParsed } = getUrlParsed(this);
+    // remove isBaseMissing as it isn't part of UrlPublic
+    isBaseMissing: _, ...urlParsed } = getUrlParsed(this);
     const hashIsAvailable = (0, utils_js_1.isBrowser)();
     const warnHashNotAvailable = (prop) => {
         (0, utils_js_1.assertWarning)(hashIsAvailable, `pageContext.urlParsed.${prop} isn't available on the server-side (HTTP requests don't include the URL hash)`, { onlyOnce: true, showStackTrace: true });

package/dist/cjs/shared/hooks/getHook.js

@@ -14,7 +14,7 @@ const helpers_js_1 = require("../page-configs/helpers.js");
 const getConfigValueRuntime_js_1 = require("../page-configs/getConfigValueRuntime.js");
 const utils_js_1 = require("../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('getHook.ts', {});
+const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('hooks/getHook.ts', {});
 function getHook(pageContext, hookName) {
     if (!(hookName in pageContext.exports)) {
         return null;

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, pageConfigGlobal) {
+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,8 +75,9 @@ function getPageConfigUserFriendlyOld(pageFiles, pageConfig, pageConfigGlobal) {
     let sources;
     let from;
     if (pageConfig) {
-        const res = getPageConfigUserFriendlyV1Desin({
-            configValues: { ...pageConfigGlobal.configValues, ...pageConfig.configValues }
+        const res = getPageConfigUserFriendly_base({
+            pageConfigGlobalValues: pageConfigGlobal.configValues,
+            pageConfigValues: pageConfig.configValues
         });
         source = res.source;
         sources = res.sources;
@@ -92,7 +124,7 @@ function getPageConfigUserFriendlyOld(pageFiles, pageConfig, pageConfigGlobal) {
     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/page-configs/serialize/serializeConfigValues.js

@@ -5,12 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serializeConfigValues = serializeConfigValues;
 exports.getConfigValuesBase = getConfigValuesBase;
+exports.isJsonValue = isJsonValue;
 const assertSetup_js_1 = require("../../../utils/assertSetup.js");
 const utils_js_1 = require("../../../node/plugin/utils.js");
 const transformPointerImports_js_1 = require("../../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig/transformPointerImports.js");
 const helpers_js_1 = require("../helpers.js");
 const stringify_1 = require("@brillout/json-serializer/stringify");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const stringifyOptions = { forbidReactElements: true };
 const REPLACE_ME_BEFORE = '__VIKE__REPLACE_ME_BEFORE__';
 const REPLACE_ME_AFTER = '__VIKE__REPLACE_ME_AFTER__';
 // This file is never loaded on the client-side but we save it under the vike/shared/ directory in order to collocate it with parsePageConfigs()
@@ -49,7 +51,7 @@ function serializeConfigValues(pageConfig, importStatements, filesEnv, isEnvMatc
 function getValueSerializedFromSource(configValueSource, configName, importStatements, filesEnv) {
     (0, utils_js_1.assert)(configValueSource.isOverriden === false);
     let valueData;
-    if ('value' in configValueSource) {
+    if ('value' in configValueSource && !configValueSource.valueIsLoadedWithImport) {
         valueData = getValueSerializedWithJson(configValueSource.value, configName, configValueSource.definedAtFilePath, importStatements, filesEnv, configValueSource.configEnv);
     }
     else {
@@ -101,14 +103,13 @@ function serializeConfigValue(configValueBase, valueData, configName, lines, tab
 }
 function getValueSerializedWithImport(configValueSource, importStatements, filesEnv, configName) {
     (0, utils_js_1.assert)(!configValueSource.valueIsFilePath);
-    const { valueIsImportedAtRuntime, valueIsDefinedByPlusFile, definedAtFilePath, configEnv } = configValueSource;
-    (0, utils_js_1.assert)(valueIsImportedAtRuntime);
+    const { valueIsDefinedByPlusValueFile, definedAtFilePath, configEnv } = configValueSource;
     const { filePathAbsoluteVite, fileExportName } = definedAtFilePath;
-    if (valueIsDefinedByPlusFile)
+    if (valueIsDefinedByPlusValueFile)
         (0, utils_js_1.assert)(fileExportName === undefined);
     const { importName } = addImportStatement(importStatements, filePathAbsoluteVite, fileExportName || '*', filesEnv, configEnv, configName);
     return {
-        type: valueIsDefinedByPlusFile ? 'plus-file' : 'pointer-import',
+        type: valueIsDefinedByPlusValueFile ? 'plus-file' : 'pointer-import',
         valueAsJsCode: importName
     };
 }
@@ -125,7 +126,7 @@ function valueToJson(value, configName, definedAtData, importStatements, filesEn
     try {
         configValueSerialized = (0, stringify_1.stringify)(value, {
             valueName,
-            forbidReactElements: true,
+            ...stringifyOptions,
             // Replace import strings with import variables.
             // - We don't need this anymore and could remove it.
             //   - We temporarily needed it for nested document configs (`config.document.{title,description,favicon}`), but we finally decided to go for flat document configs instead (`config.{title,description,favicon}`).
@@ -152,6 +153,15 @@ function valueToJson(value, configName, definedAtData, importStatements, filesEn
     (0, utils_js_1.assert)(!configValueSerialized.includes(REPLACE_ME_AFTER));
     return configValueSerialized;
 }
+function isJsonValue(value) {
+    try {
+        (0, stringify_1.stringify)(value, stringifyOptions);
+    }
+    catch (err) {
+        return false;
+    }
+    return true;
+}
 function logJsonSerializeError(err, configName, definedAtData) {
     /*
     // import { isJsonSerializerError } from '@brillout/json-serializer/stringify'

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.222';
+exports.PROJECT_VERSION = '0.4.223-commit-586dbfb';

package/dist/cjs/utils/assert.js

@@ -47,7 +47,7 @@ function assert(condition, debugInfo) {
         const debugInfoSerialized = typeof debugInfo === 'string' ? debugInfo : JSON.stringify(debugInfo);
         return picocolors_1.default.dim(`Debug info (for Vike maintainers; you can ignore this): ${debugInfoSerialized}`);
     })();
-    const link = picocolors_1.default.blue('https://github.com/vikejs/vike/issues/new');
+    const link = picocolors_1.default.blue('https://github.com/vikejs/vike/issues/new?template=bug.yml');
     let errMsg = [
         `You stumbled upon a Vike bug. Go to ${link} and copy-paste this error. A maintainer will fix the bug (usually within 24 hours).`,
         debugStr

package/dist/cjs/utils/assertSetup.js

@@ -21,7 +21,7 @@ const isVitest_js_1 = require("./isVitest.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 (0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
 const debug = (0, debug_js_1.createDebugger)('vike:setup');
-const setup = (0, getGlobalObject_js_1.getGlobalObject)('utils/assertIsNotProductionRuntime.ts', {});
+const setup = (0, getGlobalObject_js_1.getGlobalObject)('utils/assertSetup.ts', {});
 // Called by Vike modules that want to ensure that they aren't loaded by the server runtime in production
 function assertIsNotProductionRuntime() {
     if (debug.isActivated)

package/dist/cjs/utils/assertSingleInstance.js

@@ -16,7 +16,7 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 /* Use original assertUsage() & assertWarning() after all CJS is removed from node_modules/vike/dist/
 import { assertUsage, assertWarning } from './assert.js'
 */
-const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('assertSingleInstance.ts', {
+const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('utils/assertSingleInstance.ts', {
     instances: [],
     alreadyLogged: new Set()
 });
@@ -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/findFile.js

@@ -8,7 +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).
+// 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 tinyglobby 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/getGlobalObject.js

@@ -4,17 +4,13 @@ exports.getGlobalObject = getGlobalObject;
 exports.assertIsSingleModuleInstance = assertIsSingleModuleInstance;
 const assert_js_1 = require("./assert.js");
 /** Share information across module instances. */
-function getGlobalObject(
-// We use the filename (or file path) as key. There should be only one getGlobalObject() usage per file. Thus the key should be unique, assuming the filename (or file path) is unique.
-key, defaultValue) {
+function getGlobalObject(key, defaultValue) {
     const globalObjects = getGlobalObjects();
     const globalObject = (globalObjects[key] = globalObjects[key] || defaultValue);
     return globalObject;
 }
 /** Assert that the module is instantiated only once. */
-function assertIsSingleModuleInstance(
-// We use the filename (or file path) as key.
-key) {
+function assertIsSingleModuleInstance(key) {
     const globalObjects = getGlobalObjects();
     (0, assert_js_1.assert)(!(key in globalObjects));
 }

package/dist/cjs/utils/parseUrl-extras.js

@@ -30,8 +30,8 @@ function prependBase(url, baseServer) {
     return `${baseServerNormalized}${url}`;
 }
 function removeBaseServer(url, baseServer) {
-    const { hasBaseServer, origin, pathname, pathnameOriginal, searchOriginal, hashOriginal } = (0, parseUrl_js_1.parseUrl)(url, baseServer);
-    (0, assert_js_1.assert)(hasBaseServer);
+    const { isBaseMissing, origin, pathname, pathnameOriginal, searchOriginal, hashOriginal } = (0, parseUrl_js_1.parseUrl)(url, baseServer);
+    (0, assert_js_1.assert)(!isBaseMissing);
     (0, parseUrl_js_1.assertUrlComponents)(url, origin, pathnameOriginal, searchOriginal, hashOriginal);
     const urlWithoutBase = (0, parseUrl_js_1.createUrlFromComponents)(origin, pathname, searchOriginal, hashOriginal);
     return urlWithoutBase;