vike 0.4.222-commit-207e079 → 0.4.222-commit-5513d32

package/dist/cjs/node/plugin/plugins/buildApp.js

@@ -9,6 +9,9 @@ const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js"
 const getFullBuildInlineConfig_js_1 = require("../shared/getFullBuildInlineConfig.js");
 function buildApp() {
     let config;
+    // `builder.buildApp` can be overriden by another plugin e.g vike-vercel https://github.com/vikejs/vike/pull/2184#issuecomment-2659425195
+    // In that case, we should'nt `forceExit`.
+    let forceExit = false;
     return [
         {
             name: 'vike:buildApp',
@@ -23,6 +26,10 @@ function buildApp() {
                             (0, utils_js_1.assert)(builder.environments.ssr);
                             await builder.build(builder.environments.client);
                             await builder.build(builder.environments.ssr);
+                            if (forceExit) {
+                                (0, runPrerender_js_1.runPrerender_forceExit)();
+                                (0, utils_js_1.assert)(false);
+                            }
                         }
                     },
                     environments: {
@@ -61,11 +68,8 @@ function buildApp() {
                 if (!(0, context_js_1.isPrerenderAutoRunEnabled)(vikeConfig))
                     return;
                 const configInline = (0, getFullBuildInlineConfig_js_1.getFullBuildInlineConfig)(config);
-                const { forceExit } = await (0, runPrerender_js_1.runPrerenderFromAutoRun)(configInline, config);
-                if (forceExit) {
-                    (0, runPrerender_js_1.runPrerender_forceExit)();
-                    (0, utils_js_1.assert)(false);
-                }
+                const res = await (0, runPrerender_js_1.runPrerenderFromAutoRun)(configInline, config);
+                forceExit = res.forceExit;
             }
         }
     ];

package/dist/cjs/node/plugin/plugins/buildConfig.js

@@ -86,6 +86,9 @@ function buildConfig() {
         {
             name: 'vike:buildConfig:pre',
             apply: 'build',
+            applyToEnvironment(env) {
+                return env.name === 'ssr';
+            },
             // Make sure other writeBundle() hooks are called after this writeBundle() hook.
             //  - set_ASSETS_MANIFEST() needs to be called before dist/server/ code is executed.
             //    - For example, the writeBundle() hook of vite-plugin-vercel needs to be called after this writeBundle() hook, otherwise: https://github.com/vikejs/vike/issues/1527

package/dist/cjs/node/plugin/plugins/envVars.js

@@ -95,7 +95,6 @@ function getIsClientSide(config, options) {
         return !isServerSide;
     }
     else {
-        (0, utils_js_1.assert)(config.build.ssr === false);
         (0, utils_js_1.assert)(typeof options?.ssr === 'boolean');
         const isServerSide = options.ssr;
         return !isServerSide;

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

@@ -133,7 +133,7 @@ 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;
@@ -149,18 +149,12 @@ async function loadVikeConfig(userRootDir, vikeVitePluginOptions) {
     // interop vike(options) in vite.config.js
     temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, userRootDir);
     // global
-    const configValuesGlobal = getConfigValues(pageConfigGlobal);
-    const global = (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyNew)({ configValues: configValuesGlobal });
-    // TODO/now DEDUPE
+    const pageConfigGlobalValues = getConfigValues(pageConfigGlobal);
+    const global = (0, getPageConfigUserFriendly_js_1.getPageConfigGlobalUserFriendly)({ pageConfigGlobalValues });
     // pages
     const pages = (0, utils_js_1.objectFromEntries)(pageConfigs.map((pageConfig) => {
-        const configValuesLocal = getConfigValues(pageConfig, true);
-        const configValues = { ...configValuesGlobal, ...configValuesLocal };
-        const page = {
-            ...(0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyNew)({ configValues }),
-            route: pageConfig.routeFilesystem?.routeString ?? null
-        };
-        return [pageConfig.pageId, page];
+        const pageConfigValues = getConfigValues(pageConfig, true);
+        return (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendly)(pageConfigGlobalValues, pageConfig, pageConfigValues);
     }));
     return { pageConfigs, pageConfigGlobal, global, pages };
 }
@@ -225,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,

package/dist/cjs/node/plugin/shared/getHttpRequestAsyncStore.js

@@ -55,7 +55,7 @@ async function installHttpRequestAsyncStore() {
         return;
     }
     asyncLocalStorage = new mod.AsyncLocalStorage();
-    (0, renderPage_js_1.renderPage_addWrapper)(async (httpRequestId, renderPage) => {
+    (0, renderPage_js_1.renderPage_addAsyncHookwrapper)(async (httpRequestId, renderPage) => {
         (0, utils_js_1.assert)(asyncLocalStorage);
         const loggedErrors = new Set();
         const markErrorAsLogged = (err) => {

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

@@ -127,7 +127,7 @@ function getViteConfig() {
 }
 async function initGlobalContext_renderPage() {
     debug('initGlobalContext_renderPage()');
-    // globalObject.isProduction isn't set upon production server without vike-server (there isn't any signal we can use)
+    // `globalObject.isProduction === undefined` when using production server without `vike-server`. (There isn't any reliable signal we can use to determine early whether the environement is production or development.)
     if (globalObject.isProduction === undefined)
         setIsProduction(true);
     await initGlobalContext();

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

@@ -102,7 +102,7 @@ async function loadPageUserFiles(pageFilesAll, pageConfig, pageConfigGlobal, pag
     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, pageConfigGlobal);
+    const pageContextExports = (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendly_oldDesign)(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
     return {
         pageContextExports,
         pageFilesLoaded: pageFilesServerSide

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");
@@ -26,13 +26,6 @@ const resolveRedirects_js_1 = require("./renderPage/resolveRedirects.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);
@@ -46,12 +39,20 @@ async function renderPage(pageContextInit) {
     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) => {
@@ -70,8 +71,11 @@ 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);
@@ -458,6 +462,6 @@ async function assertBaseUrl(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)(urlWithoutPageContextRequestSuffix, baseServer);
+    (0, utils_js_1.assertUsage)(!isBaseMissing, `${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)`);
 }

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/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/getPageContextUrlComputed.js

@@ -88,8 +88,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/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/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-commit-207e079';
+exports.PROJECT_VERSION = '0.4.222-commit-5513d32';

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/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;

package/dist/cjs/utils/parseUrl.js

@@ -49,7 +49,7 @@ function parseUrl(url, baseServer) {
     const pathnameOriginal = urlWithoutHashNorSearch.slice((origin || '').length);
     assertUrlComponents(url, origin, pathnameOriginal, searchOriginal, hashOriginal);
     // Base URL
-    let { pathname, hasBaseServer } = removeBaseServer(pathnameAbsoluteWithBase, baseServer);
+    let { pathname, isBaseMissing } = removeBaseServer(pathnameAbsoluteWithBase, baseServer);
     // pageContext.urlParsed.href
     const href = createUrlFromComponents(origin, pathname, searchOriginal, hashOriginal);
     // pageContext.urlParsed.{hostname, port}
@@ -66,7 +66,7 @@ function parseUrl(url, baseServer) {
         origin,
         pathname,
         pathnameOriginal: pathnameOriginal,
-        hasBaseServer,
+        isBaseMissing,
         search,
         searchAll,
         searchOriginal,
@@ -235,7 +235,7 @@ function removeBaseServer(pathnameAbsoluteWithBase, baseServer) {
     (0, assert_js_1.assert)(baseServer.startsWith('/'));
     if (baseServer === '/') {
         const pathname = pathnameAbsoluteWithBase;
-        return { pathname, hasBaseServer: true };
+        return { pathname, isBaseMissing: false };
     }
     // Support `url === '/some-base-url' && baseServer === '/some-base-url/'`
     let baseServerNormalized = baseServer;
@@ -245,7 +245,7 @@ function removeBaseServer(pathnameAbsoluteWithBase, baseServer) {
     }
     if (!urlPathname.startsWith(baseServerNormalized)) {
         const pathname = pathnameAbsoluteWithBase;
-        return { pathname, hasBaseServer: false };
+        return { pathname, isBaseMissing: true };
     }
     (0, assert_js_1.assert)(urlPathname.startsWith('/') || urlPathname.startsWith('http'));
     (0, assert_js_1.assert)(urlPathname.startsWith(baseServerNormalized));
@@ -253,7 +253,7 @@ function removeBaseServer(pathnameAbsoluteWithBase, baseServer) {
     if (!urlPathname.startsWith('/'))
         urlPathname = '/' + urlPathname;
     (0, assert_js_1.assert)(urlPathname.startsWith('/'));
-    return { pathname: urlPathname, hasBaseServer: true };
+    return { pathname: urlPathname, isBaseMissing: false };
 }
 function isBaseServer(baseServer) {
     return baseServer.startsWith('/');

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;

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

@@ -5,7 +5,7 @@ export { getPageContextFromClientHooks };
 export { setPageContextInitIsPassedToClient };
 export type { PageContextFromServerHooks };
 export type { PageContextFromClientHooks };
-import type { PageConfigUserFriendly, PageFile } from '../../shared/getPageFiles.js';
+import type { PageConfigUserFriendlyOld, PageFile } from '../../shared/getPageFiles.js';
 import type { PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
 type PageContext = {
     urlOriginal: string;
@@ -21,9 +21,9 @@ declare function getPageContextFromHooks_serialized(): PageContextSerialized & {
     routeParams: Record<string, string>;
     _hasPageContextFromServer: true;
 };
-declare function getPageContextFromHooks_isHydration(pageContext: PageContextSerialized & PageContext & PageConfigUserFriendly & {
+declare function getPageContextFromHooks_isHydration(pageContext: PageContextSerialized & PageContext & PageConfigUserFriendlyOld & {
     _hasPageContextFromServer: true;
-}): Promise<PageContextSerialized & PageContext & PageConfigUserFriendly & {
+}): Promise<PageContextSerialized & PageContext & PageConfigUserFriendlyOld & {
     _hasPageContextFromServer: true;
 } & {
     _hasPageContextFromClient: boolean;
@@ -45,5 +45,5 @@ type PageContextFromClientHooks = {
 declare function getPageContextFromClientHooks(pageContext: {
     pageId: string;
     _hasPageContextFromServer: boolean;
-} & PageContext & PageConfigUserFriendly, isErrorPage: boolean): Promise<PageContextFromClientHooks>;
+} & PageContext & PageConfigUserFriendlyOld, isErrorPage: boolean): Promise<PageContextFromClientHooks>;
 declare function setPageContextInitIsPassedToClient(pageContext: Record<string, unknown>): void;

package/dist/esm/client/client-routing-runtime/prefetch/getPrefetchSettings.d.ts

@@ -1,10 +1,10 @@
 export { getPrefetchSettings };
 export { PAGE_CONTEXT_MAX_AGE_DEFAULT };
 export type { PrefetchSettingResolved };
-import type { PageConfigUserFriendly } from '../../../shared/getPageFiles.js';
+import type { PageConfigUserFriendlyOld } from '../../../shared/getPageFiles.js';
 declare const PAGE_CONTEXT_MAX_AGE_DEFAULT = 5000;
 type PrefetchSettingResolved = {
     staticAssets: false | 'hover' | 'viewport';
     pageContext: false | number;
 };
-declare function getPrefetchSettings(pageContext: PageConfigUserFriendly, linkTag: null | HTMLElement): PrefetchSettingResolved;
+declare function getPrefetchSettings(pageContext: PageConfigUserFriendlyOld, linkTag: null | HTMLElement): PrefetchSettingResolved;

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

@@ -6,7 +6,7 @@ export { addLinkPrefetchHandlers };
 export { addLinkPrefetchHandlers_watch };
 export { addLinkPrefetchHandlers_unwatch };
 import { type PageContextFromServerHooks, getPageContextFromServerHooks } from './getPageContextFromHooks.js';
-import type { PageConfigUserFriendly, PageFile } from '../../shared/getPageFiles.js';
+import type { PageConfigUserFriendlyOld, PageFile } from '../../shared/getPageFiles.js';
 import { type PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
 type ResultPageContextFromServer = Awaited<ReturnType<typeof getPageContextFromServerHooks>>;
 type PageContextForPrefetch = {
@@ -19,7 +19,7 @@ type PageContextForPrefetch = {
 };
 declare function getPageContextPrefetched(pageContext: {
     urlPathname: string;
-} & PageConfigUserFriendly): null | PageContextFromServerHooks;
+} & PageConfigUserFriendlyOld): null | PageContextFromServerHooks;
 declare function populatePageContextPrefetchCache(pageContext: PageContextForPrefetch, result: ResultPageContextFromServer): void;
 /**
  * Programmatically prefetch client assets.

package/dist/esm/client/client-routing-runtime/prefetch.js

@@ -60,8 +60,8 @@ async function prefetchPageContextFromServerHooks(pageContextLink, resultMaxAge)
     const result = await getPageContextFromServerHooks(pageContextLink, false);
     setPageContextPrefetchCache(pageContextLink, result, resultMaxAge);
 }
-function populatePageContextPrefetchCache(pageContext /*& PageConfigUserFriendly*/, result) {
-    // TODO/pageContext-prefetch: replace with using pageContext.config.prerender instead. (For being able to do that: eager configs need to be accessible without have to use PageConfigUserFriendly as it isn't available here.)
+function populatePageContextPrefetchCache(pageContext /*& PageConfigUserFriendlyOld*/, result) {
+    // TODO/pageContext-prefetch: replace with using pageContext.config.prerender instead. (For being able to do that: eager configs need to be accessible without have to use PageConfigUserFriendlyOld as it isn't available here.)
     if (!isBrilloutDocpress())
         return;
     setPageContextPrefetchCache(pageContext, result, null);

package/dist/esm/client/client-routing-runtime/skipLink.js

@@ -49,8 +49,8 @@ function isSameAsCurrentUrl(href) {
 function hasBaseServer(href) {
     const baseServer = getBaseServer();
     assert(isBaseServer(baseServer));
-    const { hasBaseServer } = parseUrl(href, baseServer);
-    return hasBaseServer;
+    const { isBaseMissing } = parseUrl(href, baseServer);
+    return !isBaseMissing;
 }
 function isDisableAutomaticLinkInterception() {
     // @ts-ignore

package/dist/esm/client/server-routing-runtime/getPageContext.d.ts

@@ -11,6 +11,6 @@ declare function getPageContext(): Promise<{
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
     _pageConfigs: import("../../__internal/index.js").PageConfig[];
     _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-} & import("../../shared/getPageFiles.js").PageConfigUserFriendly & {
+} & import("../../shared/getPageFiles.js").PageConfigUserFriendlyOld & {
     _pageFilesLoaded: import("../../shared/getPageFiles.js").PageFile[];
 }>;

package/dist/esm/client/shared/executeOnRenderClientHook.d.ts

@@ -1,6 +1,6 @@
 export { executeOnRenderClientHook };
 export type { PageContextBeforeRenderClient };
-import type { PageFile, PageConfigUserFriendly } from '../../shared/getPageFiles.js';
+import type { PageFile, PageConfigUserFriendlyOld } from '../../shared/getPageFiles.js';
 import { type PageContextForUserConsumptionClientSide } from './preparePageContextForUserConsumptionClientSide.js';
 import type { PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
 type PageContextBeforeRenderClient = {
@@ -9,5 +9,5 @@ type PageContextBeforeRenderClient = {
     urlPathname?: string;
     pageId: string;
     _pageConfigs: PageConfigRuntime[];
-} & PageConfigUserFriendly & PageContextForUserConsumptionClientSide;
+} & PageConfigUserFriendlyOld & PageContextForUserConsumptionClientSide;
 declare function executeOnRenderClientHook<PC extends PageContextBeforeRenderClient>(pageContext: PC, isClientRouting: boolean): Promise<void>;

package/dist/esm/client/shared/loadUserFilesClientSide.d.ts

@@ -1,9 +1,9 @@
 export { loadUserFilesClientSide };
 export { isErrorFetchingStaticAssets };
 export type { PageContextUserFiles };
-import { type PageFile, type PageConfigUserFriendly } from '../../shared/getPageFiles.js';
+import { type PageFile, type PageConfigUserFriendlyOld } from '../../shared/getPageFiles.js';
 import type { PageConfigGlobalRuntime, PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
-type PageContextUserFilesLoaded = PageConfigUserFriendly & {
+type PageContextUserFilesLoaded = PageConfigUserFriendlyOld & {
     _pageFilesLoaded: PageFile[];
 };
 type PageContextUserFiles = {

package/dist/esm/client/shared/loadUserFilesClientSide.js

@@ -1,7 +1,7 @@
 export { loadUserFilesClientSide };
 export { isErrorFetchingStaticAssets };
 import { getPageFilesClientSide } from '../../shared/getPageFiles.js';
-import { getPageConfigUserFriendlyOld } from '../../shared/page-configs/getPageConfigUserFriendly.js';
+import { getPageConfigUserFriendly_oldDesign } from '../../shared/page-configs/getPageConfigUserFriendly.js';
 import { findPageConfig } from '../../shared/page-configs/findPageConfig.js';
 import { loadConfigValues } from '../../shared/page-configs/loadConfigValues.js';
 import { objectAssign } from '../server-routing-runtime/utils.js';
@@ -30,7 +30,7 @@ async function loadUserFilesClientSide(pageId, pageFilesAll, pageConfigs, pageCo
         }
         throw err;
     }
-    const pageContextExports = getPageConfigUserFriendlyOld(pageFilesClientSide, pageConfigLoaded, pageConfigGlobal);
+    const pageContextExports = getPageConfigUserFriendly_oldDesign(pageFilesClientSide, pageConfigLoaded, pageConfigGlobal);
     const pageContextAddendum = {};
     objectAssign(pageContextAddendum, pageContextExports);
     objectAssign(pageContextAddendum, { _pageFilesLoaded: pageFilesClientSide });

package/dist/esm/client/shared/preparePageContextForUserConsumptionClientSide.d.ts

@@ -1,9 +1,9 @@
 export { preparePageContextForUserConsumptionClientSide };
 export type { PageContextForUserConsumptionClientSide };
-import type { PageConfigUserFriendly } from '../../shared/getPageFiles.js';
+import type { PageConfigUserFriendlyOld } from '../../shared/getPageFiles.js';
 import type { PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
 import { PageContextForPassToClientWarning } from './getPageContextProxyForUser.js';
-type PageContextForUserConsumptionClientSide = PageConfigUserFriendly & PageContextForPassToClientWarning & {
+type PageContextForUserConsumptionClientSide = PageConfigUserFriendlyOld & PageContextForPassToClientWarning & {
     pageId: string;
     _pageConfigs: PageConfigRuntime[];
 };