vike 0.4.145 → 0.4.146-commit-701e2e5

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

@@ -73,7 +73,7 @@ exports.buildConfig = buildConfig;
 async function getEntries(config) {
     const configVike = await (0, getConfigVike_js_1.getConfigVike)(config);
     const pageFileEntries = await getPageFileEntries(config, configVike.includeAssetsImportedByServer); // TODO/v1-release: remove
-    const { pageConfigs } = await (0, getVikeConfig_js_1.getVikeConfig)(config.root, (0, utils_js_1.getOutDirs)(config).outDirRoot, false, configVike.extensions);
+    const { pageConfigs } = await (0, getVikeConfig_js_1.getVikeConfig)(config, false);
     (0, utils_js_1.assertUsage)(Object.keys(pageFileEntries).length !== 0 || pageConfigs.length !== 0, 'At least one page should be defined, see https://vike.dev/add');
     if ((0, utils_js_1.viteIsSSR)(config)) {
         const serverEntries = analyzeServerEntries(pageConfigs);

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

@@ -17,20 +17,20 @@ function resolveVikeConfig(vikeConfig) {
         name: 'vike:resolveVikeConfig',
         enforce: 'pre',
         async configResolved(config) {
-            const promise = resolveConfig(vikeConfig, config);
+            const promise = getConfigVikPromise(vikeConfig, config);
             config.configVikePromise = promise;
             await promise;
         }
     };
 }
 exports.resolveVikeConfig = resolveVikeConfig;
-async function resolveConfig(vikeConfig, config) {
+async function getConfigVikPromise(vikeConfig, config) {
     const fromPluginOptions = (vikeConfig ?? {});
     const fromViteConfig = (config.vike ?? {});
     const fromStemPackages = await (0, findConfigVikeFromStemPackages_js_1.findConfigVikeFromStemPackages)(config.root);
     const configs = [fromPluginOptions, ...fromStemPackages, fromViteConfig];
     const extensions = (0, resolveExtensions_js_1.resolveExtensions)(configs, config);
-    const { globalVikeConfig: fromPlusConfigFile } = await (0, getVikeConfig_js_1.getVikeConfig)(config.root, (0, utils_js_1.getOutDirs)(config).outDirRoot, (0, utils_js_1.isDev2)(config), extensions);
+    const { globalVikeConfig: fromPlusConfigFile } = await (0, getVikeConfig_js_1.getVikeConfig)(config, (0, utils_js_1.isDev2)(config), false, extensions);
     configs.push(fromPlusConfigFile);
     (0, assertVikeConfig_js_1.assertVikeConfig)(fromPlusConfigFile, ({ prop, errMsg }) => {
         // TODO: add config file path ?

package/dist/cjs/node/plugin/plugins/devConfig/determineOptimizeDeps.js

@@ -8,7 +8,7 @@ const getConfigValueSourcesRelevant_js_1 = require("../../shared/getConfigValueS
 const buildConfig_js_1 = require("../buildConfig.js");
 const virtualFileImportUserCode_js_1 = require("../../../shared/virtual-files/virtualFileImportUserCode.js");
 async function determineOptimizeDeps(config, configVike, isDev) {
-    const { pageConfigs } = await (0, getVikeConfig_js_1.getVikeConfig)(config.root, (0, utils_js_1.getOutDirs)(config).outDirRoot, isDev, configVike.extensions);
+    const { pageConfigs } = await (0, getVikeConfig_js_1.getVikeConfig)(config, isDev);
     const { entries, include } = await getPageDeps(config, pageConfigs, isDev);
     {
         // This actually doesn't work: Vite's dep optimizer doesn't seem to be able to crawl virtual files.

package/dist/cjs/node/plugin/plugins/importUserCode/getVirtualFileImportUserCode.js

@@ -146,7 +146,7 @@ export const pageFilesList = [];
 export const neverLoaded = {};
 export const isGeneratedFile = true;
 
-${await (0, getVirtualFilePageConfigs_js_1.getVirtualFilePageConfigs)(config.root, (0, utils_js_1.getOutDirs)(config).outDirRoot, isForClientSide, isDev, id, configVike, isClientRouting)}
+${await (0, getVirtualFilePageConfigs_js_1.getVirtualFilePageConfigs)(isForClientSide, isDev, id, isClientRouting, config)}
 
 `;
     fileTypes_js_1.fileTypes

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

@@ -52,7 +52,7 @@ function importUserCode() {
                 return undefined;
             id = (0, utils_js_1.getVirtualFileId)(id);
             if ((0, virtualFilePageConfigValuesAll_js_1.isVirtualFileIdPageConfigValuesAll)(id)) {
-                const code = await (0, getVirtualFilePageConfigValuesAll_js_1.getVirtualFilePageConfigValuesAll)(id, config.root, (0, utils_js_1.getOutDirs)(config).outDirRoot, isDev, configVike);
+                const code = await (0, getVirtualFilePageConfigValuesAll_js_1.getVirtualFilePageConfigValuesAll)(id, isDev, config);
                 return code;
             }
             if ((0, virtualFileImportUserCode_js_1.isVirtualFileIdImportUserCode)(id)) {

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

@@ -53,7 +53,7 @@ const configDefinitionsBuiltIn = {
         env: 'server-and-client'
     },
     prerender: {
-        env: 'server-only'
+        env: 'config-only'
     },
     hydrationCanBeAborted: {
         env: 'client-only'

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

@@ -19,6 +19,7 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const helpers_js_1 = require("../../../../../shared/page-configs/helpers.js");
 const assertExports_js_1 = require("../../../../../shared/page-configs/assertExports.js");
 const getVirtualFilePageConfigs_js_1 = require("./getVirtualFilePageConfigs.js");
+const getConfigVike_js_1 = require("../../../../shared/getConfigVike.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
 let devServerIsCorrupt = false;
 let wasConfigInvalid = null;
@@ -64,9 +65,11 @@ async function handleReloadSideEffects() {
         }
     }
 }
-async function getVikeConfig(userRootDir, outDirRoot, isDev, extensions, tolerateInvalidConfig = false) {
+async function getVikeConfig(config, isDev, tolerateInvalidConfig = false, extensions) {
+    const { outDirRoot } = (0, utils_js_1.getOutDirs)(config);
+    const userRootDir = config.root;
     if (!vikeConfigPromise) {
-        vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev, extensions, tolerateInvalidConfig);
+        vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev, extensions ?? (await (0, getConfigVike_js_1.getConfigVike)(config)).extensions, tolerateInvalidConfig);
     }
     return await vikeConfigPromise;
 }

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

@@ -10,7 +10,8 @@ const helpers_js_1 = require("../../../../../shared/page-configs/helpers.js");
 const getConfigValueSourcesRelevant_js_1 = require("../../../shared/getConfigValueSourcesRelevant.js");
 const isRuntimeEnvMatch_js_1 = require("./isRuntimeEnvMatch.js");
 const serializeConfigValue_js_1 = require("../../../../../shared/page-configs/serialize/serializeConfigValue.js");
-async function getVirtualFilePageConfigValuesAll(id, userRootDir, outDirRoot, isDev, configVike) {
+const getConfigVike_js_1 = require("../../../../shared/getConfigVike.js");
+async function getVirtualFilePageConfigValuesAll(id, isDev, config) {
     const result = (0, virtualFilePageConfigValuesAll_js_1.isVirtualFileIdPageConfigValuesAll)(id);
     (0, utils_js_1.assert)(result);
     /* This assertion fails when using includeAssetsImportedByServer
@@ -20,9 +21,10 @@ async function getVirtualFilePageConfigValuesAll(id, userRootDir, outDirRoot, is
     }
     */
     const { pageId, isForClientSide } = result;
-    const { pageConfigs } = await (0, getVikeConfig_js_1.getVikeConfig)(userRootDir, outDirRoot, isDev, configVike.extensions, true);
+    const { pageConfigs } = await (0, getVikeConfig_js_1.getVikeConfig)(config, isDev, true);
     const pageConfig = pageConfigs.find((pageConfig) => pageConfig.pageId === pageId);
     (0, utils_js_1.assert)(pageConfig);
+    const configVike = await (0, getConfigVike_js_1.getConfigVike)(config);
     const code = getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, configVike.includeAssetsImportedByServer, isDev);
     (0, debug_js_1.debug)(id, isForClientSide ? 'CLIENT-SIDE' : 'SERVER-SIDE', code);
     return code;

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

@@ -14,15 +14,23 @@ const getVikeConfig_js_1 = require("./getVikeConfig.js");
 const isRuntimeEnvMatch_js_1 = require("./isRuntimeEnvMatch.js");
 const helpers_js_2 = require("../../../../../shared/page-configs/helpers.js");
 const serializeConfigValue_js_1 = require("../../../../../shared/page-configs/serialize/serializeConfigValue.js");
-async function getVirtualFilePageConfigs(userRootDir, outDirRoot, isForClientSide, isDev, id, configVike, isClientRouting) {
-    const { pageConfigs, pageConfigGlobal } = await (0, getVikeConfig_js_1.getVikeConfig)(userRootDir, outDirRoot, isDev, configVike.extensions, true);
-    return getContent(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, isClientRouting);
+async function getVirtualFilePageConfigs(isForClientSide, isDev, id, isClientRouting, config) {
+    const { pageConfigs, pageConfigGlobal } = await (0, getVikeConfig_js_1.getVikeConfig)(config, isDev, true);
+    return getCode(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, isClientRouting);
 }
 exports.getVirtualFilePageConfigs = getVirtualFilePageConfigs;
-function getContent(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, isClientRouting) {
+function getCode(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, isClientRouting) {
     const lines = [];
     const importStatements = [];
     const varCounterContainer = { varCounter: 0 };
+    lines.push(getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRouting, importStatements, varCounterContainer));
+    lines.push(getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isDev, importStatements, varCounterContainer));
+    const code = [...importStatements, ...lines].join('\n');
+    (0, debug_js_1.debug)(id, isForClientSide ? 'CLIENT-SIDE' : 'SERVER-SIDE', code);
+    return code;
+}
+function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRouting, importStatements, varCounterContainer) {
+    const lines = [];
     lines.push('export const pageConfigsSerialized = [');
     pageConfigs.forEach((pageConfig) => {
         const { pageId, routeFilesystem, isErrorPage } = pageConfig;
@@ -76,6 +84,11 @@ function getContent(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, i
         lines.push(`  },`);
     });
     lines.push('];');
+    const code = lines.join('\n');
+    return code;
+}
+function getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isDev, importStatements, varCounterContainer) {
+    const lines = [];
     lines.push('export const pageConfigGlobalSerialized = {');
     /* Nothing (yet)
     lines.push(`  configValuesSerialized: {`)
@@ -102,8 +115,7 @@ function getContent(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, i
     });
     lines.push(`  ],`);
     lines.push('};');
-    const code = [...importStatements, ...lines].join('\n');
-    (0, debug_js_1.debug)(id, isForClientSide ? 'CLIENT-SIDE' : 'SERVER-SIDE', code);
+    const code = lines.join('\n');
     return code;
 }
 function getConfigValueSerialized(value, configName, definedAt) {

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

@@ -232,11 +232,11 @@ function assertImportsAreReExported(fileImports, fileExports, filePathToShowToUs
     const importStatements = (0, utils_js_1.unique)(fileImportsUnused.map((fi) => fi.importStatementCode));
     const importNamesUnused = fileImportsUnused.map((fi) => picocolors_1.default.cyan(fi.importLocalName)).join(', ');
     const singular = fileImportsUnused.length === 1;
-    (0, utils_js_1.assertUsage)(fileImportsUnused.length === 0, [
+    (0, utils_js_1.assertWarning)(fileImportsUnused.length === 0, [
         `${filePathToShowToUser} imports the following:`,
         ...importStatements.map((s) => picocolors_1.default.cyan(`  ${s}`)),
         `But the import${singular ? '' : 's'} ${importNamesUnused} ${singular ? "isn't" : "aren't"} re-exported at ${picocolors_1.default.cyan('export default { ... }')} and therefore ${singular ? 'has' : 'have'} no effect, see explanation at https://vike.dev/header-file`
-    ].join('\n'));
+    ].join('\n'), { onlyOnce: true });
 }
 function getExportedStrings(obj) {
     const exportedStrings = [];

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

@@ -50,6 +50,7 @@ const abort_js_1 = require("../../shared/route/abort.js");
 const loadPageFilesServerSide_js_1 = require("../runtime/renderPage/loadPageFilesServerSide.js");
 const getHook_js_1 = require("../../shared/hooks/getHook.js");
 const noRouteMatch_js_1 = require("../../shared/route/noRouteMatch.js");
+const getVikeConfig_js_1 = require("../plugin/plugins/importUserCode/v1-design/getVikeConfig.js");
 async function prerenderFromAPI(options = {}) {
     await runPrerender(options, 'prerender()');
 }
@@ -96,7 +97,8 @@ async function runPrerender(options, manuallyTriggered) {
         pageContextInit: options.pageContextInit ?? null
     });
     const doNotPrerenderList = [];
-    await collectDoNoPrerenderList(renderContext, doNotPrerenderList, concurrencyLimit);
+    const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(viteConfig, false);
+    await collectDoNoPrerenderList(renderContext, vikeConfig.pageConfigs, doNotPrerenderList, concurrencyLimit);
     await callOnBeforePrerenderStartHooks(prerenderContext, renderContext, concurrencyLimit);
     await handlePagesWithStaticRoutes(prerenderContext, renderContext, doNotPrerenderList, concurrencyLimit);
     await callOnPrerenderStartHook(prerenderContext, renderContext);
@@ -111,8 +113,9 @@ async function runPrerender(options, manuallyTriggered) {
     await Promise.all(htmlFiles.map((htmlFile) => writeHtmlFile(htmlFile, root, outDirClient, concurrencyLimit, options.onPagePrerender, logLevel)));
     warnMissingPages(prerenderPageIds, doNotPrerenderList, renderContext, partial);
 }
-async function collectDoNoPrerenderList(renderContext, doNotPrerenderList, concurrencyLimit) {
-    renderContext.pageConfigs.forEach((pageConfig) => {
+async function collectDoNoPrerenderList(renderContext, pageConfigs, doNotPrerenderList, concurrencyLimit) {
+    // V1 design
+    pageConfigs.forEach((pageConfig) => {
         const configName = 'prerender';
         const configValue = (0, helpers_js_1.getConfigValue)(pageConfig, configName, 'boolean');
         if (configValue?.value === false) {
@@ -126,6 +129,8 @@ async function collectDoNoPrerenderList(renderContext, doNotPrerenderList, concu
             });
         }
     });
+    // Old design
+    // TODO/v1-release: remove
     await Promise.all(renderContext.pageFilesAll
         .filter((p) => {
         assertExportNames(p);

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

@@ -318,11 +318,11 @@ function skipRequest(urlOriginal) {
         isViteClientRequest);
 }
 function normalizeUrl(pageContextInit, httpRequestId) {
-    const { trailingSlash, disableUrlNormalization } = (0, globalContext_js_1.getGlobalContext)();
+    const { trailingSlash, disableUrlNormalization, baseServer } = (0, globalContext_js_1.getGlobalContext)();
     if (disableUrlNormalization)
         return null;
     const { urlOriginal } = pageContextInit;
-    const urlNormalized = (0, utils_js_1.normalizeUrlPathname)(urlOriginal, trailingSlash);
+    const urlNormalized = (0, utils_js_1.normalizeUrlPathname)(urlOriginal, trailingSlash, 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');

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

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getConfigVike = void 0;
+const utils_js_1 = require("./utils.js");
 async function getConfigVike(config) {
-    const configVike = (await config.configVikePromise);
+    const { configVikePromise } = config;
+    (0, utils_js_1.assert)(configVikePromise);
+    const configVike = await configVikePromise;
     return configVike;
 }
 exports.getConfigVike = getConfigVike;

package/dist/cjs/shared/page-configs/serialize/parseConfigValuesImported.js

@@ -1,12 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseConfigValuesImported = void 0;
 const utils_js_1 = require("../../utils.js");
 const assertExports_js_1 = require("../assertExports.js");
-const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 function parseConfigValuesImported(configValuesImported) {
     const configValues = {};
     const addConfigValue = (configName, value, importPath, exportName) => {
@@ -50,5 +46,12 @@ function parseConfigValuesImported(configValuesImported) {
 exports.parseConfigValuesImported = parseConfigValuesImported;
 function assertIsNotNull(configValue, configName, importPath) {
     (0, utils_js_1.assert)(!importPath.includes('+config.'));
-    (0, utils_js_1.assertUsage)(configValue !== null, `Set ${picocolors_1.default.cyan(configName)} to ${picocolors_1.default.cyan('null')} in a +config.h.js file instead of ${importPath}`);
+    /* Re-use this for:
+     *  - upcoming config.requestPageContextOnNavigation
+     *  - for cumulative values in the future: we don't need this for now because, currently, cumulative values are never imported.
+    assertUsage(
+      configValue !== null,
+      `Set ${pc.cyan(configName)} to ${pc.cyan('null')} in a +config.h.js file instead of ${importPath}`
+    )
+    */
 }

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

@@ -52,15 +52,20 @@ function isBaseAssets(base) {
     return base.startsWith('/') || base.startsWith('http://') || base.startsWith('https://');
 }
 exports.isBaseAssets = isBaseAssets;
-function normalizeUrlPathname(urlOriginal, trailingSlash) {
+function normalizeUrlPathname(urlOriginal, trailingSlash, baseServer) {
     const urlNormalized = modifyUrlPathname(urlOriginal, (urlPathname) => {
         (0, assert_js_1.assert)(urlPathname.startsWith('/'));
-        let urlPathnameNormalized = '/' + urlPathname.split('/').filter(Boolean).join('/');
-        if (urlPathnameNormalized !== '/') {
-            (0, assert_js_1.assert)(!urlPathnameNormalized.endsWith('/'));
-            if (trailingSlash) {
-                urlPathnameNormalized = urlPathnameNormalized + '/';
-            }
+        let urlPathnameNormalized = normalize(urlPathname);
+        if (urlPathnameNormalized === '/') {
+            return urlPathnameNormalized;
+        }
+        // If the Base URL has a trailing slash, then Vite (as of vite@5.0.0-beta.19) expects the root URL to also have a trailing slash, see https://github.com/vikejs/vike/issues/1258#issuecomment-1812226260
+        if (baseServer.endsWith('/') && baseServer !== '/' && normalize(baseServer) === urlPathnameNormalized) {
+            trailingSlash = true;
+        }
+        (0, assert_js_1.assert)(!urlPathnameNormalized.endsWith('/'));
+        if (trailingSlash) {
+            urlPathnameNormalized = urlPathnameNormalized + '/';
         }
         return urlPathnameNormalized;
     });
@@ -69,6 +74,10 @@ function normalizeUrlPathname(urlOriginal, trailingSlash) {
     return urlNormalized;
 }
 exports.normalizeUrlPathname = normalizeUrlPathname;
+function normalize(urlPathname) {
+    (0, assert_js_1.assert)(urlPathname.startsWith('/'));
+    return '/' + urlPathname.split('/').filter(Boolean).join('/');
+}
 function modifyUrlPathname(url, modifier) {
     const { origin, pathnameOriginal, searchOriginal, hashOriginal } = (0, parseUrl_js_1.parseUrl)(url, '/');
     const pathnameModified = modifier(pathnameOriginal);

package/dist/cjs/utils/projectInfo.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.projectInfo = void 0;
 const assertSingleInstance_js_1 = require("./assertSingleInstance.js");
-const PROJECT_VERSION = '0.4.145';
+const PROJECT_VERSION = '0.4.146-commit-701e2e5';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION,

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

@@ -1,5 +1,6 @@
 export { initHistoryState, getHistoryState, pushHistory, saveScrollPosition, monkeyPatchHistoryPushState };
-import { assert, assertUsage, hasProp, isObject } from './utils.js';
+import { assert, assertUsage, getGlobalObject, hasProp, isObject } from './utils.js';
+const globalObject = getGlobalObject('history.ts', {});
 // Fill missing state information:
 //  - `history.state` can uninitialized (i.e. `null`):
 //    - The very first render
@@ -71,11 +72,11 @@ function replaceHistoryState(state, url) {
     window.history.replaceState(state, '', url ?? /* Passing `undefined` chokes older Edge versions */ null);
 }
 function pushHistoryState(state, url) {
-    window.history.pushState(state, '', url);
+    pushStateOriginal(state, '', url);
 }
 function monkeyPatchHistoryPushState() {
-    const pushStateOriginal = history.pushState;
-    history.pushState = (stateFromUser = {}, ...rest) => {
+    globalObject.pushStateOriginal = globalObject.pushStateOriginal ?? window.history.pushState;
+    window.history.pushState = (stateFromUser = {}, ...rest) => {
         assertUsage(null === stateFromUser || undefined === stateFromUser || isObject(stateFromUser), 'history.pushState(state) argument state must be an object');
         const state = {
             scrollPosition: getScrollPosition(),
@@ -84,6 +85,9 @@ function monkeyPatchHistoryPushState() {
             // Don't allow user to overwrite triggedBy as it would break Vike's handling of the 'popstate' event
             triggedBy: 'user'
         };
-        return pushStateOriginal.apply(history, [state, ...rest]);
+        return pushStateOriginal(state, ...rest);
     };
 }
+function pushStateOriginal(...args) {
+    globalObject.pushStateOriginal.apply(history, args);
+}

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

@@ -1,7 +1,7 @@
 export { buildConfig };
 export { assertRollupInput };
 export { analyzeClientEntries };
-import { assert, resolveOutDir, isObject, viteIsSSR, getFilePathAbsolute, addOnBeforeLogHook, removeFileExtention, unique, assertPosixPath, assertUsage, getOutDirs } from '../utils.js';
+import { assert, resolveOutDir, isObject, viteIsSSR, getFilePathAbsolute, addOnBeforeLogHook, removeFileExtention, unique, assertPosixPath, assertUsage } from '../utils.js';
 import { virtualFileIdImportUserCodeServer } from '../../shared/virtual-files/virtualFileImportUserCode.js';
 import { getVikeConfig } from './importUserCode/v1-design/getVikeConfig.js';
 import { getConfigValue } from '../../../shared/page-configs/helpers.js';
@@ -69,7 +69,7 @@ function buildConfig() {
 async function getEntries(config) {
     const configVike = await getConfigVike(config);
     const pageFileEntries = await getPageFileEntries(config, configVike.includeAssetsImportedByServer); // TODO/v1-release: remove
-    const { pageConfigs } = await getVikeConfig(config.root, getOutDirs(config).outDirRoot, false, configVike.extensions);
+    const { pageConfigs } = await getVikeConfig(config, false);
     assertUsage(Object.keys(pageFileEntries).length !== 0 || pageConfigs.length !== 0, 'At least one page should be defined, see https://vike.dev/add');
     if (viteIsSSR(config)) {
         const serverEntries = analyzeServerEntries(pageConfigs);

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

@@ -1,6 +1,6 @@
 export { resolveVikeConfig };
 import { assertVikeConfig } from './assertVikeConfig.js';
-import { getOutDirs, isDev2 } from '../../utils.js';
+import { isDev2 } from '../../utils.js';
 import { findConfigVikeFromStemPackages } from './findConfigVikeFromStemPackages.js';
 import { pickFirst } from './pickFirst.js';
 import { resolveExtensions } from './resolveExtensions.js';
@@ -12,19 +12,19 @@ function resolveVikeConfig(vikeConfig) {
         name: 'vike:resolveVikeConfig',
         enforce: 'pre',
         async configResolved(config) {
-            const promise = resolveConfig(vikeConfig, config);
+            const promise = getConfigVikPromise(vikeConfig, config);
             config.configVikePromise = promise;
             await promise;
         }
     };
 }
-async function resolveConfig(vikeConfig, config) {
+async function getConfigVikPromise(vikeConfig, config) {
     const fromPluginOptions = (vikeConfig ?? {});
     const fromViteConfig = (config.vike ?? {});
     const fromStemPackages = await findConfigVikeFromStemPackages(config.root);
     const configs = [fromPluginOptions, ...fromStemPackages, fromViteConfig];
     const extensions = resolveExtensions(configs, config);
-    const { globalVikeConfig: fromPlusConfigFile } = await getVikeConfig(config.root, getOutDirs(config).outDirRoot, isDev2(config), extensions);
+    const { globalVikeConfig: fromPlusConfigFile } = await getVikeConfig(config, isDev2(config), false, extensions);
     configs.push(fromPlusConfigFile);
     assertVikeConfig(fromPlusConfigFile, ({ prop, errMsg }) => {
         // TODO: add config file path ?

package/dist/esm/node/plugin/plugins/devConfig/determineOptimizeDeps.js

@@ -1,12 +1,12 @@
 export { determineOptimizeDeps };
 import { findPageFiles } from '../../shared/findPageFiles.js';
-import { assert, getFilePathAbsolute, getOutDirs, isNotNullish, isNpmPackageImport, unique } from '../../utils.js';
+import { assert, getFilePathAbsolute, isNotNullish, isNpmPackageImport, unique } from '../../utils.js';
 import { getVikeConfig } from '../importUserCode/v1-design/getVikeConfig.js';
 import { getConfigValueSourcesRelevant } from '../../shared/getConfigValueSourcesRelevant.js';
 import { analyzeClientEntries } from '../buildConfig.js';
 import { virtualFileIdImportUserCodeClientCR, virtualFileIdImportUserCodeClientSR } from '../../../shared/virtual-files/virtualFileImportUserCode.js';
 async function determineOptimizeDeps(config, configVike, isDev) {
-    const { pageConfigs } = await getVikeConfig(config.root, getOutDirs(config).outDirRoot, isDev, configVike.extensions);
+    const { pageConfigs } = await getVikeConfig(config, isDev);
     const { entries, include } = await getPageDeps(config, pageConfigs, isDev);
     {
         // This actually doesn't work: Vite's dep optimizer doesn't seem to be able to crawl virtual files.

package/dist/esm/node/plugin/plugins/importUserCode/getVirtualFileImportUserCode.js

@@ -140,7 +140,7 @@ export const pageFilesList = [];
 export const neverLoaded = {};
 export const isGeneratedFile = true;
 
-${await getVirtualFilePageConfigs(config.root, getOutDirs(config).outDirRoot, isForClientSide, isDev, id, configVike, isClientRouting)}
+${await getVirtualFilePageConfigs(isForClientSide, isDev, id, isClientRouting, config)}
 
 `;
     fileTypes

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

@@ -47,7 +47,7 @@ function importUserCode() {
                 return undefined;
             id = getVirtualFileId(id);
             if (isVirtualFileIdPageConfigValuesAll(id)) {
-                const code = await getVirtualFilePageConfigValuesAll(id, config.root, getOutDirs(config).outDirRoot, isDev, configVike);
+                const code = await getVirtualFilePageConfigValuesAll(id, isDev, config);
                 return code;
             }
             if (isVirtualFileIdImportUserCode(id)) {

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

@@ -52,7 +52,7 @@ const configDefinitionsBuiltIn = {
         env: 'server-and-client'
     },
     prerender: {
-        env: 'server-only'
+        env: 'config-only'
     },
     hydrationCanBeAborted: {
         env: 'client-only'

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.d.ts

@@ -4,6 +4,7 @@ export { vikeConfigDependencies };
 export { isVikeConfigFile };
 import type { PageConfigGlobalBuildTime, PageConfigBuildTime } from '../../../../../shared/page-configs/PageConfig.js';
 import type { ExtensionResolved } from '../../../../../shared/ConfigVike.js';
+import type { ResolvedConfig } from 'vite';
 type VikeConfig = {
     pageConfigs: PageConfigBuildTime[];
     pageConfigGlobal: PageConfigGlobalBuildTime;
@@ -11,5 +12,5 @@ type VikeConfig = {
 };
 declare const vikeConfigDependencies: Set<string>;
 declare function reloadVikeConfig(userRootDir: string, outDirRoot: string, extensions: ExtensionResolved[]): void;
-declare function getVikeConfig(userRootDir: string, outDirRoot: string, isDev: boolean, extensions: ExtensionResolved[], tolerateInvalidConfig?: boolean): Promise<VikeConfig>;
+declare function getVikeConfig(config: ResolvedConfig, isDev: boolean, tolerateInvalidConfig?: boolean, extensions?: ExtensionResolved[]): Promise<VikeConfig>;
 declare function isVikeConfigFile(filePath: string): boolean;

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

@@ -2,7 +2,7 @@ export { getVikeConfig };
 export { reloadVikeConfig };
 export { vikeConfigDependencies };
 export { isVikeConfigFile };
-import { assertPosixPath, assert, isObject, assertUsage, toPosixPath, assertWarning, objectEntries, hasProp, arrayIncludes, assertIsNotProductionRuntime, getMostSimilar, isNpmPackageImport, joinEnglish, lowerFirst, scriptFileExtensions, mergeCumulativeValues, requireResolve } from '../../../utils.js';
+import { assertPosixPath, assert, isObject, assertUsage, toPosixPath, assertWarning, objectEntries, hasProp, arrayIncludes, assertIsNotProductionRuntime, getMostSimilar, isNpmPackageImport, joinEnglish, lowerFirst, scriptFileExtensions, mergeCumulativeValues, requireResolve, getOutDirs } from '../../../utils.js';
 import path from 'path';
 import { configDefinitionsBuiltIn, configDefinitionsBuiltInGlobal } from './getVikeConfig/configDefinitionsBuiltIn.js';
 import glob from 'fast-glob';
@@ -17,6 +17,7 @@ import pc from '@brillout/picocolors';
 import { getConfigDefinedAtString } from '../../../../../shared/page-configs/helpers.js';
 import { assertExportsOfConfigFile, assertExportsOfValueFile } from '../../../../../shared/page-configs/assertExports.js';
 import { getConfigValueSerialized } from './getVirtualFilePageConfigs.js';
+import { getConfigVike } from '../../../../shared/getConfigVike.js';
 assertIsNotProductionRuntime();
 let devServerIsCorrupt = false;
 let wasConfigInvalid = null;
@@ -60,9 +61,11 @@ async function handleReloadSideEffects() {
         }
     }
 }
-async function getVikeConfig(userRootDir, outDirRoot, isDev, extensions, tolerateInvalidConfig = false) {
+async function getVikeConfig(config, isDev, tolerateInvalidConfig = false, extensions) {
+    const { outDirRoot } = getOutDirs(config);
+    const userRootDir = config.root;
     if (!vikeConfigPromise) {
-        vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev, extensions, tolerateInvalidConfig);
+        vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev, extensions ?? (await getConfigVike(config)).extensions, tolerateInvalidConfig);
     }
     return await vikeConfigPromise;
 }

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVirtualFilePageConfigValuesAll.d.ts

@@ -1,3 +1,3 @@
 export { getVirtualFilePageConfigValuesAll };
-import type { ConfigVikeResolved } from '../../../../../shared/ConfigVike.js';
-declare function getVirtualFilePageConfigValuesAll(id: string, userRootDir: string, outDirRoot: string, isDev: boolean, configVike: ConfigVikeResolved): Promise<string>;
+import type { ResolvedConfig } from 'vite';
+declare function getVirtualFilePageConfigValuesAll(id: string, isDev: boolean, config: ResolvedConfig): Promise<string>;

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

@@ -8,7 +8,8 @@ import { getConfigValue } from '../../../../../shared/page-configs/helpers.js';
 import { getConfigValueSourcesRelevant } from '../../../shared/getConfigValueSourcesRelevant.js';
 import { isRuntimeEnvMatch } from './isRuntimeEnvMatch.js';
 import { serializeConfigValueImported } from '../../../../../shared/page-configs/serialize/serializeConfigValue.js';
-async function getVirtualFilePageConfigValuesAll(id, userRootDir, outDirRoot, isDev, configVike) {
+import { getConfigVike } from '../../../../shared/getConfigVike.js';
+async function getVirtualFilePageConfigValuesAll(id, isDev, config) {
     const result = isVirtualFileIdPageConfigValuesAll(id);
     assert(result);
     /* This assertion fails when using includeAssetsImportedByServer
@@ -18,9 +19,10 @@ async function getVirtualFilePageConfigValuesAll(id, userRootDir, outDirRoot, is
     }
     */
     const { pageId, isForClientSide } = result;
-    const { pageConfigs } = await getVikeConfig(userRootDir, outDirRoot, isDev, configVike.extensions, true);
+    const { pageConfigs } = await getVikeConfig(config, isDev, true);
     const pageConfig = pageConfigs.find((pageConfig) => pageConfig.pageId === pageId);
     assert(pageConfig);
+    const configVike = await getConfigVike(config);
     const code = getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, configVike.includeAssetsImportedByServer, isDev);
     debug(id, isForClientSide ? 'CLIENT-SIDE' : 'SERVER-SIDE', code);
     return code;

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVirtualFilePageConfigs.d.ts

@@ -1,6 +1,6 @@
 export { getVirtualFilePageConfigs };
 export { getConfigValueSerialized };
 import type { DefinedAt } from '../../../../../shared/page-configs/PageConfig.js';
-import type { ConfigVikeResolved } from '../../../../../shared/ConfigVike.js';
-declare function getVirtualFilePageConfigs(userRootDir: string, outDirRoot: string, isForClientSide: boolean, isDev: boolean, id: string, configVike: ConfigVikeResolved, isClientRouting: boolean): Promise<string>;
+import type { ResolvedConfig } from 'vite';
+declare function getVirtualFilePageConfigs(isForClientSide: boolean, isDev: boolean, id: string, isClientRouting: boolean, config: ResolvedConfig): Promise<string>;
 declare function getConfigValueSerialized(value: unknown, configName: string, definedAt: DefinedAt): string;

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVirtualFilePageConfigs.js

@@ -10,14 +10,22 @@ import { getVikeConfig } from './getVikeConfig.js';
 import { isRuntimeEnvMatch } from './isRuntimeEnvMatch.js';
 import { getConfigValueFilePathToShowToUser } from '../../../../../shared/page-configs/helpers.js';
 import { serializeConfigValue, serializeConfigValueImported } from '../../../../../shared/page-configs/serialize/serializeConfigValue.js';
-async function getVirtualFilePageConfigs(userRootDir, outDirRoot, isForClientSide, isDev, id, configVike, isClientRouting) {
-    const { pageConfigs, pageConfigGlobal } = await getVikeConfig(userRootDir, outDirRoot, isDev, configVike.extensions, true);
-    return getContent(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, isClientRouting);
+async function getVirtualFilePageConfigs(isForClientSide, isDev, id, isClientRouting, config) {
+    const { pageConfigs, pageConfigGlobal } = await getVikeConfig(config, isDev, true);
+    return getCode(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, isClientRouting);
 }
-function getContent(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, isClientRouting) {
+function getCode(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, isClientRouting) {
     const lines = [];
     const importStatements = [];
     const varCounterContainer = { varCounter: 0 };
+    lines.push(getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRouting, importStatements, varCounterContainer));
+    lines.push(getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isDev, importStatements, varCounterContainer));
+    const code = [...importStatements, ...lines].join('\n');
+    debug(id, isForClientSide ? 'CLIENT-SIDE' : 'SERVER-SIDE', code);
+    return code;
+}
+function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRouting, importStatements, varCounterContainer) {
+    const lines = [];
     lines.push('export const pageConfigsSerialized = [');
     pageConfigs.forEach((pageConfig) => {
         const { pageId, routeFilesystem, isErrorPage } = pageConfig;
@@ -71,6 +79,11 @@ function getContent(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, i
         lines.push(`  },`);
     });
     lines.push('];');
+    const code = lines.join('\n');
+    return code;
+}
+function getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isDev, importStatements, varCounterContainer) {
+    const lines = [];
     lines.push('export const pageConfigGlobalSerialized = {');
     /* Nothing (yet)
     lines.push(`  configValuesSerialized: {`)
@@ -97,8 +110,7 @@ function getContent(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, i
     });
     lines.push(`  ],`);
     lines.push('};');
-    const code = [...importStatements, ...lines].join('\n');
-    debug(id, isForClientSide ? 'CLIENT-SIDE' : 'SERVER-SIDE', code);
+    const code = lines.join('\n');
     return code;
 }
 function getConfigValueSerialized(value, configName, definedAt) {

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/transpileAndExecuteFile.js

@@ -7,7 +7,7 @@ import fs from 'fs';
 import path from 'path';
 import pc from '@brillout/picocolors';
 import { import_ } from '@brillout/import';
-import { assertPosixPath, getRandomId, assertIsNotProductionRuntime, assert, unique, assertWarning, isObject, toPosixPath, assertUsage } from '../../../utils.js';
+import { assertPosixPath, getRandomId, assertIsNotProductionRuntime, assert, unique, assertWarning, isObject, toPosixPath } from '../../../utils.js';
 import { isImportData, replaceImportStatements } from './replaceImportStatements.js';
 import { vikeConfigDependencies } from './getVikeConfig.js';
 import 'source-map-support/register.js';
@@ -226,11 +226,11 @@ function assertImportsAreReExported(fileImports, fileExports, filePathToShowToUs
     const importStatements = unique(fileImportsUnused.map((fi) => fi.importStatementCode));
     const importNamesUnused = fileImportsUnused.map((fi) => pc.cyan(fi.importLocalName)).join(', ');
     const singular = fileImportsUnused.length === 1;
-    assertUsage(fileImportsUnused.length === 0, [
+    assertWarning(fileImportsUnused.length === 0, [
         `${filePathToShowToUser} imports the following:`,
         ...importStatements.map((s) => pc.cyan(`  ${s}`)),
         `But the import${singular ? '' : 's'} ${importNamesUnused} ${singular ? "isn't" : "aren't"} re-exported at ${pc.cyan('export default { ... }')} and therefore ${singular ? 'has' : 'have'} no effect, see explanation at https://vike.dev/header-file`
-    ].join('\n'));
+    ].join('\n'), { onlyOnce: true });
 }
 function getExportedStrings(obj) {
     const exportedStrings = [];

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

@@ -25,6 +25,7 @@ import { isAbortError } from '../../shared/route/abort.js';
 import { loadPageFilesServerSide } from '../runtime/renderPage/loadPageFilesServerSide.js';
 import { assertHookFn } from '../../shared/hooks/getHook.js';
 import { noRouteMatch } from '../../shared/route/noRouteMatch.js';
+import { getVikeConfig } from '../plugin/plugins/importUserCode/v1-design/getVikeConfig.js';
 async function prerenderFromAPI(options = {}) {
     await runPrerender(options, 'prerender()');
 }
@@ -68,7 +69,8 @@ async function runPrerender(options, manuallyTriggered) {
         pageContextInit: options.pageContextInit ?? null
     });
     const doNotPrerenderList = [];
-    await collectDoNoPrerenderList(renderContext, doNotPrerenderList, concurrencyLimit);
+    const vikeConfig = await getVikeConfig(viteConfig, false);
+    await collectDoNoPrerenderList(renderContext, vikeConfig.pageConfigs, doNotPrerenderList, concurrencyLimit);
     await callOnBeforePrerenderStartHooks(prerenderContext, renderContext, concurrencyLimit);
     await handlePagesWithStaticRoutes(prerenderContext, renderContext, doNotPrerenderList, concurrencyLimit);
     await callOnPrerenderStartHook(prerenderContext, renderContext);
@@ -83,8 +85,9 @@ async function runPrerender(options, manuallyTriggered) {
     await Promise.all(htmlFiles.map((htmlFile) => writeHtmlFile(htmlFile, root, outDirClient, concurrencyLimit, options.onPagePrerender, logLevel)));
     warnMissingPages(prerenderPageIds, doNotPrerenderList, renderContext, partial);
 }
-async function collectDoNoPrerenderList(renderContext, doNotPrerenderList, concurrencyLimit) {
-    renderContext.pageConfigs.forEach((pageConfig) => {
+async function collectDoNoPrerenderList(renderContext, pageConfigs, doNotPrerenderList, concurrencyLimit) {
+    // V1 design
+    pageConfigs.forEach((pageConfig) => {
         const configName = 'prerender';
         const configValue = getConfigValue(pageConfig, configName, 'boolean');
         if (configValue?.value === false) {
@@ -98,6 +101,8 @@ async function collectDoNoPrerenderList(renderContext, doNotPrerenderList, concu
             });
         }
     });
+    // Old design
+    // TODO/v1-release: remove
     await Promise.all(renderContext.pageFilesAll
         .filter((p) => {
         assertExportNames(p);

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

@@ -312,11 +312,11 @@ function skipRequest(urlOriginal) {
         isViteClientRequest);
 }
 function normalizeUrl(pageContextInit, httpRequestId) {
-    const { trailingSlash, disableUrlNormalization } = getGlobalContext();
+    const { trailingSlash, disableUrlNormalization, baseServer } = getGlobalContext();
     if (disableUrlNormalization)
         return null;
     const { urlOriginal } = pageContextInit;
-    const urlNormalized = normalizeUrlPathname(urlOriginal, trailingSlash);
+    const urlNormalized = normalizeUrlPathname(urlOriginal, trailingSlash, baseServer);
     if (!urlNormalized)
         return null;
     logRuntimeInfo?.(`URL normalized from ${pc.cyan(urlOriginal)} to ${pc.cyan(urlNormalized)} (https://vike.dev/url-normalization)`, httpRequestId, 'info');

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

@@ -1,3 +1,4 @@
 export { getConfigVike };
+import { ResolvedConfig } from 'vite';
 import type { ConfigVikeResolved } from '../../shared/ConfigVike.js';
-declare function getConfigVike(config: Record<string, unknown>): Promise<ConfigVikeResolved>;
+declare function getConfigVike(config: ResolvedConfig): Promise<ConfigVikeResolved>;

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

@@ -1,5 +1,8 @@
 export { getConfigVike };
+import { assert } from './utils.js';
 async function getConfigVike(config) {
-    const configVike = (await config.configVikePromise);
+    const { configVikePromise } = config;
+    assert(configVikePromise);
+    const configVike = await configVikePromise;
     return configVike;
 }

package/dist/esm/shared/page-configs/serialize/parseConfigValuesImported.js

@@ -1,7 +1,6 @@
 export { parseConfigValuesImported };
-import { assert, assertUsage } from '../../utils.js';
+import { assert } from '../../utils.js';
 import { assertExportsOfValueFile } from '../assertExports.js';
-import pc from '@brillout/picocolors';
 function parseConfigValuesImported(configValuesImported) {
     const configValues = {};
     const addConfigValue = (configName, value, importPath, exportName) => {
@@ -44,5 +43,12 @@ function parseConfigValuesImported(configValuesImported) {
 }
 function assertIsNotNull(configValue, configName, importPath) {
     assert(!importPath.includes('+config.'));
-    assertUsage(configValue !== null, `Set ${pc.cyan(configName)} to ${pc.cyan('null')} in a +config.h.js file instead of ${importPath}`);
+    /* Re-use this for:
+     *  - upcoming config.requestPageContextOnNavigation
+     *  - for cumulative values in the future: we don't need this for now because, currently, cumulative values are never imported.
+    assertUsage(
+      configValue !== null,
+      `Set ${pc.cyan(configName)} to ${pc.cyan('null')} in a +config.h.js file instead of ${importPath}`
+    )
+    */
 }

package/dist/esm/utils/parseUrl-extras.d.ts

@@ -8,7 +8,7 @@ export { addUrlOrigin };
 declare function prependBase(url: string, baseServer: string): string;
 declare function removeBaseServer(url: string, baseServer: string): string;
 declare function isBaseAssets(base: string): boolean;
-declare function normalizeUrlPathname(urlOriginal: string, trailingSlash: boolean): string | null;
+declare function normalizeUrlPathname(urlOriginal: string, trailingSlash: boolean, baseServer: string): string | null;
 declare function modifyUrlPathname(url: string, modifier: (urlPathname: string) => string | null): string;
 declare function removeUrlOrigin(url: string): {
     urlModified: string;

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

@@ -53,15 +53,20 @@ function normalizeBaseServer(baseServer) {
 function isBaseAssets(base) {
     return base.startsWith('/') || base.startsWith('http://') || base.startsWith('https://');
 }
-function normalizeUrlPathname(urlOriginal, trailingSlash) {
+function normalizeUrlPathname(urlOriginal, trailingSlash, baseServer) {
     const urlNormalized = modifyUrlPathname(urlOriginal, (urlPathname) => {
         assert(urlPathname.startsWith('/'));
-        let urlPathnameNormalized = '/' + urlPathname.split('/').filter(Boolean).join('/');
-        if (urlPathnameNormalized !== '/') {
-            assert(!urlPathnameNormalized.endsWith('/'));
-            if (trailingSlash) {
-                urlPathnameNormalized = urlPathnameNormalized + '/';
-            }
+        let urlPathnameNormalized = normalize(urlPathname);
+        if (urlPathnameNormalized === '/') {
+            return urlPathnameNormalized;
+        }
+        // If the Base URL has a trailing slash, then Vite (as of vite@5.0.0-beta.19) expects the root URL to also have a trailing slash, see https://github.com/vikejs/vike/issues/1258#issuecomment-1812226260
+        if (baseServer.endsWith('/') && baseServer !== '/' && normalize(baseServer) === urlPathnameNormalized) {
+            trailingSlash = true;
+        }
+        assert(!urlPathnameNormalized.endsWith('/'));
+        if (trailingSlash) {
+            urlPathnameNormalized = urlPathnameNormalized + '/';
         }
         return urlPathnameNormalized;
     });
@@ -69,6 +74,10 @@ function normalizeUrlPathname(urlOriginal, trailingSlash) {
         return null;
     return urlNormalized;
 }
+function normalize(urlPathname) {
+    assert(urlPathname.startsWith('/'));
+    return '/' + urlPathname.split('/').filter(Boolean).join('/');
+}
 function modifyUrlPathname(url, modifier) {
     const { origin, pathnameOriginal, searchOriginal, hashOriginal } = parseUrl(url, '/');
     const pathnameModified = modifier(pathnameOriginal);

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

@@ -5,7 +5,7 @@ type ProjectVersion = typeof projectInfo.projectVersion;
 type ProjectTag = `[${PackageName}]` | `[${PackageName}@${ProjectVersion}]`;
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.145";
+    projectVersion: "0.4.146-commit-701e2e5";
     npmPackageName: "vike";
     githubRepository: "https://github.com/vikejs/vike";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,6 +1,6 @@
 export { projectInfo };
 import { onProjectInfo } from './assertSingleInstance.js';
-const PROJECT_VERSION = '0.4.145';
+const PROJECT_VERSION = '0.4.146-commit-701e2e5';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION,

package/node/cli/bin-entry.js

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 
-import '../../dist/esm/node/cli/bin.mjs'
+import '../../dist/esm/node/cli/bin.js'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.145",
+  "version": "0.4.146-commit-701e2e5",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",