@jet-w/astro-blog 0.2.3 → 0.2.5

package/dist/{chunk-Z3O3JK56.js → chunk-CEZBWSMU.js}

@@ -145,11 +145,16 @@ function getTextDirection(locale, config = defaultI18nConfig) {
 function isMultiLanguageEnabled(config = defaultI18nConfig) {
   return config.locales.length > 1;
 }
-function getLocalePrefix(locale, config = defaultI18nConfig) {
-  if (locale === config.defaultLocale && !config.routing.prefixDefaultLocale) {
-    return "";
+function getLocalePrefix(locale, config = defaultI18nConfig, base) {
+  const normalizedBase = base ? base.replace(/\/$/, "") : "";
+  let localePrefix = "";
+  if (locale !== config.defaultLocale || config.routing.prefixDefaultLocale) {
+    localePrefix = `/${locale}`;
+  }
+  if (!normalizedBase || normalizedBase === "") {
+    return localePrefix;
   }
-  return `/${locale}`;
+  return `${normalizedBase}${localePrefix}`;
 }
 function getContentPathPrefix(locale, config = defaultI18nConfig) {
   const localeConfig = config.localeConfigs[locale];
@@ -166,6 +171,28 @@ function filterPostsByLocale(posts, locale, config = defaultI18nConfig) {
     return postPath.startsWith(prefix + "/") || postPath === prefix;
   });
 }
+function withBase(path, base) {
+  const baseUrl = (base || "/").replace(/\/$/, "");
+  if (!baseUrl || baseUrl === "") {
+    return path;
+  }
+  const normalizedPath = path.startsWith("/") ? path : `/${path}`;
+  if (normalizedPath === "/") {
+    return `${baseUrl}/`;
+  }
+  return `${baseUrl}${normalizedPath}`;
+}
+function removeBase(path, base) {
+  const baseUrl = (base || "/").replace(/\/$/, "");
+  if (!baseUrl || baseUrl === "") {
+    return path;
+  }
+  if (path.startsWith(baseUrl)) {
+    const rest = path.slice(baseUrl.length);
+    return rest || "/";
+  }
+  return path;
+}
 
 export {
   getLocaleFromPath,
@@ -182,5 +209,7 @@ export {
   isMultiLanguageEnabled,
   getLocalePrefix,
   getContentPathPrefix,
-  filterPostsByLocale
+  filterPostsByLocale,
+  withBase,
+  removeBase
 };

package/dist/index.js

@@ -21,7 +21,7 @@ import {
   isRTL,
   removeLocalePrefix,
   t
-} from "./chunk-Z3O3JK56.js";
+} from "./chunk-CEZBWSMU.js";
 import {
   defaultFooterConfig,
   defaultMenu,

package/dist/utils/i18n.d.ts

@@ -109,8 +109,18 @@ declare function isMultiLanguageEnabled(config?: I18nConfig): boolean;
 /**
  * Get prefix for a locale in routes
  * Returns empty string for default locale if prefixDefaultLocale is false
+ * If base is provided, it will be prepended to the locale prefix
+ *
+ * @example
+ * // Without base
+ * getLocalePrefix('en', config) // '' (for default locale)
+ * getLocalePrefix('zh-CN', config) // '/zh-CN'
+ *
+ * // With base '/my-blog'
+ * getLocalePrefix('en', config, '/my-blog') // '/my-blog'
+ * getLocalePrefix('zh-CN', config, '/my-blog') // '/my-blog/zh-CN'
  */
-declare function getLocalePrefix(locale: string, config?: I18nConfig): string;
+declare function getLocalePrefix(locale: string, config?: I18nConfig, base?: string): string;
 /**
  * Get content path prefix for a specific locale
  * Returns the contentPathPrefix from locale config, or undefined if not set
@@ -129,5 +139,27 @@ declare function getContentPathPrefix(locale: string, config?: I18nConfig): stri
 declare function filterPostsByLocale<T extends {
     id: string;
 }>(posts: T[], locale: string, config?: I18nConfig): T[];
+/**
+ * Add base URL prefix to a path
+ * This is used when the site is deployed to a subdirectory (e.g., /jet-w.astro-blog/)
+ *
+ * @example
+ * // If BASE_URL is '/jet-w.astro-blog'
+ * withBase('/posts') // '/jet-w.astro-blog/posts'
+ * withBase('/') // '/jet-w.astro-blog/'
+ *
+ * // If BASE_URL is '/'
+ * withBase('/posts') // '/posts'
+ */
+declare function withBase(path: string, base?: string): string;
+/**
+ * Remove base URL prefix from a path
+ * Useful for getting the actual path without base prefix
+ *
+ * @example
+ * // If BASE_URL is '/jet-w.astro-blog'
+ * removeBase('/jet-w.astro-blog/posts', '/jet-w.astro-blog') // '/posts'
+ */
+declare function removeBase(path: string, base?: string): string;
 
-export { type AlternateLink, I18nConfig, Locale, type MergedLocaleConfig, UITranslations, filterPostsByLocale, formatDate, formatDateShort, getAlternateLinks, getContentPathPrefix, getLocaleByCode, getLocaleConfig, getLocaleFromPath, getLocalePrefix, getLocalizedPath, getTextDirection, isMultiLanguageEnabled, isRTL, removeLocalePrefix, t };
+export { type AlternateLink, I18nConfig, Locale, type MergedLocaleConfig, UITranslations, filterPostsByLocale, formatDate, formatDateShort, getAlternateLinks, getContentPathPrefix, getLocaleByCode, getLocaleConfig, getLocaleFromPath, getLocalePrefix, getLocalizedPath, getTextDirection, isMultiLanguageEnabled, isRTL, removeBase, removeLocalePrefix, t, withBase };

package/dist/utils/i18n.js

@@ -12,9 +12,11 @@ import {
   getTextDirection,
   isMultiLanguageEnabled,
   isRTL,
+  removeBase,
   removeLocalePrefix,
-  t
-} from "../chunk-Z3O3JK56.js";
+  t,
+  withBase
+} from "../chunk-CEZBWSMU.js";
 import "../chunk-DAH2XP4W.js";
 import {
   builtInTranslations,
@@ -43,7 +45,9 @@ export {
   getUITranslations,
   isMultiLanguageEnabled,
   isRTL,
+  removeBase,
   removeLocalePrefix,
   t,
+  withBase,
   zhCNTranslations
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jet-w/astro-blog",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "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 } from '../../utils/i18n';
+import { getLocaleFromPath, getLocaleConfig, getLocalePrefix, withBase } from '../../utils/i18n';
 
 export interface Props {
   i18nConfig?: I18nConfig;
@@ -15,6 +15,10 @@ const { i18nConfig = virtualI18nConfig || defaultI18nConfig } = Astro.props;
 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;
+const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
 ---
 
 <section class="py-16 mb-16">
@@ -23,7 +27,7 @@ const ui = localeConfig.ui;
     {siteConfig.avatar && (
       <div class="mb-8">
         <img
-          src={siteConfig.avatar}
+          src={withBase(siteConfig.avatar, base)}
           alt={siteConfig.author}
           class="w-32 h-32 rounded-full mx-auto shadow-lg"
         />
@@ -101,7 +105,7 @@ const ui = localeConfig.ui;
     <!-- 行动按钮 -->
     <div class="flex flex-col sm:flex-row gap-4 justify-center">
       <a
-        href="/posts"
+        href={`${localePrefix}/posts`}
         class="btn-primary inline-flex items-center space-x-2"
       >
         <span>{ui.browsePosts}</span>
@@ -111,7 +115,7 @@ const ui = localeConfig.ui;
       </a>
 
       <a
-        href="/about"
+        href={`${localePrefix}/about`}
         class="btn-secondary inline-flex items-center space-x-2"
       >
         <span>{ui.aboutMe}</span>

package/src/components/blog/PostCard.astro

@@ -1,4 +1,6 @@
 ---
+import { withBase } from '../../utils/i18n';
+
 export interface Props {
   post: {
     slug: string;
@@ -30,6 +32,8 @@ const {
   ui = { readMore: '阅读更多', minuteRead: '分钟' }
 } = Astro.props;
 
+const base = import.meta.env.BASE_URL;
+
 const formattedDate = post.pubDate
   ? new Intl.DateTimeFormat(locale, {
       year: 'numeric',
@@ -45,10 +49,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
-const postUrl = `${localePrefix}/posts/${post.slug}`;
-const tagUrl = (tag: string) => `${localePrefix}/tags/${tagToSlug(tag)}`;
-const categoryUrl = (category: string) => `${localePrefix}/categories/${categoryToSlug(category)}`;
+// 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);
 ---
 
 <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

@@ -20,7 +20,8 @@ const { count = 3, i18nConfig = virtualI18nConfig || defaultI18nConfig } = Astro
 const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const ui = localeConfig.ui;
-const localePrefix = getLocalePrefix(currentLocale, i18nConfig);
+const base = import.meta.env.BASE_URL;
+const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
 
 const allPosts = await getCollection('posts');
 const publishedPosts = allPosts

package/src/components/home/QuickNavSection.astro

@@ -19,7 +19,8 @@ const { i18nConfig = virtualI18nConfig || defaultI18nConfig } = Astro.props;
 const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const ui = localeConfig.ui;
-const localePrefix = getLocalePrefix(currentLocale, i18nConfig);
+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

@@ -20,7 +20,8 @@ const { count = 6, i18nConfig = virtualI18nConfig || defaultI18nConfig } = Astro
 const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const ui = localeConfig.ui;
-const localePrefix = getLocalePrefix(currentLocale, i18nConfig);
+const base = import.meta.env.BASE_URL;
+const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
 
 const allPosts = await getCollection('posts');
 const publishedPosts = allPosts

package/src/components/layout/Footer.astro

@@ -25,7 +25,8 @@ function getIcon(link: { type: string; icon?: string }): string {
 }
 
 // Get locale prefix for RSS link
-const localePrefix = getLocalePrefix(currentLocale, i18nConfig);
+const base = import.meta.env.BASE_URL;
+const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
 const rssUrl = localeFooterConfig.rssUrl || footerConfig.rssUrl || `${localePrefix}/rss.xml`;
 
 const copyright = (localeFooterConfig.copyright || footerConfig.copyright)

package/src/components/layout/Header.astro

@@ -12,6 +12,7 @@ import {
   getLocaleConfig,
   removeLocalePrefix,
   isMultiLanguageEnabled,
+  withBase,
 } from '../../utils/i18n';
 
 export interface Props {
@@ -40,16 +41,19 @@ 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">
   <div class="container mx-auto px-4">
     <nav class="flex items-center justify-between h-16">
       <div class="flex items-center space-x-4">
-        <a href="/" class="flex items-center space-x-3 hover:opacity-80 transition-opacity">
+        <a href={withBase('/', base)} class="flex items-center space-x-3 hover:opacity-80 transition-opacity">
           {(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"
             />
@@ -70,9 +74,9 @@ const localesForSwitcher = i18nConfig.locales.map(l => ({
       <div class="hidden md:flex items-center space-x-8">
         {menu.map((item) => (
           <a
-            href={item.href}
+            href={withBase(item.href, base)}
             class={`text-sm font-medium transition-colors hover:text-primary-500 ${
-              currentPath === item.href || (item.href !== '/' && currentPath.startsWith(item.href))
+              currentPath === withBase(item.href, base) || (item.href !== '/' && currentPath.startsWith(withBase(item.href, base)))
                 ? 'text-primary-500'
                 : 'text-slate-700 dark:text-slate-300'
             }`}

package/src/components/layout/Sidebar.astro

@@ -23,7 +23,8 @@ const { currentPath = Astro.url.pathname, i18nConfig = defaultI18nConfig } = Ast
 const currentLocale = getLocaleFromPath(currentPath, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const ui = localeConfig.ui;
-const localePrefix = getLocalePrefix(currentLocale, i18nConfig);
+const base = import.meta.env.BASE_URL;
+const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
 
 // Get locale-specific sidebar config (already merged with defaults in getLocaleConfig)
 const sidebarConfig = localeConfig.sidebar;

package/src/layouts/BaseLayout.astro

@@ -10,6 +10,7 @@ import {
   getAlternateLinks,
   getTextDirection,
   isMultiLanguageEnabled,
+  withBase,
   t,
   type I18nConfig,
 } from '../utils/i18n';
@@ -69,6 +70,9 @@ 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>
@@ -77,7 +81,7 @@ const faviconType = faviconSvgExists ? 'image/svg+xml' : faviconIcoExists ? 'ima
     <meta charset="UTF-8" />
     <meta name="description" content={description} />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <link rel="icon" type={faviconType} href={faviconHref} />
+    <link rel="icon" type={faviconType} href={withBase(faviconHref || '', base)} />
     <meta name="generator" content={Astro.generator} />
 
     <!-- SEO -->
@@ -115,7 +119,7 @@ const faviconType = faviconSvgExists ? 'image/svg+xml' : faviconIcoExists ? 'ima
     <meta name="twitter:image" content={fullImage} />
 
     <!-- RSS -->
-    <link rel="alternate" type="application/rss+xml" title={siteTitle} href={rssPath} />
+    <link rel="alternate" type="application/rss+xml" title={siteTitle} href={withBase(rssPath, base)} />
 
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
@@ -158,10 +162,10 @@ const faviconType = faviconSvgExists ? 'image/svg+xml' : faviconIcoExists ? 'ima
     </div>
 
     <!-- Mermaid -->
-    <script src="/js/mermaid-container.js" is:inline></script>
+    <script src={withBase('/js/mermaid-container.js', base)} is:inline></script>
 
     <!-- Tabs -->
-    <script src="/js/tabs-init.js" is:inline></script>
+    <script src={withBase('/js/tabs-init.js', base)} is:inline></script>
 
     <!-- Store i18n data for client-side scripts -->
     <script is:inline define:vars={{ locale: currentLocale, uiTranslations: ui }}>

package/src/pages/archives/[year]/[month].astro

@@ -43,7 +43,8 @@ const i18nConfig = virtualI18nConfig || defaultI18nConfig;
 const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const ui = localeConfig.ui;
-const localePrefix = getLocalePrefix(currentLocale, i18nConfig);
+const base = import.meta.env.BASE_URL;
+const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
 
 // 获取该月的所有文章
 const allPostsCollection = await getCollection('posts', ({ data }) => !data.draft);

package/src/pages/archives/index.astro

@@ -10,7 +10,8 @@ const i18nConfig = virtualI18nConfig || defaultI18nConfig;
 const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const ui = localeConfig.ui;
-const localePrefix = getLocalePrefix(currentLocale, i18nConfig);
+const base = import.meta.env.BASE_URL;
+const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
 
 // 获取所有非草稿文章
 const allPostsCollection = await getCollection('posts', ({ data }) => !data.draft);

package/src/pages/categories/[category].astro

@@ -38,7 +38,8 @@ const i18nConfig = virtualI18nConfig || defaultI18nConfig;
 const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const ui = localeConfig.ui;
-const localePrefix = getLocalePrefix(currentLocale, i18nConfig);
+const base = import.meta.env.BASE_URL;
+const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
 
 // 获取所有文章并筛选包含该分类的文章
 const allPostsCollection = await getCollection('posts', ({ data }) => !data.draft);

package/src/pages/categories/index.astro

@@ -10,7 +10,8 @@ const i18nConfig = virtualI18nConfig || defaultI18nConfig;
 const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const ui = localeConfig.ui;
-const localePrefix = getLocalePrefix(currentLocale, i18nConfig);
+const base = import.meta.env.BASE_URL;
+const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
 
 // 从文章集合动态获取所有分类
 const allPostsCollection = await getCollection('posts', ({ data }) => !data.draft);

package/src/pages/posts/[...slug].astro

@@ -156,7 +156,8 @@ const i18nConfig = virtualI18nConfig || defaultI18nConfig;
 const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const ui = localeConfig.ui;
-const localePrefix = getLocalePrefix(currentLocale, i18nConfig);
+const base = import.meta.env.BASE_URL;
+const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
 
 // Get the current slug from URL
 const urlPath = Astro.url.pathname;

package/src/pages/posts/index.astro

@@ -13,7 +13,8 @@ const i18nConfig = virtualI18nConfig || defaultI18nConfig;
 const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const ui = localeConfig.ui;
-const localePrefix = getLocalePrefix(currentLocale, i18nConfig);
+const base = import.meta.env.BASE_URL;
+const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
 
 // 从新的内容目录获取文章数据
 const allPostsCollection = await getCollection('posts');

package/src/pages/posts/page/[page].astro

@@ -28,7 +28,8 @@ const i18nConfig = virtualI18nConfig || defaultI18nConfig;
 const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const ui = localeConfig.ui;
-const localePrefix = getLocalePrefix(currentLocale, i18nConfig);
+const base = import.meta.env.BASE_URL;
+const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
 
 // 从新的内容目录获取文章数据
 const allPostsCollection = await getCollection('posts');

package/src/pages/slides/index.astro

@@ -10,7 +10,8 @@ const i18nConfig = virtualI18nConfig || defaultI18nConfig;
 const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const ui = localeConfig.ui;
-const localePrefix = getLocalePrefix(currentLocale, i18nConfig);
+const base = import.meta.env.BASE_URL;
+const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
 
 // 获取所有非草稿的 slides
 const slides = (await getCollection('slides', ({ data }) => !data.draft))

package/src/pages/tags/[tag].astro

@@ -38,7 +38,8 @@ const i18nConfig = virtualI18nConfig || defaultI18nConfig;
 const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const ui = localeConfig.ui;
-const localePrefix = getLocalePrefix(currentLocale, i18nConfig);
+const base = import.meta.env.BASE_URL;
+const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
 
 // 获取所有文章并筛选包含该标签的文章
 const allPostsCollection = await getCollection('posts', ({ data }) => !data.draft);

package/src/pages/tags/index.astro

@@ -11,7 +11,8 @@ const i18nConfig = virtualI18nConfig || defaultI18nConfig;
 const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
 const localeConfig = getLocaleConfig(currentLocale, i18nConfig);
 const ui = localeConfig.ui;
-const localePrefix = getLocalePrefix(currentLocale, i18nConfig);
+const base = import.meta.env.BASE_URL;
+const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
 
 // 从文章集合动态获取所有标签
 const allPostsCollection = await getCollection('posts', ({ data }) => !data.draft);