vike 0.4.222-commit-207e079 → 0.4.222

package/dist/cjs/node/plugin/index.js

@@ -35,7 +35,7 @@ const workaroundVite6HmrRegression_js_1 = require("./plugins/workaroundVite6HmrR
 const buildApp_js_1 = require("./plugins/buildApp.js");
 // We don't call this in ./onLoad.ts to avoid a cyclic dependency with utils.ts
 (0, getPageAssets_js_1.setResolveClientEntriesDev)(resolveClientEntriesDev_js_1.resolveClientEntriesDev);
-// Return `PluginInterop` instead of `Plugin` to avoid type mismatch upon different Vite versions
+// Return as `any` to avoid Plugin type mismatches when there are multiple Vite versions installed
 function plugin(vikeVitePluginOptions = {}) {
     const plugins = [
         ...(0, commonConfig_js_1.commonConfig)(vikeVitePluginOptions),

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

@@ -29,7 +29,7 @@ function baseUrls() {
         },
         async configResolved(config) {
             const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);
-            const basesResolved2 = resolveBaseFromResolvedConfig(vikeConfig.global.config.baseServer ?? null, vikeConfig.global.config.baseAssets ?? null, config);
+            const basesResolved2 = (0, resolveBase_js_1.resolveBaseFromResolvedConfig)(vikeConfig.global.config.baseServer ?? null, vikeConfig.global.config.baseAssets ?? null, config);
             (0, utils_js_1.assert)(basesResolved2.baseServer === basesResolved.baseServer);
             (0, utils_js_1.assert)(basesResolved2.baseAssets === basesResolved.baseAssets);
             /* In dev, Vite seems buggy around setting vite.config.js#base to an absolute URL (e.g. http://localhost:8080/cdn/)
@@ -40,8 +40,3 @@ function baseUrls() {
         }
     };
 }
-function resolveBaseFromResolvedConfig(baseServer, baseAssets, config) {
-    let baseViteOriginal = config._baseViteOriginal;
-    (0, utils_js_1.assert)(baseViteOriginal === null || typeof baseViteOriginal == 'string');
-    return (0, resolveBase_js_1.resolveBase)(baseViteOriginal, baseServer, baseAssets);
-}

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

@@ -21,7 +21,7 @@ exports.assertBuildInfo = assertBuildInfo;
 exports.getViteConfigRuntime = getViteConfigRuntime;
 exports.updateUserFiles = updateUserFiles;
 // The core logic revolves around:
-// - globalObject.userFiles which is the main requirement for resolveGlobalContext()
+// - globalObject.userFiles which is the main requirement for assembleGlobalContext()
 // - In production: globalObject.buildEntry which is the production entry set by @brillout/vite-plugin-server-entry
 //   - loadBuildEntry() sets globalObject.buildEntry and then sets globalObject.userFiles
 //   - With vike-server it's set at server start: @brillout/vite-plugin-server-entry injects `import './entry.mjs'` (the production entry generated by @brillout/vite-plugin-server-entry) as first line of code of dist/server/index.mjs while dist/server/entry.mjs calls setGlobalContext_buildEntry()
@@ -35,7 +35,6 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const loadPageRoutes_js_1 = require("../../shared/route/loadPageRoutes.js");
 const assertV1Design_js_1 = require("../shared/assertV1Design.js");
 const getPageConfigsRuntime_js_1 = require("../../shared/getPageConfigsRuntime.js");
-const resolveBase_js_1 = require("../shared/resolveBase.js");
 const debug = (0, utils_js_1.createDebugger)('vike:globalContext');
 const globalObject = (0, utils_js_1.getGlobalObject)('globalContext.ts', getInitialGlobalContext());
 async function getGlobalContextInternal() {
@@ -83,9 +82,7 @@ function makePublic(globalContext) {
         'assetsManifest',
         'config',
         'viteConfig',
-        'pages',
-        'baseServer',
-        'baseAssets'
+        'pages'
     ]);
     return globalContextPublic;
 }
@@ -190,7 +187,7 @@ function setIsProduction(isProduction) {
     globalObject.isProduction = isProduction;
 }
 function defineGlobalContext() {
-    const globalContext = resolveGlobalContext();
+    const globalContext = assembleGlobalContext();
     assertIsDefined(globalContext);
     const globalContext_public = makePublic(globalContext);
     (0, utils_js_1.objectAssign)(globalContext, { globalContext_public });
@@ -199,7 +196,7 @@ function defineGlobalContext() {
     assertGlobalContextIsDefined();
     (0, utils_js_1.onSetupRuntime)();
 }
-function resolveGlobalContext() {
+function assembleGlobalContext() {
     const { viteDevServer, viteConfig, isPrerendering, isProduction, userFiles } = globalObject;
     (0, utils_js_1.assert)(typeof isProduction === 'boolean');
     let globalContext;
@@ -218,8 +215,7 @@ function resolveGlobalContext() {
             viteDevServer,
             viteConfig,
             ...userFiles,
-            viteConfigRuntime,
-            ...resolveBaseRuntime(viteConfigRuntime, userFiles.config)
+            viteConfigRuntime
         };
     }
     else {
@@ -236,8 +232,7 @@ function resolveGlobalContext() {
             ...userFiles,
             viteDevServer: null,
             viteConfigRuntime: buildInfo.viteConfigRuntime,
-            usesClientRouter: buildInfo.usesClientRouter,
-            ...resolveBaseRuntime(buildInfo.viteConfigRuntime, userFiles.config)
+            usesClientRouter: buildInfo.usesClientRouter
         };
         if (isPrerendering) {
             (0, utils_js_1.assert)(viteConfig);
@@ -406,9 +401,3 @@ function getInitialGlobalContext() {
         viteDevServerPromiseResolve
     };
 }
-function resolveBaseRuntime(viteConfigRuntime, config) {
-    const baseViteOriginal = viteConfigRuntime._baseViteOriginal;
-    const baseServerUnresolved = config.baseServer ?? null;
-    const baseAssetsUnresolved = config.baseAssets ?? null;
-    return (0, resolveBase_js_1.resolveBase)(baseViteOriginal, baseServerUnresolved, baseAssetsUnresolved);
-}

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

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

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

@@ -23,6 +23,7 @@ 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
 });
@@ -342,6 +343,7 @@ 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;
@@ -349,7 +351,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, globalContext.baseServer);
+    const urlNormalized = (0, utils_js_1.normalizeUrlPathname)(urlOriginal, trailingSlash ?? false, 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');
@@ -359,7 +361,8 @@ async function normalizeUrl(pageContextInit, globalContext, httpRequestId) {
     return pageContextHttpResponse;
 }
 async function getPermanentRedirect(pageContextInit, globalContext, httpRequestId) {
-    const urlWithoutBase = (0, utils_js_1.removeBaseServer)(pageContextInit.urlOriginal, globalContext.baseServer);
+    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) => {
@@ -390,8 +393,9 @@ 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, globalContext.baseServer);
+            urlTarget = (0, utils_js_1.prependBase)(urlTarget, 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');
@@ -455,7 +459,7 @@ pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit, globalConte
     return { pageContextAbort };
 }
 async function assertBaseUrl(pageContextInit, globalContext) {
-    const { baseServer } = 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/shared/resolveBase.js

@@ -4,8 +4,21 @@ 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/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 GlobalContextInternal instead?
+// 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?.()));

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

package/dist/cjs/utils/assertSingleInstance.js

@@ -27,7 +27,7 @@ function assertSingleInstance() {
         const versions = (0, unique_js_1.unique)(globalObject.instances);
         assertUsage(versions.length <= 1, 
         // DO *NOT* patch vike to remove this error: because of multiple conflicting versions, you *will* eventually encounter insidious issues that hard to debug and potentially a security hazard, see for example https://github.com/vikejs/vike/issues/1108
-        `vike@${picocolors_1.default.bold(versions[0])} and vike@${picocolors_1.default.bold(versions[1])} loaded but it's forbidden to load different versions`);
+        `vike@${picocolors_1.default.bold(versions[0])} and vike@${picocolors_1.default.bold(versions[1])} loaded but only one version should be loaded`);
     }
     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/esm/client/client-routing-runtime/renderPageClientSide.js

@@ -488,7 +488,7 @@ async function renderPageClientSide(renderArgs) {
     }
 }
 // For Vike tests (but also potentially for Vike users)
-// https://github.com/vikejs/vike/blob/ffbc5cf16407bcc075f414447e50d997c87c0c94/test/playground/pages/nested-layout/e2e-test.ts#L59
+// TODO/now add comment linking to usage example
 function stampFinished(urlOriginal) {
     window._vike ?? (window._vike = {});
     window._vike.fullyRenderedUrl = urlOriginal;

package/dist/esm/node/plugin/index.d.ts

@@ -4,10 +4,7 @@ export { plugin as ssr };
 export type { VikeVitePluginOptions as UserConfig };
 export type { VikeVitePluginOptions };
 export { PROJECT_VERSION as version } from './utils.js';
-type PluginInterop = Record<string, unknown> & {
-    name: string;
-};
-declare function plugin(vikeVitePluginOptions?: VikeVitePluginOptions): PluginInterop[];
+declare function plugin(vikeVitePluginOptions?: VikeVitePluginOptions): any;
 /** @deprecated Define Vike settings in +config.js instead of vite.config.js */
 type VikeVitePluginOptions = {
     /** @deprecated Define Vike settings in +config.js instead of vite.config.js */

package/dist/esm/node/plugin/index.js

@@ -29,7 +29,7 @@ import { workaroundVite6HmrRegression } from './plugins/workaroundVite6HmrRegres
 import { buildApp } from './plugins/buildApp.js';
 // We don't call this in ./onLoad.ts to avoid a cyclic dependency with utils.ts
 setResolveClientEntriesDev(resolveClientEntriesDev);
-// Return `PluginInterop` instead of `Plugin` to avoid type mismatch upon different Vite versions
+// Return as `any` to avoid Plugin type mismatches when there are multiple Vite versions installed
 function plugin(vikeVitePluginOptions = {}) {
     const plugins = [
         ...commonConfig(vikeVitePluginOptions),

package/dist/esm/node/plugin/plugins/baseUrls.js

@@ -1,5 +1,5 @@
 export { baseUrls };
-import { resolveBase } from '../../shared/resolveBase.js';
+import { resolveBase, resolveBaseFromResolvedConfig } from '../../shared/resolveBase.js';
 import { assert } from '../utils.js';
 import { getVikeConfig } from './importUserCode/v1-design/getVikeConfig.js';
 function baseUrls() {
@@ -38,8 +38,3 @@ function baseUrls() {
         }
     };
 }
-function resolveBaseFromResolvedConfig(baseServer, baseAssets, config) {
-    let baseViteOriginal = config._baseViteOriginal;
-    assert(baseViteOriginal === null || typeof baseViteOriginal == 'string');
-    return resolveBase(baseViteOriginal, baseServer, baseAssets);
-}

package/dist/esm/node/runtime/globalContext.d.ts

@@ -16,25 +16,24 @@ export { assertBuildInfo };
 export { getViteConfigRuntime };
 export { updateUserFiles };
 export type { BuildInfo };
-export type { GlobalContextInternal };
+export type { GlobalContext };
 export type { GlobalContextPublic };
 import type { ViteManifest } from '../shared/ViteManifest.js';
 import type { ResolvedConfig, ViteDevServer } from 'vite';
 import type { ConfigUserFriendly, PageConfigsUserFriendly } from '../../shared/page-configs/getPageConfigUserFriendly.js';
 import type { ConfigVitePluginServerEntry } from '@brillout/vite-plugin-server-entry/plugin';
-import { type BaseUrlsResolved } from '../shared/resolveBase.js';
-type GlobalContextPublic = Pick<GlobalContext, 'assetsManifest' | 'config' | 'viteConfig' | 'pages' | 'baseAssets' | 'baseServer'>;
+type GlobalContextPublic = Pick<GlobalContext, 'assetsManifest' | 'config' | 'viteConfig' | 'pages'>;
 type PageRuntimeInfo = Awaited<ReturnType<typeof getUserFiles>>;
-type GlobalContextInternal = GlobalContext & {
+type GlobalContext = GlobalContextWithoutPublicCopy & {
     globalContext_public: GlobalContextPublic;
 };
-type GlobalContext = {
+type GlobalContextWithoutPublicCopy = {
     viteConfigRuntime: {
         _baseViteOriginal: null | string;
     };
     config: ConfigUserFriendly['config'];
     pages: PageConfigsUserFriendly;
-} & BaseUrlsResolved & PageRuntimeInfo & ({
+} & PageRuntimeInfo & ({
     isProduction: false;
     isPrerendering: false;
     viteConfig: ResolvedConfig;
@@ -52,7 +51,7 @@ type GlobalContext = {
     usesClientRouter: boolean;
     viteConfig: ResolvedConfig;
 })));
-declare function getGlobalContextInternal(): Promise<GlobalContextInternal>;
+declare function getGlobalContextInternal(): Promise<GlobalContext>;
 /** @experimental https://vike.dev/getGlobalContext */
 declare function getGlobalContextSync(): GlobalContextPublic;
 /** @experimental https://vike.dev/getGlobalContext */

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

@@ -18,7 +18,7 @@ export { assertBuildInfo };
 export { getViteConfigRuntime };
 export { updateUserFiles };
 // The core logic revolves around:
-// - globalObject.userFiles which is the main requirement for resolveGlobalContext()
+// - globalObject.userFiles which is the main requirement for assembleGlobalContext()
 // - In production: globalObject.buildEntry which is the production entry set by @brillout/vite-plugin-server-entry
 //   - loadBuildEntry() sets globalObject.buildEntry and then sets globalObject.userFiles
 //   - With vike-server it's set at server start: @brillout/vite-plugin-server-entry injects `import './entry.mjs'` (the production entry generated by @brillout/vite-plugin-server-entry) as first line of code of dist/server/index.mjs while dist/server/entry.mjs calls setGlobalContext_buildEntry()
@@ -32,7 +32,6 @@ import pc from '@brillout/picocolors';
 import { loadPageRoutes } from '../../shared/route/loadPageRoutes.js';
 import { assertV1Design } from '../shared/assertV1Design.js';
 import { getPageConfigsRuntime } from '../../shared/getPageConfigsRuntime.js';
-import { resolveBase } from '../shared/resolveBase.js';
 const debug = createDebugger('vike:globalContext');
 const globalObject = getGlobalObject('globalContext.ts', getInitialGlobalContext());
 async function getGlobalContextInternal() {
@@ -80,9 +79,7 @@ function makePublic(globalContext) {
         'assetsManifest',
         'config',
         'viteConfig',
-        'pages',
-        'baseServer',
-        'baseAssets'
+        'pages'
     ]);
     return globalContextPublic;
 }
@@ -187,7 +184,7 @@ function setIsProduction(isProduction) {
     globalObject.isProduction = isProduction;
 }
 function defineGlobalContext() {
-    const globalContext = resolveGlobalContext();
+    const globalContext = assembleGlobalContext();
     assertIsDefined(globalContext);
     const globalContext_public = makePublic(globalContext);
     objectAssign(globalContext, { globalContext_public });
@@ -196,7 +193,7 @@ function defineGlobalContext() {
     assertGlobalContextIsDefined();
     onSetupRuntime();
 }
-function resolveGlobalContext() {
+function assembleGlobalContext() {
     const { viteDevServer, viteConfig, isPrerendering, isProduction, userFiles } = globalObject;
     assert(typeof isProduction === 'boolean');
     let globalContext;
@@ -215,8 +212,7 @@ function resolveGlobalContext() {
             viteDevServer,
             viteConfig,
             ...userFiles,
-            viteConfigRuntime,
-            ...resolveBaseRuntime(viteConfigRuntime, userFiles.config)
+            viteConfigRuntime
         };
     }
     else {
@@ -233,8 +229,7 @@ function resolveGlobalContext() {
             ...userFiles,
             viteDevServer: null,
             viteConfigRuntime: buildInfo.viteConfigRuntime,
-            usesClientRouter: buildInfo.usesClientRouter,
-            ...resolveBaseRuntime(buildInfo.viteConfigRuntime, userFiles.config)
+            usesClientRouter: buildInfo.usesClientRouter
         };
         if (isPrerendering) {
             assert(viteConfig);
@@ -403,9 +398,3 @@ function getInitialGlobalContext() {
         viteDevServerPromiseResolve
     };
 }
-function resolveBaseRuntime(viteConfigRuntime, config) {
-    const baseViteOriginal = viteConfigRuntime._baseViteOriginal;
-    const baseServerUnresolved = config.baseServer ?? null;
-    const baseAssetsUnresolved = config.baseAssets ?? null;
-    return resolveBase(baseViteOriginal, baseServerUnresolved, baseAssetsUnresolved);
-}

package/dist/esm/node/runtime/html/injectAssets/getViteDevScript.d.ts

@@ -1,5 +1,5 @@
 export { getViteDevScript };
-import type { GlobalContextInternal } from '../../globalContext.js';
+import type { GlobalContext } from '../../globalContext.js';
 declare function getViteDevScript(pageContext: {
-    _globalContext: GlobalContextInternal;
+    _globalContext: GlobalContext;
 }): Promise<string>;

package/dist/esm/node/runtime/html/injectAssets.d.ts

@@ -8,7 +8,7 @@ import { type PreloadFilter } from './injectAssets/getHtmlTags.js';
 import type { StreamFromReactStreamingPackage } from './stream/react-streaming.js';
 import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 import type { PageContextSerialization } from './serializePageContextClientSide.js';
-import type { GlobalContextInternal } from '../globalContext.js';
+import type { GlobalContext } from '../globalContext.js';
 type PageContextInjectAssets = {
     urlPathname: string;
     __getPageAssets: () => Promise<PageAsset[]>;
@@ -22,7 +22,7 @@ type PageContextInjectAssets = {
     _baseServer: string;
     _pageConfigs: PageConfigRuntime[];
     is404: null | boolean;
-    _globalContext: GlobalContextInternal;
+    _globalContext: GlobalContext;
 } & PageContextSerialization;
 declare function injectHtmlTagsToString(htmlParts: HtmlPart[], pageContext: PageContextInjectAssets & {
     _isStream: false;

package/dist/esm/node/runtime/renderPage/analyzePage.d.ts

@@ -2,5 +2,5 @@ export { analyzePage };
 import type { PageFile } from '../../../shared/getPageFiles/getPageFileObject.js';
 import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 import { type AnalysisResult } from '../../../shared/getPageFiles/analyzePageClientSide.js';
-import type { GlobalContextInternal } from '../globalContext.js';
-declare function analyzePage(pageFilesAll: PageFile[], pageConfig: null | PageConfigRuntime, pageId: string, globalContext: GlobalContextInternal): Promise<AnalysisResult>;
+import type { GlobalContext } from '../globalContext.js';
+declare function analyzePage(pageFilesAll: PageFile[], pageConfig: null | PageConfigRuntime, pageId: string, globalContext: GlobalContext): Promise<AnalysisResult>;

package/dist/esm/node/runtime/renderPage/getPageAssets.d.ts

@@ -5,7 +5,7 @@ export type { GetPageAssets };
 export type { PageContextGetPageAssets };
 import { type MediaType } from './inferMediaType.js';
 import type { ClientDependency } from '../../../shared/getPageFiles/analyzePageClientSide/ClientDependency.js';
-import type { GlobalContextInternal } from '../globalContext.js';
+import type { GlobalContext } from '../globalContext.js';
 import type { ResolveClientEntriesDev } from '../../plugin/shared/resolveClientEntriesDev.js';
 type PageAsset = {
     src: string;
@@ -18,7 +18,7 @@ type PageContextGetPageAssets = {
     _baseServer: string;
     _baseAssets: string | null;
     _includeAssetsImportedByServer: boolean;
-    _globalContext: GlobalContextInternal;
+    _globalContext: GlobalContext;
 };
 declare function getPageAssets(pageContext: PageContextGetPageAssets, clientDependencies: ClientDependency[], clientEntries: string[]): Promise<PageAsset[]>;
 declare function setResolveClientEntriesDev(resolveClientEntriesDev: ResolveClientEntriesDev): void;

package/dist/esm/node/runtime/renderPage/handleErrorWithoutErrorPage.d.ts

@@ -1,5 +1,5 @@
 export { handleErrorWithoutErrorPage };
-import type { GlobalContextInternal } from '../globalContext.js';
+import type { GlobalContext } from '../globalContext.js';
 import type { PageContextAfterRender } from './renderPageAlreadyRouted.js';
 import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 import type { PageFile } from '../../../shared/getPageFiles.js';
@@ -10,6 +10,6 @@ declare function handleErrorWithoutErrorPage<PageContext extends {
     pageId: null;
     _pageFilesAll: PageFile[];
     _pageConfigs: PageConfigRuntime[];
-    _globalContext: GlobalContextInternal;
+    _globalContext: GlobalContext;
     urlOriginal: string;
 }>(pageContext: PageContext): Promise<PageContext & PageContextAfterRender>;

package/dist/esm/node/runtime/renderPage/loadUserFilesServerSide.d.ts

@@ -6,12 +6,12 @@ import { PromiseType } from '../utils.js';
 import { PageContextGetPageAssets, type PageAsset } from './getPageAssets.js';
 import { type PageContextDebugRouteMatches } from './debugPageFiles.js';
 import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
-import type { GlobalContextInternal } from '../globalContext.js';
+import type { GlobalContext } from '../globalContext.js';
 type PageContext_loadUserFilesServerSide = PageContextGetPageAssets & PageContextDebugRouteMatches & {
     urlOriginal: string;
     _pageFilesAll: PageFile[];
     _pageConfigs: PageConfigRuntime[];
-    _globalContext: GlobalContextInternal;
+    _globalContext: GlobalContext;
 };
 type PageFiles = PromiseType<ReturnType<typeof loadUserFilesServerSide>>;
 declare function loadUserFilesServerSide(pageContext: {

package/dist/esm/node/runtime/renderPage/log404/index.d.ts

@@ -1,12 +1,12 @@
 export { log404 };
 export { getRoutesInfo };
 import type { PageRoutes } from '../../../../shared/route/index.js';
-import type { GlobalContextInternal } from '../../globalContext.js';
+import type { GlobalContext } from '../../globalContext.js';
 declare function log404(pageContext: {
     urlPathname: string;
     errorWhileRendering: null | Error;
     isClientSideNavigation: boolean;
     _pageRoutes: PageRoutes;
-    _globalContext: GlobalContextInternal;
+    _globalContext: GlobalContext;
 }): Promise<void>;
 declare function getRoutesInfo(pageRoutes: PageRoutes): string | null;

package/dist/esm/node/runtime/renderPage/preparePageContextForUserConsumptionServerSide.d.ts

@@ -4,7 +4,7 @@ import { PageContextUrlInternal } from '../../../shared/getPageContextUrlCompute
 import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 import type { PageConfigUserFriendly } from '../../../shared/page-configs/getPageConfigUserFriendly.js';
 import { PageContextBuiltInServerInternal } from '../../../shared/types.js';
-import type { GlobalContextInternal, GlobalContextPublic } from '../globalContext.js';
+import type { GlobalContext, GlobalContextPublic } from '../globalContext.js';
 type PageContextForUserConsumptionServerSide = PageContextBuiltInServerInternal & PageConfigUserFriendly & {
     urlOriginal: string;
     /** @deprecated */
@@ -18,7 +18,7 @@ type PageContextForUserConsumptionServerSide = PageContextBuiltInServerInternal
     is404: null | boolean;
     isClientSideNavigation: boolean;
     pageProps?: Record<string, unknown>;
-    _globalContext: GlobalContextInternal;
+    _globalContext: GlobalContext;
     globalContext: GlobalContextPublic;
 } & Record<string, unknown>;
 declare function preparePageContextForUserConsumptionServerSide(pageContext: PageContextForUserConsumptionServerSide): void;

package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.d.ts

@@ -5,7 +5,7 @@ export { getPageContextInitEnhanced };
 export type { PageContextAfterRender };
 export type { PageContextInitEnhanced };
 import { type PageContextUrlInternal } from '../../../shared/getPageContextUrlComputed.js';
-import type { GlobalContextInternal } from '../globalContext.js';
+import type { GlobalContext } from '../globalContext.js';
 import { HttpResponse } from './createHttpResponse.js';
 import { PageContext_loadUserFilesServerSide, type PageFiles } from './loadUserFilesServerSide.js';
 type PageContextAfterRender = {
@@ -46,7 +46,7 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _allPageIds: string[];
         _pageRoutes: import("../../../__internal/index.js").PageRoutes;
         _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-        _globalContext: GlobalContextInternal;
+        _globalContext: GlobalContext;
         /** @experimental This is a beta feature https://vike.dev/getGlobalContext */
         globalContext: import("../globalContext.js").GlobalContextPublic;
         _pageContextInit: {
@@ -100,7 +100,7 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _allPageIds: string[];
         _pageRoutes: import("../../../__internal/index.js").PageRoutes;
         _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-        _globalContext: GlobalContextInternal;
+        _globalContext: GlobalContext;
         /** @experimental This is a beta feature https://vike.dev/getGlobalContext */
         globalContext: import("../globalContext.js").GlobalContextPublic;
         _pageContextInit: {
@@ -137,7 +137,7 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _urlHandler: null;
     };
 }>;
-declare function prerender404Page(pageContextInit_: Record<string, unknown> | null, globalContext: GlobalContextInternal): Promise<{
+declare function prerender404Page(pageContextInit_: Record<string, unknown> | null, globalContext: GlobalContext): Promise<{
     documentHtml: string;
     pageContextSerialized: null;
     pageContext: {
@@ -155,7 +155,7 @@ declare function prerender404Page(pageContextInit_: Record<string, unknown> | nu
         _allPageIds: string[];
         _pageRoutes: import("../../../__internal/index.js").PageRoutes;
         _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-        _globalContext: GlobalContextInternal;
+        _globalContext: GlobalContext;
         /** @experimental This is a beta feature https://vike.dev/getGlobalContext */
         globalContext: import("../globalContext.js").GlobalContextPublic;
         _pageContextInit: {
@@ -209,7 +209,7 @@ declare function prerender404Page(pageContextInit_: Record<string, unknown> | nu
         _allPageIds: string[];
         _pageRoutes: import("../../../__internal/index.js").PageRoutes;
         _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-        _globalContext: GlobalContextInternal;
+        _globalContext: GlobalContext;
         /** @experimental This is a beta feature https://vike.dev/getGlobalContext */
         globalContext: import("../globalContext.js").GlobalContextPublic;
         _pageContextInit: {
@@ -251,7 +251,7 @@ declare function getPageContextInitEnhanced(pageContextInit: {
     urlOriginal: string;
     headersOriginal?: unknown;
     headers?: unknown;
-}, globalContext: GlobalContextInternal, { ssr: { urlRewrite, urlHandler, isClientSideNavigation } }?: {
+}, globalContext: GlobalContext, { ssr: { urlRewrite, urlHandler, isClientSideNavigation } }?: {
     ssr?: {
         urlRewrite: null | string;
         urlHandler: null | ((url: string) => string);
@@ -272,7 +272,7 @@ declare function getPageContextInitEnhanced(pageContextInit: {
     _allPageIds: string[];
     _pageRoutes: import("../../../__internal/index.js").PageRoutes;
     _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-    _globalContext: GlobalContextInternal;
+    _globalContext: GlobalContext;
     /** @experimental This is a beta feature https://vike.dev/getGlobalContext */
     globalContext: import("../globalContext.js").GlobalContextPublic;
     _pageContextInit: {

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

@@ -17,6 +17,7 @@ import { preparePageContextForUserConsumptionServerSide } from './preparePageCon
 import { executeGuardHook } from '../../../shared/route/executeGuardHook.js';
 import pc from '@brillout/picocolors';
 import { isServerSideError } from '../../../shared/misc/isServerSideError.js';
+import { resolveBaseRuntime } from '../../shared/resolveBase.js';
 async function renderPageAlreadyRouted(pageContext) {
     // pageContext.pageId can either be the:
     //  - ID of the page matching the routing, or the
@@ -111,13 +112,14 @@ async function getPageContextInitEnhanced(pageContextInit, globalContext, { ssr:
     isClientSideNavigation: false
 } } = {}) {
     assert(pageContextInit.urlOriginal);
+    const { baseServer, baseAssets } = resolveBaseRuntime(globalContext);
     const pageContextInitEnhanced = {};
     objectAssign(pageContextInitEnhanced, pageContextInit);
     objectAssign(pageContextInitEnhanced, {
         _objectCreatedByVike: true,
         // The following is defined on `pageContext` because we can eventually make these non-global
-        _baseServer: globalContext.baseServer,
-        _baseAssets: globalContext.baseAssets,
+        _baseServer: baseServer,
+        _baseAssets: baseAssets,
         // TODO/now: add meta.default
         _includeAssetsImportedByServer: globalContext.config.includeAssetsImportedByServer ?? true,
         // TODO/soon: use GloablContext instead

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

@@ -18,6 +18,7 @@ import { getErrorPageId } from '../../shared/error-page.js';
 import { handleErrorWithoutErrorPage } from './renderPage/handleErrorWithoutErrorPage.js';
 import { loadUserFilesServerSide } from './renderPage/loadUserFilesServerSide.js';
 import { resolveRedirects } from './renderPage/resolveRedirects.js';
+import { resolveBaseRuntime } from '../shared/resolveBase.js';
 const globalObject = getGlobalObject('runtime/renderPage.ts', {
     httpRequestsCount: 0
 });
@@ -336,6 +337,7 @@ function assertIsNotViteRequest(urlPathname, urlOriginal) {
     assertUsage(false, `${pc.code('renderPage(pageContextInit)')} called with ${pc.code(`pageContextInit.urlOriginal===${JSON.stringify(urlOriginal)}`)} which is unexpected because the URL ${pc.bold(urlOriginal)} should have already been handled by the development middleware: make sure the ${pc.cyan('createDevMiddleware()')} middleware is executed *before* the ${pc.cyan('renderPage()')} middleware, see ${pc.underline('https://vike.dev/renderPage')}`);
 }
 async function normalizeUrl(pageContextInit, globalContext, httpRequestId) {
+    const { baseServer } = resolveBaseRuntime(globalContext);
     const { trailingSlash, disableUrlNormalization } = globalContext.config;
     if (disableUrlNormalization)
         return null;
@@ -343,7 +345,7 @@ async function normalizeUrl(pageContextInit, globalContext, httpRequestId) {
     const { isPageContextRequest } = handlePageContextRequestUrl(urlOriginal);
     if (isPageContextRequest)
         return null;
-    const urlNormalized = normalizeUrlPathname(urlOriginal, trailingSlash ?? false, globalContext.baseServer);
+    const urlNormalized = normalizeUrlPathname(urlOriginal, trailingSlash ?? false, baseServer);
     if (!urlNormalized)
         return null;
     logRuntimeInfo?.(`URL normalized from ${pc.cyan(urlOriginal)} to ${pc.cyan(urlNormalized)} (https://vike.dev/url-normalization)`, httpRequestId, 'info');
@@ -353,7 +355,8 @@ async function normalizeUrl(pageContextInit, globalContext, httpRequestId) {
     return pageContextHttpResponse;
 }
 async function getPermanentRedirect(pageContextInit, globalContext, httpRequestId) {
-    const urlWithoutBase = removeBaseServer(pageContextInit.urlOriginal, globalContext.baseServer);
+    const { baseServer } = resolveBaseRuntime(globalContext);
+    const urlWithoutBase = removeBaseServer(pageContextInit.urlOriginal, baseServer);
     let origin = null;
     let urlTargetExternal = null;
     let urlTarget = modifyUrlPathname(urlWithoutBase, (urlPathname) => {
@@ -384,8 +387,9 @@ async function getPermanentRedirect(pageContextInit, globalContext, httpRequestI
         }
         if (normalize(urlTarget) === normalize(urlWithoutBase))
             return null;
+        const { baseServer } = resolveBaseRuntime(globalContext);
         if (!originChanged)
-            urlTarget = prependBase(urlTarget, globalContext.baseServer);
+            urlTarget = prependBase(urlTarget, baseServer);
         assert(urlTarget !== pageContextInit.urlOriginal);
     }
     logRuntimeInfo?.(`Permanent redirection defined by config.redirects (https://vike.dev/redirects)`, httpRequestId, 'info');
@@ -449,7 +453,7 @@ pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit, globalConte
     return { pageContextAbort };
 }
 async function assertBaseUrl(pageContextInit, globalContext) {
-    const { baseServer } = globalContext;
+    const { baseServer } = resolveBaseRuntime(globalContext);
     const { urlOriginal } = pageContextInit;
     const { urlWithoutPageContextRequestSuffix } = handlePageContextRequestUrl(urlOriginal);
     const { hasBaseServer } = parseUrl(urlWithoutPageContextRequestSuffix, baseServer);

package/dist/esm/node/shared/resolveBase.d.ts

@@ -1,7 +1,15 @@
 export { resolveBase };
-export type { BaseUrlsResolved };
+export { resolveBaseRuntime };
+export { resolveBaseFromResolvedConfig };
+import type { ResolvedConfig } from 'vite';
+import type { GlobalContext } from '../runtime/globalContext.js';
+declare function resolveBaseFromResolvedConfig(baseServer: string | null, baseAssets: string | null, config: ResolvedConfig): {
+    baseServer: string;
+    baseAssets: string;
+};
 type BaseUrlsResolved = {
     baseServer: string;
     baseAssets: string;
 };
+declare function resolveBaseRuntime(globalContext: GlobalContext): BaseUrlsResolved;
 declare function resolveBase(baseViteOriginal: string | null, baseServerUnresolved: string | null, baseAssetsUnresolved: string | null): BaseUrlsResolved;

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

@@ -1,6 +1,19 @@
 export { resolveBase };
+export { resolveBaseRuntime };
+export { resolveBaseFromResolvedConfig };
 import { assert, assertUsage, isBaseServer, isBaseAssets } from './utils.js';
 import pc from '@brillout/picocolors';
+function resolveBaseFromResolvedConfig(baseServer, baseAssets, config) {
+    let baseViteOriginal = config._baseViteOriginal;
+    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/esm/shared/route/loadPageRoutes.js

@@ -8,7 +8,7 @@ import { getDefinedAtString } from '../page-configs/getConfigDefinedAt.js';
 import { warnDeprecatedAllowKey } from './resolveRouteFunction.js';
 import { getHookFromPageConfigGlobal, getHookTimeoutDefault } from '../hooks/getHook.js';
 async function loadPageRoutes(
-// Remove all arguments and use GlobalContextInternal instead?
+// 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?.()));

package/dist/esm/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.222-commit-207e079";
+export declare const PROJECT_VERSION: "0.4.222";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.222-commit-207e079';
+export const PROJECT_VERSION = '0.4.222';

package/dist/esm/utils/assertSingleInstance.js

@@ -22,7 +22,7 @@ function assertSingleInstance() {
         const versions = 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@${pc.bold(versions[0])} and vike@${pc.bold(versions[1])} loaded but it's forbidden to load different versions`);
+        `vike@${pc.bold(versions[0])} and vike@${pc.bold(versions[1])} loaded but only one version should be loaded`);
     }
     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/esm/utils/projectInfo.d.ts

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.222-commit-207e079";
+    projectVersion: "0.4.222";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.222-commit-207e079",
+  "version": "0.4.222",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {