vike 0.4.199-commit-5d1b353 → 0.4.199-commit-9b29f98

package/dist/cjs/node/client/router.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.onPopState = exports.prefetch = exports.reload = exports.navigate = void 0;
+exports.prefetch = exports.reload = exports.navigate = void 0;
 const assert_js_1 = require("../../utils/assert.js");
 // `never` to ensure package.json#exports["./client/router"].types points to type defined by the client-side code
 const navigate = (() => warnNoEffect('navigate'));
@@ -9,8 +9,6 @@ const reload = (() => warnNoEffect('reload'));
 exports.reload = reload;
 const prefetch = (() => warnNoEffect('prefetch'));
 exports.prefetch = prefetch;
-const onPopState = (() => { });
-exports.onPopState = onPopState;
 function warnNoEffect(caller) {
     (0, assert_js_1.assertWarning)(false, `Calling ${caller}() on the server-side has no effect`, {
         showStackTrace: true,

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

@@ -605,7 +605,9 @@ async function write(urlOriginal, pageContext, fileExtension, fileContent, root,
     (0, utils_js_1.assertPosixPath)(fileUrl);
     (0, utils_js_1.assert)(fileUrl.startsWith('/'));
     const filePathRelative = fileUrl.slice(1);
-    (0, utils_js_1.assert)(!filePathRelative.startsWith('/'));
+    (0, utils_js_1.assert)(!filePathRelative.startsWith('/'), 
+    // Let's remove this debug info after we add a assertUsage() avoiding https://github.com/vikejs/vike/issues/1929
+    { urlOriginal, fileUrl });
     (0, utils_js_1.assertPosixPath)(outDirClient);
     (0, utils_js_1.assertPosixPath)(filePathRelative);
     const filePath = path_1.default.posix.join(outDirClient, filePathRelative);

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

@@ -380,19 +380,29 @@ function getPermanentRedirect(pageContextInit, httpRequestId) {
         urlTarget = urlTargetExternal;
     }
     else {
-        if (origin)
-            urlTarget = (0, utils_js_1.addUrlOrigin)(urlTarget, origin);
-        if (urlTarget === urlWithoutBase)
+        let originChanged = false;
+        if (origin) {
+            const urlModified = (0, utils_js_1.setUrlOrigin)(urlTarget, origin);
+            if (urlModified !== false) {
+                originChanged = true;
+                urlTarget = urlModified;
+            }
+        }
+        if (normalize(urlTarget) === normalize(urlWithoutBase))
             return null;
-        urlTarget = (0, utils_js_1.prependBase)(urlTarget, baseServer);
+        if (!originChanged)
+            urlTarget = (0, utils_js_1.prependBase)(urlTarget, baseServer);
         (0, utils_js_1.assert)(urlTarget !== pageContextInit.urlOriginal);
     }
-    (0, loggerRuntime_js_1.logRuntimeInfo)?.(`Permanent redirect defined by your config.redirects (https://vike.dev/redirects)`, httpRequestId, 'info');
+    (0, loggerRuntime_js_1.logRuntimeInfo)?.(`Permanent redirection defined by config.redirects (https://vike.dev/redirects)`, httpRequestId, 'info');
     const httpResponse = (0, createHttpResponse_js_1.createHttpResponseRedirect)({ url: urlTarget, statusCode: 301 }, urlWithoutBase);
     const pageContextHttpResponse = createPageContext(pageContextInit);
     (0, utils_js_1.objectAssign)(pageContextHttpResponse, { httpResponse });
     return pageContextHttpResponse;
 }
+function normalize(url) {
+    return url || '/';
+}
 async function handleAbortError(errAbort, pageContextsFromRewrite, pageContextInit, 
 // handleAbortError() creates a new pageContext object and we don't merge pageContextNominalPageInit to it: we only use some pageContextNominalPageInit information.
 pageContextNominalPageInit, httpRequestId, renderContext, pageContextErrorPageInit) {

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.199-commit-5d1b353';
+exports.PROJECT_VERSION = '0.4.199-commit-9b29f98';

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

@@ -6,7 +6,7 @@ exports.normalizeUrlPathname = normalizeUrlPathname;
 exports.removeBaseServer = removeBaseServer;
 exports.modifyUrlPathname = modifyUrlPathname;
 exports.removeUrlOrigin = removeUrlOrigin;
-exports.addUrlOrigin = addUrlOrigin;
+exports.setUrlOrigin = setUrlOrigin;
 exports.getUrlPretty = getUrlPretty;
 const parseUrl_js_1 = require("./parseUrl.js");
 const assert_js_1 = require("./assert.js");
@@ -96,9 +96,10 @@ function removeUrlOrigin(url) {
     const urlModified = (0, parseUrl_js_1.createUrlFromComponents)(null, pathnameOriginal, searchOriginal, hashOriginal);
     return { urlModified, origin };
 }
-function addUrlOrigin(url, origin) {
+function setUrlOrigin(url, origin) {
     const { origin: originCurrent, pathnameOriginal, searchOriginal, hashOriginal } = (0, parseUrl_js_1.parseUrl)(url, '/');
-    (0, assert_js_1.assert)(originCurrent === null);
+    if (origin === originCurrent)
+        return false;
     (0, assert_js_1.assert)(origin === null || origin.startsWith('http'));
     const urlModified = (0, parseUrl_js_1.createUrlFromComponents)(origin, pathnameOriginal, searchOriginal, hashOriginal);
     return urlModified;

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

@@ -1,8 +1,4 @@
-export { pushHistoryState };
-export { onPopStateBegin };
-export { saveScrollPosition };
-export type { HistoryInfo };
-export type { ScrollPosition };
+export { getHistoryState, enhanceHistoryState, pushHistoryState, type ScrollPosition, saveScrollPosition };
 type StateEnhanced = {
     timestamp: number;
     scrollPosition: null | ScrollPosition;
@@ -13,14 +9,7 @@ type ScrollPosition = {
     x: number;
     y: number;
 };
+declare function enhanceHistoryState(): void;
+declare function getHistoryState(): StateEnhanced;
 declare function saveScrollPosition(): void;
 declare function pushHistoryState(url: string, overwriteLastHistoryEntry: boolean): void;
-type HistoryInfo = {
-    url: `/${string}`;
-    state: StateEnhanced;
-};
-declare function onPopStateBegin(): {
-    isNewState: boolean;
-    previous: HistoryInfo;
-    current: HistoryInfo;
-};

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

@@ -1,9 +1,7 @@
-export { pushHistoryState };
-export { onPopStateBegin };
-export { saveScrollPosition };
-import { assert, assertUsage, getCurrentUrl, getGlobalObject, hasProp, isObject } from './utils.js';
+export { getHistoryState, enhanceHistoryState, pushHistoryState, saveScrollPosition };
+import { assert, assertUsage, hasProp, isObject } from './utils.js';
+let initStateEnhanced;
 init();
-const globalObject = getGlobalObject('history.ts', { previous: getHistoryInfo() });
 // `window.history.state === null` when:
 // - The very first render
 // - Click on `<a href="#some-hash" />`
@@ -40,13 +38,11 @@ function enhance(stateNotEnhanced) {
     assert(isVikeEnhanced(stateVikeEnhanced));
     return stateVikeEnhanced;
 }
-function getState() {
+function getStateEnhanced() {
     const state = getStateNotEnhanced();
-    // *Every* state added to the history needs to go through Vike.
-    // - Otherwise Vike's `popstate` listener won't work. (Because, for example, if globalObject.previous is outdated => isHashNavigation faulty => client-side navigation wrongfully skipped.)
-    // - Therefore, we monkey patch history.pushState() and history.replaceState()
-    // - Therefore, we assert() below that history.state has been enhanced by Vike
-    // - If users stumble upon this assert() then make it a assertUsage()
+    // This assert() will most likely eventually cause issues. Let's then:
+    // - Replace the assert() call with enhanceHistoryState()
+    // - Remove the race condition buster `initStateEnhanced` as it won't be needed anymore
     assert(isVikeEnhanced(state));
     return state;
 }
@@ -54,6 +50,11 @@ function getStateNotEnhanced() {
     const state = window.history.state;
     return state;
 }
+function getHistoryState() {
+    if (!initStateEnhanced)
+        enhanceHistoryState(); // avoid race condition
+    return getStateEnhanced();
+}
 function getScrollPosition() {
     const scrollPosition = { x: window.scrollX, y: window.scrollY };
     return scrollPosition;
@@ -63,54 +64,48 @@ function getTimestamp() {
 }
 function saveScrollPosition() {
     const scrollPosition = getScrollPosition();
-    const state = getState();
+    const state = getStateEnhanced();
     replaceHistoryState({ ...state, scrollPosition });
 }
 function pushHistoryState(url, overwriteLastHistoryEntry) {
     if (!overwriteLastHistoryEntry) {
-        const state = {
-            timestamp: getTimestamp(),
+        const timestamp = getTimestamp();
+        pushState({
+            timestamp,
             // I don't remember why I set it to `null`, maybe because setting it now would be too early? (Maybe there is a delay between renderPageClientSide() is finished and the browser updating the scroll position.) Anyways, it seems like autoSaveScrollPosition() is enough.
             scrollPosition: null,
             triggeredBy: 'vike',
             _isVikeEnhanced: true
-        };
-        // Calling the monkey patched history.pushState() (and not the orignal) so that other tools (e.g. user tracking) can listen to Vike's pushState() calls
-        // https://github.com/vikejs/vike/issues/1582
-        window.history.pushState(state, '', url);
+        }, url);
     }
     else {
-        replaceHistoryState(getState(), url);
+        replaceHistoryState(getStateEnhanced(), url);
     }
 }
 function replaceHistoryState(state, url) {
     const url_ = url ?? null; // Passing `undefined` chokes older Edge versions.
     window.history.replaceState(state, '', url_);
 }
-// Monkey patch:
-// - history.pushState()
-// - history.replaceState()
-function monkeyPatchHistoryAPI() {
-    ;
-    ['pushState', 'replaceState'].forEach((funcName) => {
-        const funcOriginal = window.history[funcName].bind(window.history);
-        window.history[funcName] = (stateOriginal = {}, ...rest) => {
-            assertUsage(stateOriginal === undefined || stateOriginal === null || isObject(stateOriginal), `history.${funcName}(state) argument state must be an object`);
-            const stateEnhanced = isVikeEnhanced(stateOriginal)
-                ? stateOriginal
-                : {
-                    _isVikeEnhanced: true,
-                    scrollPosition: getScrollPosition(),
-                    timestamp: getTimestamp(),
-                    triggeredBy: 'user',
-                    ...stateOriginal
-                };
-            assert(isVikeEnhanced(stateEnhanced));
-            const ret = funcOriginal(stateEnhanced, ...rest);
-            globalObject.previous = getHistoryInfo();
-            return ret;
-        };
-    });
+function pushState(state, url) {
+    // Vike should call window.history.pushState() (and not the orignal `pushStateOriginal()`) so that other tools (e.g. user tracking) can listen to Vike's pushState() calls, see https://github.com/vikejs/vike/issues/1582.
+    window.history.pushState(state, '', url);
+}
+function monkeyPatchHistoryPushState() {
+    const pushStateOriginal = window.history.pushState.bind(window.history);
+    window.history.pushState = (stateOriginal = {}, ...rest) => {
+        assertUsage(stateOriginal === undefined || stateOriginal === null || isObject(stateOriginal), 'history.pushState(state) argument state must be an object');
+        const stateEnhanced = isVikeEnhanced(stateOriginal)
+            ? stateOriginal
+            : {
+                _isVikeEnhanced: true,
+                scrollPosition: getScrollPosition(),
+                timestamp: getTimestamp(),
+                triggeredBy: 'user',
+                ...stateOriginal
+            };
+        assert(isVikeEnhanced(stateEnhanced));
+        return pushStateOriginal(stateEnhanced, ...rest);
+    };
 }
 function isVikeEnhanced(state) {
     const yes = isObject(state) && '_isVikeEnhanced' in state;
@@ -131,20 +126,6 @@ function assertStateVikeEnhanced(state) {
 }
 function init() {
     enhanceHistoryState();
-    monkeyPatchHistoryAPI();
-}
-function getHistoryInfo() {
-    return {
-        url: getCurrentUrl(),
-        state: getState()
-    };
-}
-function onPopStateBegin() {
-    const isNewState = window.history.state === null;
-    if (isNewState)
-        enhanceHistoryState();
-    const { previous } = globalObject;
-    const current = getHistoryInfo();
-    globalObject.previous = current;
-    return { isNewState, previous, current };
+    initStateEnhanced = true;
+    monkeyPatchHistoryPushState();
 }

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

@@ -1,6 +1,5 @@
 export { navigate, reload } from './navigate.js';
 export { prefetch } from './prefetch.js';
-export { onPopState } from './initOnPopState.js';
 export { PROJECT_VERSION as version } from './utils.js';
 import type { PageContextBuiltInClientWithClientRouting } from '../../shared/types.js';
 /** @deprecated

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

@@ -5,5 +5,4 @@
 // Use package.json#exports to make the imports isomorphic.
 export { navigate, reload } from './navigate.js';
 export { prefetch } from './prefetch.js';
-export { onPopState } from './initOnPopState.js';
 export { PROJECT_VERSION as version } from './utils.js';

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

@@ -1,12 +1,4 @@
 export { initOnPopState };
-export { onPopState };
-import { type HistoryInfo } from './history.js';
+export { updateState };
 declare function initOnPopState(): void;
-type Listener = (arg: {
-    previous: HistoryInfo;
-}) => void | boolean;
-/** Control back-/forward navigation.
- *
- * https://vike.dev/onPopState
- */
-declare function onPopState(listener: Listener): void;
+declare function updateState(): void;

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

@@ -1,10 +1,10 @@
 export { initOnPopState };
-export { onPopState };
-import { getGlobalObject } from './utils.js';
-import { onPopStateBegin } from './history.js';
+export { updateState };
+import { getCurrentUrl, getGlobalObject } from './utils.js';
+import { enhanceHistoryState, getHistoryState } from './history.js';
 import { renderPageClientSide } from './renderPageClientSide.js';
 import { setScrollPosition } from './setScrollPosition.js';
-const globalObject = getGlobalObject('initOnPopState.ts', { listeners: [] });
+const globalObject = getGlobalObject('initOnPopState.ts', { previous: getInfo() });
 function initOnPopState() {
     // - The popstate event is trigged upon:
     //   - Back-/forward navigation.
@@ -16,14 +16,19 @@ function initOnPopState() {
     //     - `location.hash = 'some-hash'`
     // - The `event` argument of `window.addEventListener('popstate', (event) => /*...*/)` is useless: the History API doesn't provide the previous state (the popped state), see https://stackoverflow.com/questions/48055323/is-history-state-always-the-same-as-popstate-event-state
     window.addEventListener('popstate', async () => {
-        const { isNewState, previous, current } = onPopStateBegin();
+        const isNewState = window.history.state === null;
+        if (isNewState)
+            enhanceHistoryState();
+        const { previous } = globalObject;
+        const current = getInfo();
+        globalObject.previous = current;
         const scrollTarget = current.state.scrollPosition || undefined;
-        const isUserPushStateNavigation = current.state.triggeredBy === 'user' || previous.state.triggeredBy === 'user';
-        const isHashNavigation = current.url !== previous.url && removeHash(current.url) === removeHash(previous.url);
-        // - `isNewState === true` when:
+        const isUserLandPushStateNavigation = current.state?.triggeredBy === 'user';
+        const isHashNavigation = removeHash(current.url) === removeHash(previous.url);
+        // - `history.state === null` when:
         //   - Click on `<a href="#some-hash" />` (note that Vike's `initOnLinkClick()` handler skips hash links)
         //   - `location.hash = 'some-hash'`
-        // - `isNewState === false` when `popstate` was triggered by the user clicking on his browser's forward/backward history button.
+        // - `history.state !== null` when `popstate` was triggered by the user clicking on his browser's forward/backward history button.
         const isHashNavigationNew = isHashNavigation && isNewState;
         const isBackwardNavigation = !current.state.timestamp || !previous.state.timestamp ? null : current.state.timestamp < previous.state.timestamp;
         // We have to scroll ourselves because we use `window.history.scrollRestoration = 'manual'`. So far this seems to work. Alternatives in case it doesn't work:
@@ -35,7 +40,7 @@ function initOnPopState() {
         // - Alternative: we completely take over hash navigation and reproduce the browser's native behavior upon hash navigation.
         //   - By using the `hashchange` event.
         //   - Problem: conflict if user wants to override the browser's default behavior? E.g. for smooth scrolling, or when using hashes for saving states of some fancy animations.
-        if (isHashNavigation) {
+        if (isHashNavigation && !isUserLandPushStateNavigation) {
             if (!isHashNavigationNew) {
                 setScrollPosition(scrollTarget);
             }
@@ -44,27 +49,18 @@ function initOnPopState() {
             }
             return;
         }
-        let doNotRenderIfSamePage = isUserPushStateNavigation;
-        let abort;
-        globalObject.listeners.forEach((listener) => {
-            abort || (abort = listener({ previous }));
-        });
-        if (abort) {
-            return;
-        }
-        if (abort === false) {
-            doNotRenderIfSamePage = false;
-        }
-        await renderPageClientSide({ scrollTarget, isBackwardNavigation, doNotRenderIfSamePage });
+        await renderPageClientSide({ scrollTarget, isBackwardNavigation, isUserLandPushStateNavigation });
     });
 }
-/** Control back-/forward navigation.
- *
- * https://vike.dev/onPopState
- */
-function onPopState(listener) {
-    globalObject.listeners.push(listener);
+function getInfo() {
+    return {
+        url: getCurrentUrl(),
+        state: getHistoryState()
+    };
 }
 function removeHash(url) {
     return url.split('#')[0];
 }
+function updateState() {
+    globalObject.previous = getInfo();
+}

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

@@ -12,7 +12,8 @@ type RenderArgs = {
     overwriteLastHistoryEntry?: boolean;
     pageContextsFromRewrite?: PageContextFromRewrite[];
     redirectCount?: number;
-    doNotRenderIfSamePage?: boolean;
+    /** Whether the navigation was triggered by the user land calling `history.pushState()` */
+    isUserLandPushStateNavigation?: boolean;
     isClientSideNavigation?: boolean;
 };
 declare function renderPageClientSide(renderArgs: RenderArgs): Promise<void>;

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

@@ -15,6 +15,7 @@ import { assertNoInfiniteAbortLoop, getPageContextFromAllRewrites, isAbortError,
 import { route } from '../../shared/route/index.js';
 import { isClientSideRoutable } from './isClientSideRoutable.js';
 import { setScrollPosition } from './setScrollPosition.js';
+import { updateState } from './initOnPopState.js';
 import { browserNativeScrollRestoration_disable, setInitialRenderIsDone } from './scrollRestoration.js';
 import { getErrorPageId } from '../../shared/error-page.js';
 import { setPageContextCurrent } from './getPageContextCurrent.js';
@@ -29,7 +30,7 @@ const globalObject = getGlobalObject('renderPageClientSide.ts', (() => {
 })());
 const { firstRenderStartPromise } = globalObject;
 async function renderPageClientSide(renderArgs) {
-    const { urlOriginal = getCurrentUrl(), overwriteLastHistoryEntry = false, isBackwardNavigation, pageContextsFromRewrite = [], redirectCount = 0, doNotRenderIfSamePage, isClientSideNavigation = true } = renderArgs;
+    const { urlOriginal = getCurrentUrl(), overwriteLastHistoryEntry = false, isBackwardNavigation, pageContextsFromRewrite = [], redirectCount = 0, isUserLandPushStateNavigation, isClientSideNavigation = true } = renderArgs;
     let { scrollTarget } = renderArgs;
     const { previousPageContext } = globalObject;
     addLinkPrefetchHandlers_unwatch();
@@ -119,7 +120,7 @@ async function renderPageClientSide(renderArgs) {
             const isSamePage = pageContextFromRoute.pageId &&
                 previousPageContext?.pageId &&
                 pageContextFromRoute.pageId === previousPageContext.pageId;
-            if (doNotRenderIfSamePage && isSamePage) {
+            if (isUserLandPushStateNavigation && isSamePage) {
                 // Skip's Vike's rendering; let the user handle the navigation
                 return;
             }
@@ -476,6 +477,7 @@ function changeUrl(url, overwriteLastHistoryEntry) {
         return;
     browserNativeScrollRestoration_disable();
     pushHistoryState(url, overwriteLastHistoryEntry);
+    updateState();
 }
 function handleErrorFetchingStaticAssets(err, pageContext, isFirstRender) {
     if (!isErrorFetchingStaticAssets(err)) {

package/dist/esm/node/client/router.d.ts

@@ -1,8 +1,6 @@
 export { navigate };
 export { reload };
 export { prefetch };
-export { onPopState };
 declare const navigate: never;
 declare const reload: never;
 declare const prefetch: never;
-declare const onPopState: never;

package/dist/esm/node/client/router.js

@@ -1,13 +1,11 @@
 export { navigate };
 export { reload };
 export { prefetch };
-export { onPopState };
 import { assertWarning } from '../../utils/assert.js';
 // `never` to ensure package.json#exports["./client/router"].types points to type defined by the client-side code
 const navigate = (() => warnNoEffect('navigate'));
 const reload = (() => warnNoEffect('reload'));
 const prefetch = (() => warnNoEffect('prefetch'));
-const onPopState = (() => { });
 function warnNoEffect(caller) {
     assertWarning(false, `Calling ${caller}() on the server-side has no effect`, {
         showStackTrace: true,

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

@@ -577,7 +577,9 @@ async function write(urlOriginal, pageContext, fileExtension, fileContent, root,
     assertPosixPath(fileUrl);
     assert(fileUrl.startsWith('/'));
     const filePathRelative = fileUrl.slice(1);
-    assert(!filePathRelative.startsWith('/'));
+    assert(!filePathRelative.startsWith('/'), 
+    // Let's remove this debug info after we add a assertUsage() avoiding https://github.com/vikejs/vike/issues/1929
+    { urlOriginal, fileUrl });
     assertPosixPath(outDirClient);
     assertPosixPath(filePathRelative);
     const filePath = path.posix.join(outDirClient, filePathRelative);

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

@@ -2,7 +2,7 @@ export { renderPage };
 export { renderPage_addWrapper };
 import { getRenderContext, getPageContextInitEnhanced, renderPageAlreadyRouted } from './renderPage/renderPageAlreadyRouted.js';
 import { route } from '../../shared/route/index.js';
-import { assert, hasProp, objectAssign, isUrl, parseUrl, assertEnv, assertWarning, getGlobalObject, checkType, assertUsage, normalizeUrlPathname, removeBaseServer, modifyUrlPathname, prependBase, removeUrlOrigin, addUrlOrigin, createUrlFromComponents, isUri, getUrlPretty } from './utils.js';
+import { assert, hasProp, objectAssign, isUrl, parseUrl, assertEnv, assertWarning, getGlobalObject, checkType, assertUsage, normalizeUrlPathname, removeBaseServer, modifyUrlPathname, prependBase, removeUrlOrigin, setUrlOrigin, createUrlFromComponents, isUri, getUrlPretty } from './utils.js';
 import { assertNoInfiniteAbortLoop, getPageContextFromAllRewrites, isAbortError, logAbortErrorHandled } from '../../shared/route/abort.js';
 import { getGlobalContext, initGlobalContext_renderPage } from './globalContext.js';
 import { handlePageContextRequestUrl } from './renderPage/handlePageContextRequestUrl.js';
@@ -374,19 +374,29 @@ function getPermanentRedirect(pageContextInit, httpRequestId) {
         urlTarget = urlTargetExternal;
     }
     else {
-        if (origin)
-            urlTarget = addUrlOrigin(urlTarget, origin);
-        if (urlTarget === urlWithoutBase)
+        let originChanged = false;
+        if (origin) {
+            const urlModified = setUrlOrigin(urlTarget, origin);
+            if (urlModified !== false) {
+                originChanged = true;
+                urlTarget = urlModified;
+            }
+        }
+        if (normalize(urlTarget) === normalize(urlWithoutBase))
             return null;
-        urlTarget = prependBase(urlTarget, baseServer);
+        if (!originChanged)
+            urlTarget = prependBase(urlTarget, baseServer);
         assert(urlTarget !== pageContextInit.urlOriginal);
     }
-    logRuntimeInfo?.(`Permanent redirect defined by your config.redirects (https://vike.dev/redirects)`, httpRequestId, 'info');
+    logRuntimeInfo?.(`Permanent redirection defined by config.redirects (https://vike.dev/redirects)`, httpRequestId, 'info');
     const httpResponse = createHttpResponseRedirect({ url: urlTarget, statusCode: 301 }, urlWithoutBase);
     const pageContextHttpResponse = createPageContext(pageContextInit);
     objectAssign(pageContextHttpResponse, { httpResponse });
     return pageContextHttpResponse;
 }
+function normalize(url) {
+    return url || '/';
+}
 async function handleAbortError(errAbort, pageContextsFromRewrite, pageContextInit, 
 // handleAbortError() creates a new pageContext object and we don't merge pageContextNominalPageInit to it: we only use some pageContextNominalPageInit information.
 pageContextNominalPageInit, httpRequestId, renderContext, pageContextErrorPageInit) {

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.199-commit-5d1b353";
+export declare const PROJECT_VERSION: "0.4.199-commit-9b29f98";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.199-commit-5d1b353';
+export const PROJECT_VERSION = '0.4.199-commit-9b29f98';

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

@@ -4,7 +4,7 @@ export { normalizeUrlPathname };
 export { removeBaseServer };
 export { modifyUrlPathname };
 export { removeUrlOrigin };
-export { addUrlOrigin };
+export { setUrlOrigin };
 export { getUrlPretty };
 declare function prependBase(url: string, baseServer: string): string;
 declare function removeBaseServer(url: string, baseServer: string): string;
@@ -15,5 +15,5 @@ declare function removeUrlOrigin(url: string): {
     urlModified: string;
     origin: string | null;
 };
-declare function addUrlOrigin(url: string, origin: string | null): string;
+declare function setUrlOrigin(url: string, origin: string | null): false | string;
 declare function getUrlPretty(url: string): string;

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

@@ -4,7 +4,7 @@ export { normalizeUrlPathname };
 export { removeBaseServer };
 export { modifyUrlPathname };
 export { removeUrlOrigin };
-export { addUrlOrigin };
+export { setUrlOrigin };
 export { getUrlPretty };
 import { assertUrlComponents, createUrlFromComponents, isBaseServer, parseUrl } from './parseUrl.js';
 import { assert } from './assert.js';
@@ -94,9 +94,10 @@ function removeUrlOrigin(url) {
     const urlModified = createUrlFromComponents(null, pathnameOriginal, searchOriginal, hashOriginal);
     return { urlModified, origin };
 }
-function addUrlOrigin(url, origin) {
+function setUrlOrigin(url, origin) {
     const { origin: originCurrent, pathnameOriginal, searchOriginal, hashOriginal } = parseUrl(url, '/');
-    assert(originCurrent === null);
+    if (origin === originCurrent)
+        return false;
     assert(origin === null || origin.startsWith('http'));
     const urlModified = createUrlFromComponents(origin, pathnameOriginal, searchOriginal, hashOriginal);
     return urlModified;

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.199-commit-5d1b353";
+    projectVersion: "0.4.199-commit-9b29f98";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.199-commit-5d1b353",
+  "version": "0.4.199-commit-9b29f98",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {