@astrojs/starlight 0.29.1 → 0.29.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @astrojs/starlight
 
+## 0.29.2
+
+### Patch Changes
+
+- [#2616](https://github.com/withastro/starlight/pull/2616) [`128cc51`](https://github.com/withastro/starlight/commit/128cc51b416a1a934eabb1989c04b76517e77a04) Thanks [@delucis](https://github.com/delucis)! - Fixes an edge case to correctly avoid a trailing slash when navigating from a root locale homepage to another language via Starlight’s language switcher when `trailingSlash: 'never'` is set
+
 ## 0.29.1
 
 ### Patch Changes

package/components/Head.astro

@@ -1,5 +1,6 @@
 ---
 import type { z } from 'astro/zod';
+import context from 'virtual:starlight/project-context';
 import config from 'virtual:starlight/user-config';
 import { version } from '../package.json';
 import type { HeadConfigSchema } from '../schemas/head';
@@ -66,7 +67,7 @@ if (canonical && config.isMultilingual) {
 			attrs: {
 				rel: 'alternate',
 				hreflang: localeOpts.lang,
-				href: localizedUrl(canonical, locale).href,
+				href: localizedUrl(canonical, locale, context.trailingSlash).href,
 			},
 		});
 	}

package/components/LanguageSelect.astro

@@ -1,4 +1,5 @@
 ---
+import context from 'virtual:starlight/project-context';
 import config from 'virtual:starlight/user-config';
 import { localizedUrl } from '../utils/localizedUrl';
 import Select from './Select.astro';
@@ -8,7 +9,7 @@ import type { Props } from '../props';
  * Get the equivalent of the current page path for the passed locale.
  */
 function localizedPathname(locale: string | undefined): string {
-	return localizedUrl(Astro.url, locale).pathname;
+	return localizedUrl(Astro.url, locale, context.trailingSlash).pathname;
 }
 ---
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/starlight",
-  "version": "0.29.1",
+  "version": "0.29.2",
   "description": "Build beautiful, high-performance documentation websites with Astro",
   "keywords": [
     "docs",

package/utils/localizedUrl.ts

@@ -1,10 +1,15 @@
 import config from 'virtual:starlight/user-config';
 import { stripTrailingSlash } from './path';
+import type { AstroConfig } from 'astro';
 
 /**
  * Get the equivalent of the passed URL for the passed locale.
  */
-export function localizedUrl(url: URL, locale: string | undefined): URL {
+export function localizedUrl(
+	url: URL,
+	locale: string | undefined,
+	trailingSlash: AstroConfig['trailingSlash']
+): URL {
 	// Create a new URL object to void mutating the global.
 	url = new URL(url);
 	if (!config.locales) {
@@ -41,5 +46,6 @@ export function localizedUrl(url: URL, locale: string | undefined): URL {
 	}
 	// Restore base
 	if (hasBase) url.pathname = base + url.pathname;
+	if (trailingSlash === 'never') url.pathname = stripTrailingSlash(url.pathname);
 	return url;
 }