@jet-w/astro-blog 0.2.5 → 0.2.6

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

@@ -3,6 +3,9 @@ import { getCollection } from 'astro:content';
 import PageLayout from '@jet-w/astro-blog/layouts/PageLayout.astro';
 import PostCard from '@jet-w/astro-blog/components/blog/PostCard.astro';
 import Pagination from '@jet-w/astro-blog/components/ui/Pagination.astro';
+import { i18nConfig as virtualI18nConfig } from 'virtual:astro-blog-i18n';
+import { defaultI18nConfig } from '../../../../config/i18n';
+import { getLocaleFromPath, getLocaleConfig, getLocalePrefix, filterPostsByLocale, removeBase } from '../../../../utils/i18n';
 
 export async function getStaticPaths() {
   const postsPerPage = 10;
@@ -53,8 +56,23 @@ export async function getStaticPaths() {
 const { tagSlug, tagName, page: currentPage, totalPages } = Astro.props;
 const postsPerPage = 10;
 
+// Get i18n config
+const i18nConfig = virtualI18nConfig || defaultI18nConfig;
+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;
+const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
+
 // 获取所有文章并筛选包含该标签的文章
-const allPosts = await getCollection('posts', ({ data }) => !data.draft);
+const allPostsCollection = await getCollection('posts', ({ data }) => !data.draft);
+
+// Filter posts by current locale
+const allPosts = filterPostsByLocale(allPostsCollection, currentLocale, i18nConfig);
 
 // 筛选包含该标签的文章
 const filteredPosts = allPosts
@@ -95,25 +113,26 @@ const relatedTags = Array.from(relatedTagMap.entries())
 ---
 
 <PageLayout
-  title={`标签: ${tagName} - 第 ${currentPage} 页`}
-  description={`浏览所有关于 ${tagName} 的文章 - 第 ${currentPage} 页`}
+  title={`${ui.taggedWith}: ${tagName} - ${ui.page} ${currentPage}`}
+  description={`${ui.taggedWith} ${tagName} - ${ui.page} ${currentPage}`}
   showSidebar={true}
+  i18nConfig={i18nConfig}
 >
   <!-- 面包屑导航 -->
   <nav class="flex items-center space-x-2 text-sm text-slate-600 dark:text-slate-400 mb-8">
-    <a href="/" class="hover:text-primary-500 transition-colors">首页</a>
+    <a href={`${localePrefix}/`} class="hover:text-primary-500 transition-colors">{ui.home}</a>
     <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
       <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" />
     </svg>
-    <a href="/tags" class="hover:text-primary-500 transition-colors">标签</a>
+    <a href={`${localePrefix}/tags`} class="hover:text-primary-500 transition-colors">{ui.allTags}</a>
     <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
       <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" />
     </svg>
-    <a href={`/tags/${tagSlug}`} class="hover:text-primary-500 transition-colors">{tagName}</a>
+    <a href={`${localePrefix}/tags/${tagSlug}`} class="hover:text-primary-500 transition-colors">{tagName}</a>
     <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
       <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" />
     </svg>
-    <span class="text-slate-900 dark:text-slate-100">第 {currentPage} 页</span>
+    <span class="text-slate-900 dark:text-slate-100">{ui.page} {currentPage}</span>
   </nav>
 
   <!-- 页面头部 -->
@@ -129,16 +148,16 @@ const relatedTags = Array.from(relatedTagMap.entries())
     </h1>
 
     <p class="text-xl text-slate-600 dark:text-slate-400 mb-8">
-      找到 {totalPosts} 篇关于 {tagName} 的文章
+      {totalPosts} {ui.posts}
     </p>
 
     <!-- 标签统计 -->
     <div class="inline-flex items-center space-x-6 text-sm text-slate-500 dark:text-slate-400 bg-slate-50 dark:bg-slate-800 px-6 py-3 rounded-lg">
       <span>#{tagName}</span>
       <span>•</span>
-      <span>{totalPosts} 篇文章</span>
+      <span>{totalPosts} {ui.posts}</span>
       <span>•</span>
-      <span>第 {currentPage} / {totalPages} 页</span>
+      <span>{ui.page} {currentPage} / {totalPages}</span>
     </div>
   </div>
 
@@ -158,6 +177,9 @@ const relatedTags = Array.from(relatedTagMap.entries())
             image: post.data.image
           }}
           layout="horizontal"
+          localePrefix={localePrefix}
+          locale={localeConfig.locale.dateLocale}
+          ui={ui}
         />
       ))}
     </div>
@@ -165,13 +187,13 @@ const relatedTags = Array.from(relatedTagMap.entries())
     <div class="text-center py-16">
       <div class="text-6xl mb-4">📝</div>
       <h3 class="text-xl font-semibold text-slate-900 dark:text-slate-100 mb-2">
-        暂无相关文章
+        {ui.noPostsFound}
       </h3>
       <p class="text-slate-600 dark:text-slate-400 mb-6">
-        目前还没有关于 {tagName} 的文章，请查看其他标签。
+        {ui.noPostsFound}
       </p>
-      <a href="/tags" class="btn-secondary">
-        浏览所有标签
+      <a href={`${localePrefix}/tags`} class="btn-secondary">
+        {ui.allTags}
       </a>
     </div>
   )}
@@ -181,7 +203,7 @@ const relatedTags = Array.from(relatedTagMap.entries())
     <Pagination
       currentPage={currentPage}
       totalPages={totalPages}
-      baseUrl={`/tags/${tagSlug}`}
+      baseUrl={`${localePrefix}/tags/${tagSlug}`}
     />
   )}
 
@@ -189,12 +211,12 @@ const relatedTags = Array.from(relatedTagMap.entries())
   {relatedTags.length > 0 && (
     <section class="mt-16 pt-8 border-t border-slate-200 dark:border-slate-700">
       <h2 class="text-2xl font-bold text-slate-900 dark:text-slate-100 mb-6">
-        相关标签
+        {ui.popularTags}
       </h2>
       <div class="flex flex-wrap gap-3">
         {relatedTags.map((relatedTag) => (
           <a
-            href={`/tags/${relatedTag.slug}`}
+            href={`${localePrefix}/tags/${relatedTag.slug}`}
             class="inline-flex items-center px-4 py-2 bg-white dark:bg-slate-800 border border-slate-300 dark:border-slate-600 rounded-lg hover:border-primary-300 dark:hover:border-primary-600 hover:shadow-md transition-all duration-200 group"
           >
             <span class="font-medium text-slate-900 dark:text-slate-100 group-hover:text-primary-500 transition-colors">

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

@@ -35,10 +35,15 @@ const { tagSlug, tagName, tagCount } = Astro.props;
 
 // Get i18n config
 const i18nConfig = virtualI18nConfig || defaultI18nConfig;
-const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
+const base = import.meta.env.BASE_URL;
+
+// Remove base URL from current path for locale detection
+const { removeBase } = await import('../../utils/i18n');
+const pathWithoutBase = removeBase(Astro.url.pathname, 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);
 
 // 获取所有文章并筛选包含该标签的文章

package/src/pages/tags/index.astro

@@ -4,14 +4,18 @@ import PageLayout from '@jet-w/astro-blog/layouts/PageLayout.astro';
 import TagCloud from '@jet-w/astro-blog/components/blog/TagCloud.astro';
 import { i18nConfig as virtualI18nConfig } from 'virtual:astro-blog-i18n';
 import { defaultI18nConfig } from '../../config/i18n';
-import { getLocaleFromPath, getLocaleConfig, getLocalePrefix, filterPostsByLocale } from '../../utils/i18n';
+import { getLocaleFromPath, getLocaleConfig, getLocalePrefix, filterPostsByLocale, removeBase } from '../../utils/i18n';
 
 // Get i18n config
 const i18nConfig = virtualI18nConfig || defaultI18nConfig;
-const currentLocale = getLocaleFromPath(Astro.url.pathname, i18nConfig);
+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;
-const base = import.meta.env.BASE_URL;
 const localePrefix = getLocalePrefix(currentLocale, i18nConfig, base);
 
 // 从文章集合动态获取所有标签

package/src/plugins/rehype-relative-links.mjs

@@ -1,10 +1,63 @@
 /**
- * Rehype 插件：修复 Markdown 中的相对链接
- * 将相对链接转换为正确的绝对路径
+ * Rehype 插件：修复 Markdown 中的相对链接和图片链接
+ * 将相对链接转换为正确的绝对路径，支持 base URL
+ * 同时处理绝对路径链接，添加 base URL 前缀
  */
 import { visit } from 'unist-util-visit';
 
+/**
+ * Helper function to check if a path is a relative link
+ * @param {string} path - The path to check
+ * @returns {boolean} - True if the path is relative
+ */
+function isRelativePath(path) {
+  return (
+    path.startsWith('./') ||
+    path.startsWith('../') ||
+    (!path.startsWith('/') &&
+     !path.startsWith('#') &&
+     !path.startsWith('http://') &&
+     !path.startsWith('https://') &&
+     !path.startsWith('mailto:') &&
+     !path.startsWith('data:'))
+  );
+}
+
+/**
+ * Helper function to check if a path is an internal absolute path
+ * (starts with / but not an external URL or special protocol)
+ * @param {string} path - The path to check
+ * @returns {boolean} - True if the path is an internal absolute path
+ */
+function isInternalAbsolutePath(path) {
+  return (
+    path.startsWith('/') &&
+    !path.startsWith('//') // Exclude protocol-relative URLs like //example.com
+  );
+}
+
+/**
+ * Helper function to normalize the base URL
+ * @param {string} base - The base URL
+ * @returns {string} - Normalized base URL (with leading slash, without trailing slash)
+ */
+function normalizeBase(base) {
+  if (!base || base === '/') return '';
+  // Ensure leading slash, remove trailing slash
+  let normalized = base.startsWith('/') ? base : `/${base}`;
+  normalized = normalized.endsWith('/') ? normalized.slice(0, -1) : normalized;
+  return normalized;
+}
+
+/**
+ * Rehype plugin to fix relative links in Markdown
+ * @param {Object} options - Plugin options
+ * @param {string} options.base - The base URL path (e.g., '/blog')
+ * @returns {Function} - The plugin function
+ */
 export function rehypeRelativeLinks(options = {}) {
+  const base = normalizeBase(options.base || process.env.BASE_PATH || '');
+
   return (tree, file) => {
     // 获取当前文件的路径信息
     const filePath = file.history[0] || '';
@@ -12,28 +65,51 @@ export function rehypeRelativeLinks(options = {}) {
     // 从文件路径中提取目录信息
     // 例如：/path/to/content/posts/blog_docs/README.md -> blog_docs
     const match = filePath.match(/content\/posts\/(.+?)\/[^/]+\.(md|mdx)$/i);
-    if (!match) return;
 
-    const dirPath = match[1]; // 例如：blog_docs 或 tech/subfolder
+    // dirPath 用于相对链接的解析
+    const dirPath = match ? match[1] : ''; // 例如：blog_docs 或 tech/subfolder
 
     visit(tree, 'element', (node) => {
+      // Handle anchor links
       if (node.tagName === 'a' && node.properties?.href) {
         const href = node.properties.href;
 
-        // 只处理相对链接（以 ./ 或不以 / # http 开头的链接）
-        if (href.startsWith('./') ||
-            (!href.startsWith('/') &&
-             !href.startsWith('#') &&
-             !href.startsWith('http://') &&
-             !href.startsWith('https://') &&
-             !href.startsWith('mailto:'))) {
-
+        if (isRelativePath(href) && dirPath) {
           // 移除 ./ 前缀
           const cleanHref = href.replace(/^\.\//, '');
 
-          // 构建新的绝对路径
-          const newHref = `/posts/${dirPath}/${cleanHref}`;
+          // 构建新的绝对路径（包含 base URL）
+          const newHref = `${base}/posts/${dirPath}/${cleanHref}`;
           node.properties.href = newHref;
+        } else if (isInternalAbsolutePath(href) && base) {
+          // 处理内部绝对路径：添加 base URL 前缀
+          // 例如：/posts/xxx -> /blog/posts/xxx
+          // 避免重复添加 base（如果已经包含）
+          if (!href.startsWith(base + '/') && href !== base) {
+            node.properties.href = base + href;
+          }
+        }
+      }
+
+      // Handle image links
+      if (node.tagName === 'img' && node.properties?.src) {
+        const src = node.properties.src;
+
+        if (isRelativePath(src) && dirPath) {
+          // 移除 ./ 前缀
+          const cleanSrc = src.replace(/^\.\//, '');
+
+          // 构建新的绝对路径（包含 base URL）
+          // 图片通常相对于当前文档，保持目录结构
+          const newSrc = `${base}/posts/${dirPath}/${cleanSrc}`;
+          node.properties.src = newSrc;
+        } else if (isInternalAbsolutePath(src) && base) {
+          // 处理内部绝对路径图片：添加 base URL 前缀
+          // 例如：/images/xxx.png -> /blog/images/xxx.png
+          // 避免重复添加 base（如果已经包含）
+          if (!src.startsWith(base + '/') && src !== base) {
+            node.properties.src = base + src;
+          }
         }
       }
     });

package/templates/default/.claude/ralph-loop.local.md

@@ -3,37 +3,7 @@ active: true
 iteration: 1
 max_iterations: 20
 completion_promise: "DONE"
-started_at: "2026-01-29T09:04:01Z"
+started_at: "2026-01-29T23:41:34Z"
 ---
 
-There is an error happened after running npm run build for default template in github action
-8:27:27 AM [vite] (ssr) Error when evaluating SSR module /home/runner/work/jet-w.astro-blog/jet-w.astro-blog/templates/default/astro.config.mjs: Failed to resolve entry for package @jet-w/astro-blog. The package may have incorrect main/module/exports specified in its package.json.
-  Plugin: vite:import-analysis
-  File: /home/runner/work/jet-w.astro-blog/jet-w.astro-blog/templates/default/astro.config.mjs:11:46
-  9  |  
-  10 |  // Import plugins and integration from @jet-w/astro-blog
-  11 |  import { astroBlog, defineI18nConfig } from '@jet-w/astro-blog';
-     |                                               ^
-  12 |  import { remarkProtectCode, rehypeRestoreCode } from '@jet-w/astro-blog/plugins/remark-protect-code.mjs';
-  13 |  import { remarkContainers } from '@jet-w/astro-blog/plugins/remark-containers.mjs';
-      at packageEntryFailure (file:///home/runner/work/jet-w.astro-blog/jet-w.astro-blog/templates/default/node_modules/vite/dist/node/chunks/dep-D4NMHUTW.js:16198:15)
-      at resolvePackageEntry (file:///home/runner/work/jet-w.astro-blog/jet-w.astro-blog/templates/default/node_modules/vite/dist/node/chunks/dep-D4NMHUTW.js:16195:3)
-      at tryNodeResolve (file:///home/runner/work/jet-w.astro-blog/jet-w.astro-blog/templates/default/node_modules/vite/dist/node/chunks/dep-D4NMHUTW.js:16060:18)
-      at ResolveIdContext.resolveId (file:///home/runner/work/jet-w.astro-blog/jet-w.astro-blog/templates/default/node_modules/vite/dist/node/chunks/dep-D4NMHUTW.js:15831:19)
-      at EnvironmentPluginContainer.resolveId (file:///home/runner/work/jet-w.astro-blog/jet-w.astro-blog/templates/default/node_modules/vite/dist/node/chunks/dep-D4NMHUTW.js:42242:17)
-      at async TransformPluginContext.resolve (file:///home/runner/work/jet-w.astro-blog/jet-w.astro-blog/templates/default/node_modules/vite/dist/node/chunks/dep-D4NMHUTW.js:42449:15)
-      at async normalizeUrl (file:///home/runner/work/jet-w.astro-blog/jet-w.astro-blog/templates/default/node_modules/vite/dist/node/chunks/dep-D4NMHUTW.js:40492:26)
-      at async file:///home/runner/work/jet-w.astro-blog/jet-w.astro-blog/templates/default/node_modules/vite/dist/node/chunks/dep-D4NMHUTW.js:40623:37
-      at async Promise.all (index 8)
-      at async TransformPluginContext.transform (file:///home/runner/work/jet-w.astro-blog/jet-w.astro-blog/templates/default/node_modules/vite/dist/node/chunks/dep-D4NMHUTW.js:40550:7)
-[astro] Unable to load your Astro config
-Failed to resolve entry for package @jet-w/astro-blog. The package may have incorrect main/module/exports specified in its package.json.
-  Location:
-    /home/runner/work/jet-w.astro-blog/jet-w.astro-blog/templates/default/astro.config.mjs:11:46
-  Stack trace:
-    at packageEntryFailure (file:///home/runner/work/jet-w.astro-blog/jet-w.astro-blog/templates/default/node_modules/vite/dist/node/chunks/dep-D4NMHUTW.js:16198:15)
-    at tryNodeResolve (file:///home/runner/work/jet-w.astro-blog/jet-w.astro-blog/templates/default/node_modules/vite/dist/node/chunks/dep-D4NMHUTW.js:16060:18)
-    at EnvironmentPluginContainer.resolveId (file:///home/runner/work/jet-w.astro-blog/jet-w.astro-blog/templates/default/node_modules/vite/dist/node/chunks/dep-D4NMHUTW.js:42242:17)
-    at async normalizeUrl (file:///home/runner/work/jet-w.astro-blog/jet-w.astro-blog/templates/default/node_modules/vite/dist/node/chunks/dep-D4NMHUTW.js:40492:26)
-    at async Promise.all (index 8)
-Error: Process completed with exit code 1.
+When the base url was set up, the hyper link in markdown, such as [/xxx/fse](text) and image link cannot change accordingly, please help to check similar link at the same time. please help to fix it

package/templates/default/Makefile

@@ -0,0 +1,37 @@
+.PHONY: dev prod install clean help
+
+# Default target
+help:
+	@echo "Usage:"
+	@echo "  make dev   - Switch to development mode (uses local @jet-w/astro-blog)"
+	@echo "  make prod  - Switch to production mode (uses npm package @jet-w/astro-blog)"
+	@echo "  make install - Run npm install after switching modes"
+	@echo "  make clean - Remove node_modules and package-lock.json"
+
+# Switch to development mode (local package)
+dev:
+	@echo "Switching to development mode..."
+	@cp package.dev.json package.json
+	@echo "Done! Run 'make install' or 'npm install' to install dependencies."
+
+# Switch to production mode (npm package)
+prod:
+	@echo "Switching to production mode..."
+	@cp package.prod.json package.json
+	@echo "Done! Run 'make install' or 'npm install' to install dependencies."
+
+# Install dependencies
+install:
+	npm install
+
+# Clean node_modules and package-lock.json
+clean:
+	@echo "Cleaning..."
+	@rm -rf node_modules package-lock.json
+	@echo "Done!"
+
+# Switch to dev and install
+dev-install: dev install
+
+# Switch to prod and install
+prod-install: prod install

package/templates/default/astro.config.mjs

@@ -1,4 +1,5 @@
 import { defineConfig } from 'astro/config';
+import { loadEnv } from 'vite';
 import vue from '@astrojs/vue';
 import tailwind from '@astrojs/tailwind';
 import mdx from '@astrojs/mdx';
@@ -7,6 +8,9 @@ import remarkMath from 'remark-math';
 import rehypeKatex from 'rehype-katex';
 import rehypeRaw from 'rehype-raw';
 
+// Load environment variables from .env file
+const { SITE_URL, BASE_PATH } = loadEnv(process.env.NODE_ENV || 'production', process.cwd(), '');
+
 // Import plugins and integration from @jet-w/astro-blog
 import { astroBlog, defineI18nConfig } from '@jet-w/astro-blog';
 import { remarkProtectCode, rehypeRestoreCode } from '@jet-w/astro-blog/plugins/remark-protect-code.mjs';
@@ -59,7 +63,7 @@ export default defineConfig({
       rehypeKatex,
       rehypeCleanContainers,
       rehypeTabs,
-      rehypeRelativeLinks,
+      [rehypeRelativeLinks, { base: BASE_PATH || process.env.BASE_PATH || '/' }],
       rehypeRestoreCode,  // Must run LAST to restore ::: in code blocks
     ],
     shikiConfig: {
@@ -68,8 +72,8 @@ export default defineConfig({
       wrap: true
     }
   },
-  site: process.env.SITE_URL || 'https://example.com',
-  base: process.env.BASE_PATH || '/',
+  site: SITE_URL || process.env.SITE_URL || 'https://example.com',
+  base: BASE_PATH || process.env.BASE_PATH || '/',
   build: {
     assets: 'assets'
   },

package/templates/default/package.prod.json

@@ -0,0 +1,31 @@
+{
+  "name": "my-astro-blog",
+  "type": "module",
+  "version": "0.0.1",
+  "scripts": {
+    "dev": "astro dev",
+    "start": "astro dev",
+    "build": "astro build",
+    "preview": "astro preview",
+    "astro": "astro"
+  },
+  "dependencies": {
+    "@astrojs/mdx": "^4.3.12",
+    "@astrojs/rss": "^4.0.14",
+    "@astrojs/tailwind": "^5.1.3",
+    "@astrojs/vue": "^5.0.6",
+    "@jet-w/astro-blog": "^0.2.1",
+    "@tailwindcss/typography": "^0.5.15",
+    "astro": "^5.14.1",
+    "echarts": "^6.0.0",
+    "fuse.js": "^7.0.0",
+    "mermaid": "^11.12.2",
+    "rehype-katex": "^7.0.1",
+    "rehype-raw": "^7.0.0",
+    "remark-directive": "^4.0.0",
+    "remark-math": "^6.0.0",
+    "tailwindcss": "^3.4.17",
+    "typescript": "^5.7.2",
+    "vue": "^3.5.13"
+  }
+}