@jet-w/astro-blog 0.2.5 → 0.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jet-w/astro-blog",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "A modern Astro blog theme with Vue and Tailwind CSS support",
   "type": "module",
   "exports": {

package/src/components/blog/Hero.astro

@@ -3,7 +3,7 @@ import { siteConfig } from '@jet-w/astro-blog/config';
 import type { I18nConfig } from '../../config/i18n';
 import { defaultI18nConfig } from '../../config/i18n';
 import { i18nConfig as virtualI18nConfig } from 'virtual:astro-blog-i18n';
-import { getLocaleFromPath, getLocaleConfig, getLocalePrefix, withBase } from '../../utils/i18n';
+import { getLocaleFromPath, getLocaleConfig, getLocalePrefix, withBase, removeBase } from '../../utils/i18n';
 
 export interface Props {
   i18nConfig?: I18nConfig;
@@ -11,13 +11,16 @@ export interface Props {
 
 const { i18nConfig = virtualI18nConfig || defaultI18nConfig } = Astro.props;
 
-// Get current locale from URL
-const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
-const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
-const ui = localeConfig.ui;
-
 // Get base URL for prefixing links
 const base = import.meta.env.BASE_URL;
+
+// Remove base URL from current path for locale detection
+const pathWithoutBase = removeBase(Astro.url.pathname, base);
+
+// Get current locale from URL (use path without base)
+const currentLocale = getLocaleFromPath(pathWithoutBase, i18nConfig);
+const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
+const ui = localeConfig.ui;
 const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
 ---
 

package/src/components/blog/PostCard.astro

@@ -1,6 +1,4 @@
 ---
-import { withBase } from '../../utils/i18n';
-
 export interface Props {
   post: {
     slug: string;
@@ -32,8 +30,6 @@ const {
   ui = { readMore: '阅读更多', minuteRead: '分钟' }
 } = Astro.props;
 
-const base = import.meta.env.BASE_URL;
-
 const formattedDate = post.pubDate
   ? new Intl.DateTimeFormat(locale, {
       year: 'numeric',
@@ -49,10 +45,10 @@ const tagToSlug = (tag: string) => tag.toLowerCase().replace(/\s+/g, '-');
 // 将分类名转换为 slug 格式
 const categoryToSlug = (category: string) => category.toLowerCase().replace(/\s+/g, '-');
 
-// Build URLs with locale prefix and base URL
-const postUrl = withBase(`${localePrefix}/posts/${post.slug}`, base);
-const tagUrl = (tag: string) => withBase(`${localePrefix}/tags/${tagToSlug(tag)}`, base);
-const categoryUrl = (category: string) => withBase(`${localePrefix}/categories/${categoryToSlug(category)}`, base);
+// Build URLs with locale prefix (localePrefix already contains base URL)
+const postUrl = `${localePrefix}/posts/${post.slug}`;
+const tagUrl = (tag: string) => `${localePrefix}/tags/${tagToSlug(tag)}`;
+const categoryUrl = (category: string) => `${localePrefix}/categories/${categoryToSlug(category)}`;
 ---
 
 <article class={`group card hover:shadow-lg transform hover:-translate-y-1 transition-all duration-300 ${isHorizontal ? 'flex gap-6 items-center' : 'block'}`}>

package/src/components/home/FeaturedPostsSection.astro

@@ -7,7 +7,7 @@ import { getCollection } from 'astro:content';
 import type { I18nConfig } from '../../config/i18n';
 import { defaultI18nConfig } from '../../config/i18n';
 import { i18nConfig as virtualI18nConfig } from 'virtual:astro-blog-i18n';
-import { getLocaleFromPath, getLocaleConfig, getLocalePrefix, filterPostsByLocale } from '../../utils/i18n';
+import { getLocaleFromPath, getLocaleConfig, getLocalePrefix, filterPostsByLocale, removeBase } from '../../utils/i18n';
 
 export interface Props {
   count?: number;
@@ -16,11 +16,16 @@ export interface Props {
 
 const { count = 3, i18nConfig = virtualI18nConfig || defaultI18nConfig } = Astro.props;
 
-// Get current locale from URL
-const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
+// Get base URL for prefixing links
+const base = import.meta.env.BASE_URL;
+
+// Remove base URL from current path for locale detection
+const pathWithoutBase = removeBase(Astro.url.pathname, base);
+
+// Get current locale from URL (use path without base)
+const currentLocale = getLocaleFromPath(pathWithoutBase, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const ui = localeConfig.ui;
-const base = import.meta.env.BASE_URL;
 const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
 
 const allPosts = await getCollection('posts');

package/src/components/home/QuickNavSection.astro

@@ -7,7 +7,7 @@ import { getCollection } from 'astro:content';
 import type { I18nConfig } from '../../config/i18n';
 import { defaultI18nConfig } from '../../config/i18n';
 import { i18nConfig as virtualI18nConfig } from 'virtual:astro-blog-i18n';
-import { getLocaleFromPath, getLocaleConfig, getLocalePrefix, filterPostsByLocale } from '../../utils/i18n';
+import { getLocaleFromPath, getLocaleConfig, getLocalePrefix, filterPostsByLocale, removeBase } from '../../utils/i18n';
 
 interface Props {
   i18nConfig?: I18nConfig;
@@ -15,11 +15,16 @@ interface Props {
 
 const { i18nConfig = virtualI18nConfig || defaultI18nConfig } = Astro.props;
 
-// Get current locale and translations
-const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
+// Get base URL for prefixing links
+const base = import.meta.env.BASE_URL;
+
+// Remove base URL from current path for locale detection
+const pathWithoutBase = removeBase(Astro.url.pathname, base);
+
+// Get current locale and translations (use path without base)
+const currentLocale = getLocaleFromPath(pathWithoutBase, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const ui = localeConfig.ui;
-const base = import.meta.env.BASE_URL;
 const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
 
 const allPosts = await getCollection('posts', ({ data }) => !data.draft);

package/src/components/home/RecentPostsSection.astro

@@ -7,7 +7,7 @@ import { getCollection } from 'astro:content';
 import type { I18nConfig } from '../../config/i18n';
 import { defaultI18nConfig } from '../../config/i18n';
 import { i18nConfig as virtualI18nConfig } from 'virtual:astro-blog-i18n';
-import { getLocaleFromPath, getLocaleConfig, getLocalePrefix, filterPostsByLocale } from '../../utils/i18n';
+import { getLocaleFromPath, getLocaleConfig, getLocalePrefix, filterPostsByLocale, removeBase } from '../../utils/i18n';
 
 export interface Props {
   count?: number;
@@ -16,11 +16,16 @@ export interface Props {
 
 const { count = 6, i18nConfig = virtualI18nConfig || defaultI18nConfig } = Astro.props;
 
-// Get current locale from URL
-const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
+// Get base URL for prefixing links
+const base = import.meta.env.BASE_URL;
+
+// Remove base URL from current path for locale detection
+const pathWithoutBase = removeBase(Astro.url.pathname, base);
+
+// Get current locale from URL (use path without base)
+const currentLocale = getLocaleFromPath(pathWithoutBase, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const ui = localeConfig.ui;
-const base = import.meta.env.BASE_URL;
 const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
 
 const allPosts = await getCollection('posts');

package/src/components/home/StatsSection.astro

@@ -6,7 +6,7 @@ import { getCollection } from 'astro:content';
 import type { I18nConfig } from '../../config/i18n';
 import { defaultI18nConfig } from '../../config/i18n';
 import { i18nConfig as virtualI18nConfig } from 'virtual:astro-blog-i18n';
-import { getLocaleFromPath, getLocaleConfig, filterPostsByLocale } from '../../utils/i18n';
+import { getLocaleFromPath, getLocaleConfig, filterPostsByLocale, removeBase } from '../../utils/i18n';
 
 export interface Props {
   i18nConfig?: I18nConfig;
@@ -14,8 +14,14 @@ export interface Props {
 
 const { i18nConfig = virtualI18nConfig || defaultI18nConfig } = Astro.props;
 
-// Get current locale from URL
-const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
+// Get base URL for prefixing links
+const base = import.meta.env.BASE_URL;
+
+// Remove base URL from current path for locale detection
+const pathWithoutBase = removeBase(Astro.url.pathname, base);
+
+// Get current locale from URL (use path without base)
+const currentLocale = getLocaleFromPath(pathWithoutBase, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const ui = localeConfig.ui;
 

package/src/components/layout/Footer.astro

@@ -2,7 +2,7 @@
 import { siteConfig, footerConfig, defaultIcons } from '@jet-w/astro-blog/config';
 import type { I18nConfig } from '../../config/i18n';
 import { defaultI18nConfig } from '../../config/i18n';
-import { getLocaleFromPath, getLocaleConfig, getLocalePrefix } from '../../utils/i18n';
+import { getLocaleFromPath, getLocaleConfig, getLocalePrefix, removeBase, withBase } from '../../utils/i18n';
 
 export interface Props {
   i18nConfig?: I18nConfig;
@@ -10,7 +10,13 @@ export interface Props {
 
 const { i18nConfig = defaultI18nConfig } = Astro.props;
 
-const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
+// Get base URL for prefixing links
+const base = import.meta.env.BASE_URL;
+
+// Remove base URL from current path for locale detection
+const pathWithoutBase = removeBase(Astro.url.pathname, base);
+
+const currentLocale = getLocaleFromPath(pathWithoutBase, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const ui = localeConfig.ui;
 
@@ -24,10 +30,13 @@ function getIcon(link: { type: string; icon?: string }): string {
   return link.icon || defaultIcons[link.type] || '';
 }
 
-// Get locale prefix for RSS link
-const base = import.meta.env.BASE_URL;
+// Get locale prefix for RSS link (already includes base)
 const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
-const rssUrl = localeFooterConfig.rssUrl || footerConfig.rssUrl || `${localePrefix}/rss.xml`;
+// Apply withBase to rssUrl if it's a relative path
+const configRssUrl = localeFooterConfig.rssUrl || footerConfig.rssUrl;
+const rssUrl = configRssUrl
+  ? (configRssUrl.startsWith('/') && !configRssUrl.startsWith(base) ? withBase(configRssUrl, base) : configRssUrl)
+  : `${localePrefix}/rss.xml`;
 
 const copyright = (localeFooterConfig.copyright || footerConfig.copyright)
   .replace('{year}', String(currentYear))
@@ -41,7 +50,7 @@ const copyright = (localeFooterConfig.copyright || footerConfig.copyright)
         <div class="flex items-center space-x-3 mb-3">
           {(localeSiteConfig.avatar || siteConfig.avatar) && (
             <img
-              src={localeSiteConfig.avatar || siteConfig.avatar}
+              src={withBase(localeSiteConfig.avatar || siteConfig.avatar || '', base)}
               alt={localeSiteConfig.title || siteConfig.title}
               class="w-8 h-8 rounded-full"
             />
@@ -64,7 +73,7 @@ const copyright = (localeFooterConfig.copyright || footerConfig.copyright)
         <div class="flex flex-wrap gap-x-4 gap-y-1">
           {(localeFooterConfig.quickLinks || footerConfig.quickLinks).map((item) => (
             <a
-              href={item.href}
+              href={withBase(item.href, base)}
               class="text-sm text-slate-600 dark:text-slate-400 hover:text-primary-500 transition-colors"
             >
               {item.name}

package/src/components/layout/Header.astro

@@ -11,6 +11,7 @@ import {
   getLocaleFromPath,
   getLocaleConfig,
   removeLocalePrefix,
+  removeBase,
   isMultiLanguageEnabled,
   withBase,
 } from '../../utils/i18n';
@@ -22,7 +23,15 @@ export interface Props {
 const { i18nConfig = virtualI18nConfig || defaultI18nConfig } = Astro.props;
 
 const currentPath = Astro.url.pathname;
-const currentLocale = getLocaleFromPath(currentPath, i18nConfig);
+
+// Get base URL for prefixing links
+const base = import.meta.env.BASE_URL;
+
+// Get base path without base URL - needed for locale detection
+const pathWithoutBase = removeBase(currentPath, base);
+
+// Detect current locale from path (without base URL)
+const currentLocale = getLocaleFromPath(pathWithoutBase, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const ui = localeConfig.ui;
 
@@ -30,8 +39,8 @@ const ui = localeConfig.ui;
 const localeSiteConfig = localeConfig.site;
 const menu = localeConfig.menu;
 
-// Get base path without locale prefix for language switcher
-const basePath = removeLocalePrefix(currentPath, i18nConfig);
+// Get path without locale prefix for language switcher
+const pathWithoutLocale = removeLocalePrefix(pathWithoutBase, i18nConfig);
 
 // Check if multi-language is enabled
 const showLanguageSwitcher = isMultiLanguageEnabled(i18nConfig);
@@ -41,9 +50,6 @@ const localesForSwitcher = i18nConfig.locales.map(l => ({
   code: l.code,
   name: l.name,
 }));
-
-// Get base URL for prefixing links
-const base = import.meta.env.BASE_URL;
 ---
 
 <header class="sticky top-0 z-50 bg-white/80 dark:bg-slate-900/80 backdrop-blur-sm border-b border-slate-200 dark:border-slate-700">
@@ -102,9 +108,10 @@ const base = import.meta.env.BASE_URL;
               client:load
               locales={localesForSwitcher}
               currentLocale={currentLocale}
-              currentPath={basePath}
+              currentPath={pathWithoutLocale}
               defaultLocale={i18nConfig.defaultLocale}
               prefixDefaultLocale={i18nConfig.routing.prefixDefaultLocale}
+              base={base}
             />
           </div>
         )}
@@ -117,11 +124,7 @@ const base = import.meta.env.BASE_URL;
           <MobileMenu
             client:load
             navigation={menu}
-            locales={showLanguageSwitcher ? localesForSwitcher : []}
-            currentLocale={currentLocale}
-            currentPath={basePath}
-            defaultLocale={i18nConfig.defaultLocale}
-            prefixDefaultLocale={i18nConfig.routing.prefixDefaultLocale}
+            base={base}
           />
         </div>
       </div>

package/src/components/layout/Sidebar.astro

@@ -10,7 +10,7 @@ import {
 } from '@jet-w/astro-blog/utils/sidebar';
 import type { I18nConfig } from '../../config/i18n';
 import { defaultI18nConfig } from '../../config/i18n';
-import { getLocaleFromPath, getLocaleConfig, getLocalePrefix, formatDate, filterPostsByLocale } from '../../utils/i18n';
+import { getLocaleFromPath, getLocaleConfig, getLocalePrefix, formatDate, filterPostsByLocale, removeBase } from '../../utils/i18n';
 
 interface Props {
   currentPath?: string;
@@ -19,11 +19,16 @@ interface Props {
 
 const { currentPath = Astro.url.pathname, i18nConfig = defaultI18nConfig } = Astro.props;
 
-// Get current locale and translations
-const currentLocale = getLocaleFromPath(currentPath, i18nConfig);
+// Get base URL for prefixing links
+const base = import.meta.env.BASE_URL;
+
+// Remove base URL from current path for locale detection and path filtering
+const pathWithoutBase = removeBase(currentPath, base);
+
+// Get current locale and translations (use path without base)
+const currentLocale = getLocaleFromPath(pathWithoutBase, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const ui = localeConfig.ui;
-const base = import.meta.env.BASE_URL;
 const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
 
 // Get locale-specific sidebar config (already merged with defaults in getLocaleConfig)
@@ -35,8 +40,8 @@ const allPosts = await getCollection('posts', ({ data }) => !data.draft);
 // Filter posts by current locale for sidebar widgets
 const localePosts = filterPostsByLocale(allPosts, currentLocale, i18nConfig);
 
-// 根据当前路径过滤侧边栏组
-const filteredGroups = filterGroupsByPath(sidebarConfig.groups, currentPath);
+// 根据当前路径过滤侧边栏组 (use path without base for pattern matching)
+const filteredGroups = filterGroupsByPath(sidebarConfig.groups, pathWithoutBase);
 
 // 创建过滤后的配置
 const filteredConfig = { ...sidebarConfig, groups: filteredGroups };

package/src/components/media/Slides.astro

@@ -78,6 +78,9 @@ const revealConfig = JSON.stringify({
   touch: true,
 });
 
+// Get base URL for static assets
+const base = import.meta.env.BASE_URL;
+
 // 获取 slot 内容
 const slotContent = await Astro.slots.render('default');
 const hasInlineContent = slotContent && slotContent.trim().length > 0;
@@ -164,13 +167,26 @@ const slidesData = hasInlineContent ? parseSlides(slotContent) : [];
   </div>
 
   <!-- Reveal.js 资源 -->
-  <link rel="stylesheet" href="/slides/reveal.css" />
-  <link rel="stylesheet" href={`/slides/theme/${theme}.css`} />
-  <link rel="stylesheet" href="/slides/plugin/highlight/monokai.css" />
+  <link rel="stylesheet" href={`${base}slides/reveal.css`} />
+  <link rel="stylesheet" href={`${base}slides/theme/${theme}.css`} />
+  <link rel="stylesheet" href={`${base}slides/plugin/highlight/monokai.css`} />
 
-  <script is:inline src="/slides/reveal.js"></script>
-  <script is:inline src="/slides/plugin/markdown/markdown.js"></script>
-  <script is:inline src="/slides/plugin/highlight/highlight.js"></script>
+  <!-- Reveal.js - dynamically loaded with base URL -->
+  <script is:inline define:vars={{ baseUrl: base }}>
+    (function() {
+      var scripts = [
+        baseUrl + 'slides/reveal.js',
+        baseUrl + 'slides/plugin/markdown/markdown.js',
+        baseUrl + 'slides/plugin/highlight/highlight.js'
+      ];
+      scripts.forEach(function(src) {
+        var script = document.createElement('script');
+        script.src = src;
+        script.async = false;
+        document.head.appendChild(script);
+      });
+    })();
+  </script>
 
   <script is:inline define:vars={{ slidesId, revealConfig }}>
     (function() {

package/src/components/ui/LanguageSwitcher.vue

@@ -101,16 +101,19 @@ interface Props {
   locales: LocaleInfo[];
   /** Current locale code */
   currentLocale: string;
-  /** Current page path (without locale prefix) */
+  /** Current page path (without locale prefix and without base) */
   currentPath: string;
   /** Default locale code */
   defaultLocale: string;
   /** Whether to prefix the default locale in URLs */
   prefixDefaultLocale?: boolean;
+  /** Base URL for the site (e.g., '/jet-w.astro-blog') */
+  base?: string;
 }
 
 const props = withDefaults(defineProps<Props>(), {
   prefixDefaultLocale: false,
+  base: '/',
 });
 
 const isOpen = ref(false);
@@ -138,23 +141,32 @@ function closeDropdown() {
 }
 
 function getLocalizedUrl(targetLocale: string): string {
-  // Normalize the path
-  let basePath = props.currentPath;
-  if (!basePath.startsWith('/')) {
-    basePath = '/' + basePath;
+  // Normalize the current path (without base and without locale)
+  let pagePath = props.currentPath;
+  if (!pagePath.startsWith('/')) {
+    pagePath = '/' + pagePath;
   }
 
-  // If target is default locale and prefix is not required
-  if (targetLocale === props.defaultLocale && !props.prefixDefaultLocale) {
-    return basePath === '/' ? '/' : basePath;
+  // Normalize base URL - remove trailing slash
+  const baseUrl = props.base?.replace(/\/$/, '') || '';
+
+  // Build locale prefix
+  let localePrefix = '';
+  if (targetLocale !== props.defaultLocale || props.prefixDefaultLocale) {
+    localePrefix = `/${targetLocale}`;
   }
 
-  // Add locale prefix
-  if (basePath === '/') {
-    return `/${targetLocale}`;
+  // Combine: base + locale + path
+  if (pagePath === '/') {
+    // Home page
+    if (localePrefix) {
+      return baseUrl ? `${baseUrl}${localePrefix}/` : `${localePrefix}/`;
+    }
+    return baseUrl ? `${baseUrl}/` : '/';
   }
 
-  return `/${targetLocale}${basePath}`;
+  // Other pages
+  return `${baseUrl}${localePrefix}${pagePath}`;
 }
 
 // Close dropdown when clicking outside

package/src/components/ui/MobileMenu.vue

@@ -71,7 +71,7 @@
             <a
               v-for="item in navigation"
               :key="item.href"
-              :href="item.href"
+              :href="withBase(item.href)"
               @click="isOpen = false"
               class="flex items-center px-4 py-3 rounded-lg text-slate-700 dark:text-slate-300 hover:bg-slate-100 dark:hover:bg-slate-800 transition-colors"
               :class="{ 'bg-primary-50 dark:bg-primary-900/20 text-primary-600 dark:text-primary-400': isActive(item.href) }"
@@ -98,16 +98,33 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted, onUnmounted } from 'vue'
+import { ref, onMounted, onUnmounted, withDefaults } from 'vue'
 import type { NavigationItem } from '@jet-w/astro-blog/types'
 import SearchBox from './SearchBox.vue'
 import ThemeToggle from './ThemeToggle.vue'
 
 interface Props {
   navigation: NavigationItem[]
+  /** Base URL for the site (e.g., '/jet-w.astro-blog') */
+  base?: string
 }
 
-const props = defineProps<Props>()
+const props = withDefaults(defineProps<Props>(), {
+  base: '/',
+})
+
+// Helper function to add base URL to paths
+function withBase(path: string): string {
+  const baseUrl = props.base?.replace(/\/$/, '') || '';
+  if (!baseUrl || baseUrl === '') {
+    return path;
+  }
+  const normalizedPath = path.startsWith('/') ? path : `/${path}`;
+  if (normalizedPath === '/') {
+    return `${baseUrl}/`;
+  }
+  return `${baseUrl}${normalizedPath}`;
+}
 const isOpen = ref(false)
 const currentPath = ref('')
 const isMounted = ref(false)

package/src/layouts/BaseLayout.astro

@@ -11,6 +11,7 @@ import {
   getTextDirection,
   isMultiLanguageEnabled,
   withBase,
+  removeBase,
   t,
   type I18nConfig,
 } from '../utils/i18n';
@@ -40,8 +41,14 @@ const {
   i18nConfig = virtualI18nConfig || defaultI18nConfig,
 } = Astro.props;
 
-// Get current locale from URL
-const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
+// Get base URL for prefixing links
+const base = import.meta.env.BASE_URL;
+
+// Remove base URL from current path for locale detection
+const pathWithoutBase = removeBase(Astro.url.pathname, base);
+
+// Get current locale from URL (use path without base)
+const currentLocale = getLocaleFromPath(pathWithoutBase, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const localeData = localeConfig.locale;
 const ui = localeConfig.ui;
@@ -55,9 +62,12 @@ const fullTitle = title === siteTitle ? title : `${title} | ${siteTitle}`;
 const fullImage = new URL(image, Astro.site);
 
 // Get alternate links for SEO (hreflang)
-const baseUrl = Astro.site?.toString() || '';
+// We need to pass the pathname without base URL to getAlternateLinks
+// Then the baseUrl for combining should include the base path
+const siteUrl = Astro.site?.toString().replace(/\/$/, '') || '';
+const baseUrlWithPath = base && base !== '/' ? `${siteUrl}${base.replace(/\/$/, '')}` : siteUrl;
 const alternateLinks = isMultiLanguageEnabled(i18nConfig)
-  ? getAlternateLinks(Astro.url.pathname, baseUrl, i18nConfig)
+  ? getAlternateLinks(pathWithoutBase, baseUrlWithPath, i18nConfig)
   : [];
 
 // Get locale prefix for RSS link
@@ -70,9 +80,6 @@ const faviconSvgExists = fs.existsSync(path.join(publicDir, 'favicon.svg'));
 const faviconIcoExists = fs.existsSync(path.join(publicDir, 'favicon.ico'));
 const faviconHref = faviconSvgExists ? '/favicon.svg' : faviconIcoExists ? '/favicon.ico' : siteConfig.avatar;
 const faviconType = faviconSvgExists ? 'image/svg+xml' : faviconIcoExists ? 'image/x-icon' : 'image/jpeg';
-
-// Get base URL for prefixing links
-const base = import.meta.env.BASE_URL;
 ---
 
 <!DOCTYPE html>

package/src/layouts/PageLayout.astro

@@ -6,7 +6,7 @@ import Sidebar from '../components/layout/Sidebar.astro';
 import SidebarToggle from '../components/ui/SidebarToggle.vue';
 import type { I18nConfig } from '../config/i18n';
 import { defaultI18nConfig } from '../config/i18n';
-import { getLocaleFromPath, getLocaleConfig } from '../utils/i18n';
+import { getLocaleFromPath, getLocaleConfig, removeBase } from '../utils/i18n';
 // Import i18n config from virtual module (injected by integration)
 import { i18nConfig as virtualI18nConfig } from 'virtual:astro-blog-i18n';
 
@@ -36,8 +36,14 @@ const {
   i18nConfig = virtualI18nConfig || defaultI18nConfig,
 } = Astro.props;
 
-// Get current locale
-const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
+// Get base URL for prefixing links
+const base = import.meta.env.BASE_URL;
+
+// Remove base URL from current path for locale detection
+const pathWithoutBase = removeBase(Astro.url.pathname, base);
+
+// Get current locale (use path without base)
+const currentLocale = getLocaleFromPath(pathWithoutBase, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const ui = localeConfig.ui;
 ---