From b81d4edc818d4b791942b9061aad53a9487876b9 Mon Sep 17 00:00:00 2001 From: Florian Verdonck Date: Thu, 5 Sep 2024 14:51:09 +0200 Subject: [PATCH] Fix trailing slash (#34) Co-authored-by: Florian Lefebvre --- .changeset/grumpy-sloths-shout.md | 5 +++++ package/assets/middleware.ts | 2 +- package/package.json | 5 +---- 3 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 .changeset/grumpy-sloths-shout.md diff --git a/.changeset/grumpy-sloths-shout.md b/.changeset/grumpy-sloths-shout.md new file mode 100644 index 0000000..7b8dc41 --- /dev/null +++ b/.changeset/grumpy-sloths-shout.md @@ -0,0 +1,5 @@ +--- +"@astrolicious/i18n": patch +--- + +Fixes an issue where locales would not be properly loaded depending on Astro `trailingSlash` value diff --git a/package/assets/middleware.ts b/package/assets/middleware.ts index 780ef72..fb9b9aa 100644 --- a/package/assets/middleware.ts +++ b/package/assets/middleware.ts @@ -11,7 +11,7 @@ const extractLocaleFromUrl = (pathname: string) => { } else if (options.strategy === "prefixExceptDefault") { if ( locale !== options.defaultLocale && - pathname.startsWith(`/${locale}/`) + pathname.startsWith(`/${locale}`) ) { return locale; } diff --git a/package/package.json b/package/package.json index ea42ac8..250b70d 100644 --- a/package/package.json +++ b/package/package.json @@ -38,10 +38,7 @@ "./components/I18nClient.astro": "./assets/components/I18nClient.astro", "./components/I18nHead.astro": "./assets/components/I18nHead.astro" }, - "files": [ - "dist", - "assets" - ], + "files": ["dist", "assets"], "scripts": { "dev": "tsup --watch", "build": "tsup"