vike 0.4.220-commit-a9f46b8 → 0.4.220-commit-5c7810f

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

@@ -24,7 +24,9 @@ async function getVirtualFilePageConfigValuesAll(id, isDev, config) {
     const { pageConfigs } = vikeConfig;
     const pageConfig = pageConfigs.find((pageConfig) => pageConfig.pageId === pageId);
     (0, utils_js_1.assert)(pageConfig, { id, pageId });
-    const code = getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, vikeConfig.vikeConfigGlobal.includeAssetsImportedByServer, isDev);
+    const code = getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, 
+    // TODO/now: add meta.default
+    vikeConfig.global.config.includeAssetsImportedByServer ?? true, isDev);
     (0, debug_js_1.debug)(id, isForClientSide ? 'CLIENT-SIDE' : 'SERVER-SIDE', code);
     return code;
 }

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

@@ -12,7 +12,7 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const index_js_1 = require("./devConfig/index.js");
 function previewConfig() {
     let config;
-    // let vikeConfigGlobal: VikeConfigGlobal
+    // let vikeConfig: VikeConfigObject
     return {
         name: 'vike:previewConfig',
         apply: utils_js_1.applyPreview,
@@ -27,8 +27,7 @@ function previewConfig() {
         async configResolved(config_) {
             config = config_;
             (0, index_js_1.logDockerHint)(config.preview.host);
-            // const vikeConfig = await getVikeConfig(config)
-            // vikeConfigGlobal = vikeConfig.vikeConfigGlobal
+            // vikeConfig = await getVikeConfig(config)
         },
         configurePreviewServer(server) {
             /* - Couldn't make `appType: 'mpa'` work as of npm:@brillout/vite@5.0.0-beta.14.0426910c
@@ -38,7 +37,7 @@ function previewConfig() {
             return () => {
                 assertDist();
                 /* We don't use this condition (we wrongfully always use the SSR middleware) because of the regression introduced by https://github.com/vitejs/vite/pull/14756 which stops servering .html files when `appType: 'custom'`.
-                if (!vikeConfigGlobal.prerender || vikeConfigGlobal.prerender.partial) {
+                if (!vikeConfig.global.config.prerender || vikeConfig.global.config.prerender.partial) {
                   addSsrMiddleware(server.middlewares, config, true)
                 }
                 /*/

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

@@ -18,7 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // We call onLoad() here so that it's called even when only a subset of the plugin is loaded. (Making the assert() calls inside onLoad() a lot stronger.)
 const onLoad_js_1 = require("./onLoad.js");
 (0, onLoad_js_1.onLoad)();
-// We tolerate the fact that we load all of the runtime utils even though some of it isn't needed
+// It's common practice for Vike's Vite plugin to import from Vike's sever runtime
 __exportStar(require("../runtime/utils.js"), exports);
 // Utils only needed by `plugin/*`
 __exportStar(require("../../utils/viteIsSSR.js"), exports);

package/dist/cjs/node/prerender/context.js

@@ -5,12 +5,14 @@ exports.temp_disablePrerenderAutoRun = temp_disablePrerenderAutoRun;
 exports.isPrerendering = isPrerendering;
 exports.setContextIsPrerendering = setContextIsPrerendering;
 const getGlobalObject_js_1 = require("../../utils/getGlobalObject.js");
+const resolvePrerenderConfig_js_1 = require("./resolvePrerenderConfig.js");
 const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('prerender/context.ts', {});
-function isPrerenderAutoRunEnabled(vikeConfigGlobal) {
-    return (vikeConfigGlobal.prerender &&
-        !vikeConfigGlobal.prerender.disableAutoRun &&
+function isPrerenderAutoRunEnabled(vikeConfig) {
+    const prerenderConfig = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfig)(vikeConfig.global.config.prerender);
+    return (prerenderConfig &&
+        !prerenderConfig.disableAutoRun &&
         !globalObject.isDisabled &&
-        vikeConfigGlobal.disableAutoFullBuild !== 'prerender');
+        vikeConfig.global.config.disableAutoFullBuild !== 'prerender');
 }
 // TODO/v1-release: remove
 function temp_disablePrerenderAutoRun() {

package/dist/cjs/node/prerender/resolvePrerenderConfig.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolvePrerenderConfig = resolvePrerenderConfig;
+// TODO/now:
+// - prerender.value
+// - correct isPrerendering
+function resolvePrerenderConfig(prerenderConfigs) {
+    if (!prerenderConfigs || prerenderConfigs.every((configVal) => !configVal)) {
+        return false;
+    }
+    const prerenderSettings = prerenderConfigs.filter(isObject2);
+    const prerenderConfig = {
+        partial: pickFirst(prerenderSettings.map((c) => c.partial)) ?? false,
+        noExtraDir: pickFirst(prerenderSettings.map((c) => c.noExtraDir)) ?? false,
+        parallel: pickFirst(prerenderSettings.map((c) => c.parallel)) ?? true,
+        disableAutoRun: pickFirst(prerenderSettings.map((c) => c.disableAutoRun)) ?? false
+    };
+    return prerenderConfig;
+}
+function isObject2(p) {
+    return typeof p === 'object';
+}
+function pickFirst(arr) {
+    return arr.filter((v) => v !== undefined)[0];
+}

package/dist/cjs/node/prerender/runPrerender.js

@@ -66,6 +66,7 @@ const executeHook_js_1 = require("../../shared/hooks/executeHook.js");
 const getConfigValueBuildTime_js_1 = require("../../shared/page-configs/getConfigValueBuildTime.js");
 const prepareViteApiCall_js_1 = require("../api/prepareViteApiCall.js");
 const context_js_1 = require("./context.js");
+const resolvePrerenderConfig_js_1 = require("./resolvePrerenderConfig.js");
 async function runPrerenderFromAPI(options = {}) {
     return await runPrerender(options, 'prerender()');
     // - We purposely propagate the error to the user land, so that the error interrupts the user land. It's also, I guess, a nice-to-have that the user has control over the error.
@@ -112,7 +113,7 @@ async function runPrerender(options = {}, standaloneTrigger) {
     const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(viteConfig);
     const { outDirClient } = (0, utils_js_1.getOutDirs)(viteConfig);
     const { root } = viteConfig;
-    const prerenderConfig = vikeConfig.vikeConfigGlobal.prerender;
+    const prerenderConfig = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfig)(vikeConfig.global.config.prerender);
     validatePrerenderConfig(prerenderConfig);
     if (!prerenderConfig) {
         (0, utils_js_1.assert)(standaloneTrigger);
@@ -160,9 +161,13 @@ async function collectDoNoPrerenderList(pageConfigs, doNotPrerenderList, concurr
     // V1 design
     pageConfigs.forEach((pageConfig) => {
         const configName = 'prerender';
-        const configValue = (0, getConfigValueBuildTime_js_1.getConfigValueBuildTime)(pageConfig, configName, 'boolean');
-        if (configValue?.value === false) {
-            const configValueFilePathToShowToUser = (0, helpers_js_1.getConfigValueFilePathToShowToUser)(configValue.definedAtData);
+        const configValue = (0, getConfigValueBuildTime_js_1.getConfigValueBuildTime)(pageConfig, configName);
+        if (!configValue)
+            return;
+        (0, utils_js_1.assert)((0, utils_js_1.hasProp)(configValue, 'value', 'array'));
+        if (configValue.value[0] === false) {
+            (0, utils_js_1.assert)((0, utils_js_1.isArray)(configValue.definedAtData));
+            const configValueFilePathToShowToUser = (0, helpers_js_1.getConfigValueFilePathToShowToUser)(configValue.definedAtData[0]);
             (0, utils_js_1.assert)(configValueFilePathToShowToUser);
             doNotPrerenderList.push({
                 pageId: pageConfig.pageId,

package/dist/cjs/node/prerender/utils.js

@@ -22,9 +22,9 @@ __exportStar(require("../../utils/projectInfo.js"), exports);
 __exportStar(require("../../utils/objectAssign.js"), exports);
 __exportStar(require("../../utils/isObjectWithKeys.js"), exports);
 __exportStar(require("../../utils/isCallable.js"), exports);
-__exportStar(require("../../utils/getOutDirs.js"), exports);
+__exportStar(require("../plugin/getOutDirs.js"), exports);
 __exportStar(require("../../utils/isPropertyGetter.js"), exports);
-__exportStar(require("../../utils/filesystemPathHandling.js"), exports);
+__exportStar(require("../../utils/toPosixPath.js"), exports);
 __exportStar(require("../../utils/urlToFile.js"), exports);
 __exportStar(require("../../utils/isPlainObject.js"), exports);
 __exportStar(require("../../utils/assertSetup.js"), exports);

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

@@ -8,7 +8,6 @@ exports.getGlobalContextAsync = getGlobalContextAsync;
 exports.getGlobalContext = getGlobalContext;
 exports.getViteDevServer = getViteDevServer;
 exports.getViteConfig = getViteConfig;
-exports.getRuntimeManifest = getRuntimeManifest;
 exports.initGlobalContext_renderPage = initGlobalContext_renderPage;
 exports.initGlobalContext_runPrerender = initGlobalContext_runPrerender;
 exports.initGlobalContext_getGlobalContextAsync = initGlobalContext_getGlobalContextAsync;
@@ -19,14 +18,13 @@ exports.setGlobalContext_isViteDev = setGlobalContext_isViteDev;
 exports.setGlobalContext_isPrerendering = setGlobalContext_isPrerendering;
 exports.setGlobalContext_buildEntry = setGlobalContext_buildEntry;
 exports.clearGlobalContext = clearGlobalContext;
+exports.assertBuildInfo = assertBuildInfo;
+exports.getViteConfigRuntime = getViteConfigRuntime;
 const utils_js_1 = require("./utils.js");
 const runtime_1 = require("@brillout/vite-plugin-server-entry/runtime");
 const virtualFileImportUserCode_js_1 = require("../shared/virtual-files/virtualFileImportUserCode.js");
 const getPageFiles_js_1 = require("../../shared/getPageFiles/getPageFiles.js");
-const assertPluginManifest_js_1 = require("../shared/assertPluginManifest.js");
-const assertRuntimeManifest_js_1 = require("../shared/assertRuntimeManifest.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const resolveBase_js_1 = require("../shared/resolveBase.js");
 const loadPageRoutes_js_1 = require("../../shared/route/loadPageRoutes.js");
 const assertV1Design_js_1 = require("../shared/assertV1Design.js");
 const debug = (0, utils_js_1.createDebugger)('vike:globalContext');
@@ -144,7 +142,7 @@ async function initGlobalContext(isProduction) {
         (0, utils_js_1.assert)(viteDevServer);
         (0, utils_js_1.assert)(!isPrerendering);
         const { globalConfig, userFiles } = await getPageRuntimeInfo(isProduction);
-        const pluginManifest = getRuntimeManifest(vikeConfig.vikeConfigGlobal, viteConfig);
+        const viteConfigRuntime = getViteConfigRuntime(viteConfig);
         globalObject.globalContext = {
             isProduction: false,
             isPrerendering: false,
@@ -155,20 +153,14 @@ async function initGlobalContext(isProduction) {
                 global: globalConfig
             },
             ...userFiles,
-            baseServer: pluginManifest.baseServer,
-            baseAssets: pluginManifest.baseAssets,
-            includeAssetsImportedByServer: pluginManifest.includeAssetsImportedByServer,
-            trailingSlash: pluginManifest.trailingSlash,
-            disableUrlNormalization: pluginManifest.disableUrlNormalization
+            viteConfigRuntime
         };
     }
     else {
         const buildEntry = await getBuildEntry(globalObject.outDirRoot, isPrerendering);
-        const { assetsManifest, pluginManifest } = buildEntry;
+        const { assetsManifest, buildInfo } = buildEntry;
         (0, getPageFiles_js_1.setPageFiles)(buildEntry.pageFiles);
         const { globalConfig, userFiles } = await getPageRuntimeInfo(isProduction);
-        assertViteManifest(assetsManifest);
-        (0, assertPluginManifest_js_1.assertPluginManifest)(pluginManifest);
         const globalContext = {
             isProduction: true,
             assetsManifest,
@@ -177,12 +169,8 @@ async function initGlobalContext(isProduction) {
             },
             ...userFiles,
             viteDevServer: null,
-            baseServer: pluginManifest.baseServer,
-            baseAssets: pluginManifest.baseAssets,
-            includeAssetsImportedByServer: pluginManifest.includeAssetsImportedByServer,
-            trailingSlash: pluginManifest.trailingSlash,
-            usesClientRouter: pluginManifest.usesClientRouter,
-            disableUrlNormalization: pluginManifest.disableUrlNormalization
+            viteConfigRuntime: buildInfo.viteConfigRuntime,
+            usesClientRouter: buildInfo.usesClientRouter
         };
         if (isPrerendering) {
             (0, utils_js_1.assert)(viteConfig);
@@ -217,19 +205,6 @@ async function getPageRuntimeInfo(isProduction) {
     pageConfigs.length > 0, pageFilesAll);
     return { userFiles, globalConfig };
 }
-function getRuntimeManifest(vikeConfigGlobal, viteConfig) {
-    const { includeAssetsImportedByServer, trailingSlash, disableUrlNormalization } = vikeConfigGlobal;
-    const { baseServer, baseAssets } = (0, resolveBase_js_1.resolveBaseFromResolvedConfig)(vikeConfigGlobal.baseServer, vikeConfigGlobal.baseAssets, viteConfig);
-    const manifest = {
-        baseServer,
-        baseAssets,
-        includeAssetsImportedByServer,
-        trailingSlash,
-        disableUrlNormalization
-    };
-    (0, assertRuntimeManifest_js_1.assertRuntimeManifest)(manifest);
-    return manifest;
-}
 function assertViteManifest(manifest) {
     (0, utils_js_1.assert)((0, utils_js_1.isPlainObject)(manifest));
     /* We should include these assertions but we don't as a workaround for PWA manifests: https://github.com/vikejs/vike/issues/769
@@ -262,17 +237,48 @@ async function getBuildEntry(outDir, isPrerendering) {
         (0, utils_js_1.assert)(globalObject.buildEntry);
     }
     const { buildEntry } = globalObject;
-    (0, utils_js_1.assert)((0, utils_js_1.isObject)(buildEntry));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildEntry, 'pageFiles', 'object'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildEntry, 'assetsManifest', 'object'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildEntry, 'pluginManifest', 'object'));
+    assertBuildEntry(buildEntry);
     return buildEntry;
 }
 function setGlobalContext_buildEntry(buildEntry) {
     debug('setGlobalContext_buildEntry()');
+    assertBuildEntry(buildEntry);
     globalObject.buildEntry = buildEntry;
     globalObject.buildEntryPrevious = buildEntry;
 }
+function assertBuildEntry(buildEntry) {
+    (0, utils_js_1.assert)((0, utils_js_1.isObject)(buildEntry));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildEntry, 'pageFiles', 'object'));
+    const { pageFiles } = buildEntry;
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildEntry, 'assetsManifest', 'object'));
+    const { assetsManifest } = buildEntry;
+    assertViteManifest(assetsManifest);
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildEntry, 'buildInfo', 'object'));
+    const { buildInfo } = buildEntry;
+    assertBuildInfo(buildInfo);
+    (0, utils_js_1.checkType)({ pageFiles, assetsManifest, buildInfo });
+}
+function assertBuildInfo(buildInfo) {
+    (0, utils_js_1.assert)((0, utils_js_1.isObject)(buildInfo));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildInfo, 'versionAtBuildTime', 'string'));
+    assertVersionAtBuildTime(buildInfo.versionAtBuildTime);
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildInfo, 'viteConfigRuntime', 'object'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildInfo.viteConfigRuntime, '_baseViteOriginal', 'string'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(buildInfo, 'usesClientRouter', 'boolean'));
+    (0, utils_js_1.checkType)({ ...buildInfo, viteConfigRuntime: buildInfo.viteConfigRuntime });
+}
+function assertVersionAtBuildTime(versionAtBuildTime) {
+    const versionAtRuntime = utils_js_1.projectInfo.projectVersion;
+    const pretty = (version) => picocolors_1.default.bold(`vike@${version}`);
+    (0, utils_js_1.assertUsage)(versionAtBuildTime === versionAtRuntime, `Re-build your app (you're using ${pretty(versionAtRuntime)} but your app was built with ${pretty(versionAtBuildTime)})`);
+}
+function getViteConfigRuntime(viteConfig) {
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(viteConfig, '_baseViteOriginal', 'string'));
+    const viteConfigRuntime = {
+        _baseViteOriginal: viteConfig._baseViteOriginal
+    };
+    return viteConfigRuntime;
+}
 function initDevEntry() {
     (0, getPageFiles_js_1.setPageFilesAsync)(getPageFilesExports);
 }

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

@@ -23,6 +23,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
@@ -119,14 +120,16 @@ function getPageContextInitEnhanced(pageContextInit, { ssr: { urlRewrite, urlHan
 } } = {}) {
     (0, utils_js_1.assert)(pageContextInit.urlOriginal);
     const globalContext = (0, globalContext_js_1.getGlobalContext)();
+    const { baseServer, baseAssets } = (0, resolveBase_js_1.resolveBaseRuntime)();
     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,
-        _includeAssetsImportedByServer: globalContext.includeAssetsImportedByServer,
+        _baseServer: baseServer,
+        _baseAssets: baseAssets,
+        // TODO/now: add meta.default
+        _includeAssetsImportedByServer: globalContext.vikeConfig.global.config.includeAssetsImportedByServer ?? true,
         // TODO: use GloablContext instead
         _pageFilesAll: globalContext.pageFilesAll,
         _pageConfigs: globalContext.pageConfigs,

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

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.redirectsErrPrefix = void 0;
 exports.resolveRedirects = resolveRedirects;
 exports.resolveRouteStringRedirect = resolveRouteStringRedirect;
 const assertIsNotBrowser_js_1 = require("../../../utils/assertIsNotBrowser.js");
@@ -11,8 +12,8 @@ const resolveUrlPathname_js_1 = require("../../../shared/route/resolveUrlPathnam
 const resolveRouteString_js_1 = require("../../../shared/route/resolveRouteString.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 (0, assertIsNotBrowser_js_1.assertIsNotBrowser)(); // Don't bloat the client
-// TODO/next-major-release: update
-const configSrc = '[vite.config.js > vike({ redirects })]';
+const redirectsErrPrefix = '[+redirects]';
+exports.redirectsErrPrefix = redirectsErrPrefix;
 function resolveRedirects(redirectsAll, urlPathname) {
     const redirects = merge(redirectsAll);
     for (const [urlSource, urlTarget] of Object.entries(redirects)) {
@@ -23,9 +24,9 @@ function resolveRedirects(redirectsAll, urlPathname) {
     return null;
 }
 function resolveRouteStringRedirect(urlSource, urlTarget, urlPathname) {
-    (0, resolveRouteString_js_1.assertRouteString)(urlSource, `${configSrc} Invalid`);
+    (0, resolveRouteString_js_1.assertRouteString)(urlSource, `${redirectsErrPrefix} Invalid`);
     // Is allowing any protocol a safety issue? https://github.com/vikejs/vike/pull/1292#issuecomment-1828043917
-    (0, utils_js_1.assertUsageUrlRedirectTarget)(urlTarget, `${configSrc} The URL redirection target`, true);
+    (0, utils_js_1.assertUsageUrlRedirectTarget)(urlTarget, `${redirectsErrPrefix} The URL redirection target`, true);
     assertParams(urlSource, urlTarget);
     const match = (0, resolveRouteString_js_1.resolveRouteString)(urlSource, urlPathname);
     if (!match)
@@ -41,7 +42,7 @@ function assertParams(urlSource, urlTarget) {
     routeSegments.forEach((routeSegment) => {
         if (routeSegment.startsWith('@') || routeSegment.startsWith('*')) {
             const segments = urlSource.split('/');
-            (0, utils_js_1.assertUsage)(segments.includes(routeSegment), `${configSrc} The redirection source URL ${picocolors_1.default.string(urlSource)} is missing the URL parameter ${picocolors_1.default.string(routeSegment)} used by the redirection target URL ${picocolors_1.default.string(urlTarget)}`);
+            (0, utils_js_1.assertUsage)(segments.includes(routeSegment), `${redirectsErrPrefix} The redirection source URL ${picocolors_1.default.string(urlSource)} is missing the URL parameter ${picocolors_1.default.string(routeSegment)} used by the redirection target URL ${picocolors_1.default.string(urlTarget)}`);
         }
     });
 }

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,14 +343,16 @@ 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')}`);
 }
 function normalizeUrl(pageContextInit, httpRequestId) {
-    const { trailingSlash, disableUrlNormalization, baseServer } = (0, globalContext_js_1.getGlobalContext)();
+    const globalContext = (0, globalContext_js_1.getGlobalContext)();
+    const { baseServer } = (0, resolveBase_js_1.resolveBaseRuntime)();
+    const { trailingSlash, disableUrlNormalization } = globalContext.vikeConfig.global.config;
     if (disableUrlNormalization)
         return null;
     const { urlOriginal } = pageContextInit;
     const { isPageContextRequest } = (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(urlOriginal);
     if (isPageContextRequest)
         return null;
-    const urlNormalized = (0, utils_js_1.normalizeUrlPathname)(urlOriginal, trailingSlash, 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');
@@ -360,7 +363,8 @@ function normalizeUrl(pageContextInit, httpRequestId) {
 }
 function getPermanentRedirect(pageContextInit, httpRequestId) {
     const globalContext = (0, globalContext_js_1.getGlobalContext)();
-    const urlWithoutBase = (0, utils_js_1.removeBaseServer)(pageContextInit.urlOriginal, globalContext.baseServer);
+    const { baseServer } = (0, resolveBase_js_1.resolveBaseRuntime)();
+    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) => {
@@ -391,8 +395,9 @@ function getPermanentRedirect(pageContextInit, httpRequestId) {
         }
         if (normalize(urlTarget) === normalize(urlWithoutBase))
             return null;
+        const { baseServer } = (0, resolveBase_js_1.resolveBaseRuntime)();
         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');
@@ -457,7 +462,7 @@ pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit) {
     return { pageContextAbort };
 }
 function assertBaseUrl(pageContextInit) {
-    const { baseServer } = (0, globalContext_js_1.getGlobalContext)();
+    const { baseServer } = (0, resolveBase_js_1.resolveBaseRuntime)();
     const { urlOriginal } = pageContextInit;
     const { urlWithoutPageContextRequestSuffix } = (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(urlOriginal);
     const { hasBaseServer } = (0, utils_js_1.parseUrl)(urlWithoutPageContextRequestSuffix, baseServer);

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

@@ -41,8 +41,8 @@ __exportStar(require("../../utils/compareString.js"), exports);
 __exportStar(require("../../utils/isObjectWithKeys.js"), exports);
 __exportStar(require("../../utils/stringifyStringArray.js"), exports);
 __exportStar(require("../../utils/unique.js"), exports);
-__exportStar(require("../../utils/filesystemPathHandling.js"), exports);
-__exportStar(require("../../utils/getOutDirs.js"), exports);
+__exportStar(require("../../utils/toPosixPath.js"), exports);
+__exportStar(require("../plugin/getOutDirs.js"), exports);
 __exportStar(require("../../utils/capitalizeFirstLetter.js"), exports);
 __exportStar(require("../../utils/debugGlob.js"), exports);
 __exportStar(require("../../utils/isSameErrorMessage.js"), exports);

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

@@ -4,14 +4,23 @@ 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"));
+const globalContext_js_1 = require("../runtime/globalContext.js");
 function resolveBaseFromResolvedConfig(baseServer, baseAssets, config) {
     let baseViteOriginal = config._baseViteOriginal;
     (0, utils_js_1.assert)(baseViteOriginal === null || typeof baseViteOriginal == 'string');
     return resolveBase(baseViteOriginal, baseServer, baseAssets);
 }
+function resolveBaseRuntime() {
+    const globalContext = (0, globalContext_js_1.getGlobalContext)();
+    const baseViteOriginal = globalContext.viteConfigRuntime._baseViteOriginal;
+    const baseServerUnresolved = globalContext.vikeConfig.global.config.baseServer ?? null;
+    const baseAssetsUnresolved = globalContext.vikeConfig.global.config.baseAssets ?? null;
+    return resolveBase(baseViteOriginal, baseServerUnresolved, baseAssetsUnresolved);
+}
 function resolveBase(baseViteOriginal, baseServerUnresolved, baseAssetsUnresolved) {
     if (baseViteOriginal === '/__UNSET__')
         baseViteOriginal = null;

package/dist/cjs/shared/getPageContextUrlComputed.js

@@ -39,24 +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 });
     let urlResolved;
     let baseToBeRemoved;
     if (pageContext.urlLogical) {
         // Set by onBeforeRoute()
         urlResolved = pageContext.urlLogical;
         baseToBeRemoved = false;
+        assertUrlResolved(1);
     }
     else if (pageContext._urlRewrite) {
         // Set by `throw render()`
         urlResolved = pageContext._urlRewrite;
         baseToBeRemoved = false;
+        assertUrlResolved(2);
     }
     else {
         // Set by renderPage()
         urlResolved = pageContext.urlOriginal;
         baseToBeRemoved = true;
+        assertUrlResolved(3);
     }
-    (0, utils_js_1.assert)(urlResolved && typeof urlResolved === 'string');
+    assertUrlResolved(4);
     // Remove .pageContext.json
     let urlHandler = pageContext._urlHandler;
     if (!urlHandler)

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

@@ -68,11 +68,11 @@ function getPageConfigUserFriendly(pageFiles, pageConfig) {
     (0, utils_js_1.assert)(!('default' in exports));
     (0, utils_js_1.assert)(!('default' in exportsAll));
     const pageContextExports = {
+        config: config,
         from,
         source,
         sources,
         // TODO/eventually: deprecate/remove every prop below
-        config,
         configEntries,
         exports,
         exportsAll,
@@ -156,7 +156,7 @@ function getPageConfigUserFriendlyNew(pageConfig) {
         });
     });
     return {
-        config,
+        config: config,
         configEntries,
         exportsAll,
         source,

package/dist/cjs/shared/utils.js

@@ -32,7 +32,7 @@ __exportStar(require("../utils/isPlainObject.js"), exports);
 __exportStar(require("../utils/compareString.js"), exports);
 __exportStar(require("../utils/isNotNullish.js"), exports);
 __exportStar(require("../utils/stringifyStringArray.js"), exports);
-__exportStar(require("../utils/filesystemPathHandling.js"), exports);
+__exportStar(require("../utils/toPosixPath.js"), exports);
 __exportStar(require("../utils/cast.js"), exports);
 __exportStar(require("../utils/isPropertyGetter.js"), exports);
 __exportStar(require("../utils/isPromise.js"), exports);

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.220-commit-a9f46b8';
+exports.PROJECT_VERSION = '0.4.220-commit-5c7810f';

package/dist/cjs/utils/findFile.js

@@ -7,16 +7,16 @@ exports.findFile = findFile;
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const isArray_js_1 = require("./isArray.js");
-const filesystemPathHandling_js_1 = require("./filesystemPathHandling.js");
+const toPosixPath_js_1 = require("./toPosixPath.js");
 function findFile(arg, cwd) {
-    (0, filesystemPathHandling_js_1.assertPosixPath)(cwd);
+    (0, toPosixPath_js_1.assertPosixPath)(cwd);
     const filenames = (0, isArray_js_1.isArray)(arg) ? arg : [arg];
     let dir = cwd;
     while (true) {
         for (const filename of filenames) {
             const configFilePath = path_1.default.posix.join(dir, `./${filename}`);
             if (fs_1.default.existsSync(configFilePath)) {
-                (0, filesystemPathHandling_js_1.assertPosixPath)(configFilePath);
+                (0, toPosixPath_js_1.assertPosixPath)(configFilePath);
                 return configFilePath;
             }
         }

package/dist/cjs/utils/isDev.js

@@ -4,12 +4,13 @@ exports.isDevCheck = isDevCheck;
 exports.applyDev = applyDev;
 exports.applyPreview = applyPreview;
 const assert_js_1 = require("./assert.js");
+const vite_1 = require("vite");
 function isDevCheck(configEnv) {
     const { isPreview, command } = configEnv;
     // Released at vite@5.1.0 which is guaranteed with `assertVersion('Vite', version, '5.1.0')`
     // - Release: https://github.com/vitejs/vite/blob/6f7466e6211027686f40ad7e4ce6ec8477414546/packages/vite/CHANGELOG.md#510-beta4-2024-01-26:~:text=fix(preview)%3A-,set%20isPreview%20true,-(%2315695)%20(93fce55
-    // - Surprisingly, this assert() can fail: https://github.com/vikejs/vike/issues/2120
-    (0, assert_js_1.assert)(typeof isPreview === 'boolean');
+    // - Surprisingly, this assert() can fail: https://github.com/vikejs/vike/issues/2135
+    (0, assert_js_1.assert)(typeof isPreview === 'boolean', { isPreview, version: vite_1.version });
     return command === 'serve' && !isPreview;
 }
 function applyDev(_, env) {

package/dist/cjs/utils/isFilePathAbsoluteFilesystem.js

@@ -7,7 +7,7 @@ exports.assertFilePathAbsoluteFilesystem = assertFilePathAbsoluteFilesystem;
 exports.isFilePathAbsolute = isFilePathAbsolute;
 const path_1 = __importDefault(require("path"));
 const assert_js_1 = require("./assert.js");
-const filesystemPathHandling_js_1 = require("./filesystemPathHandling.js");
+const toPosixPath_js_1 = require("./toPosixPath.js");
 /**
  * Asserts that `filePath` is an absolute file path starting from the filesystem root.
  *
@@ -19,7 +19,7 @@ function assertFilePathAbsoluteFilesystem(filePath) {
     // - For Linux users assertFilePathAbsoluteFilesystem() will erroneously succeed if `p` is a path absolute from the user root dir.
     //   - But that's okay because the assertion will eventually fail for Windows users.
     (0, assert_js_1.assert)(isFilePathAbsoluteFilesystem(filePath));
-    (0, filesystemPathHandling_js_1.assertPosixPath)(filePath);
+    (0, toPosixPath_js_1.assertPosixPath)(filePath);
 }
 /**
  * Whether `filePath` is an absolute file path starting from the filesystem root.

package/dist/cjs/utils/requireResolve.js

@@ -4,7 +4,7 @@ exports.requireResolve = requireResolve;
 const assert_js_1 = require("./assert.js");
 const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
 const assertSetup_js_1 = require("./assertSetup.js");
-const filesystemPathHandling_js_1 = require("./filesystemPathHandling.js");
+const toPosixPath_js_1 = require("./toPosixPath.js");
 const isScriptFile_js_1 = require("./isScriptFile.js");
 const module_1 = require("module");
 // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
@@ -15,7 +15,7 @@ const require_ = (0, module_1.createRequire)(importMetaUrl);
 // We still can't use import.meta.resolve() as of 23.1.0 (November 2024) because `parent` argument requires an experimental flag.
 // - https://stackoverflow.com/questions/54977743/do-require-resolve-for-es-modules#comment139581675_62272600
 function requireResolve(importPath, cwd) {
-    (0, filesystemPathHandling_js_1.assertPosixPath)(cwd);
+    (0, toPosixPath_js_1.assertPosixPath)(cwd);
     const clean = addFileExtensionsToRequireResolve();
     importPath = removeFileExtention(importPath);
     let importedFile;
@@ -29,7 +29,7 @@ function requireResolve(importPath, cwd) {
         clean();
     }
     if (importedFile) {
-        importedFile = (0, filesystemPathHandling_js_1.toPosixPath)(importedFile);
+        importedFile = (0, toPosixPath_js_1.toPosixPath)(importedFile);
     }
     return importedFile;
 }

package/dist/esm/node/api/utils.d.ts

@@ -1,4 +1,4 @@
 export * from '../../utils/assert.js';
 export * from '../../utils/getGlobalObject.js';
-export * from '../../utils/filesystemPathHandling.js';
+export * from '../../utils/toPosixPath.js';
 export * from '../../utils/isObject.js';

package/dist/esm/node/api/utils.js

@@ -4,5 +4,5 @@ import { onLoad } from './onLoad.js';
 onLoad();
 export * from '../../utils/assert.js';
 export * from '../../utils/getGlobalObject.js';
-export * from '../../utils/filesystemPathHandling.js';
+export * from '../../utils/toPosixPath.js';
 export * from '../../utils/isObject.js';