vike 0.4.145-commit-2520555 → 0.4.146-commit-701e2e5

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/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-commit-2520555';
+const PROJECT_VERSION = '0.4.146-commit-701e2e5';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION,

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/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-commit-2520555";
+    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-commit-2520555';
+const PROJECT_VERSION = '0.4.146-commit-701e2e5';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION,

package/package.json

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