Merge branch 'development'

Author: leezhian

README-zh_CN.md

@@ -4,7 +4,7 @@
 
 ## ✨ 特性
 
-- 极简风主题，设配多端场景。
+- 极简风主题，设配多端场景, 支持 `light` 和 `dark` 模式。
 - 傻瓜式配置，0基础快速上手部署。
 - 支持文章草稿，本地允许预览，生产构建自动过滤。
 - 支持 algolia 搜索和 follow 订阅认证配置开启。
@@ -57,6 +57,7 @@ pnpm build
 | title | 网站标题 | `string` | - |
 | description | 网站描述 | `string` | - |
 | lang | 语言 | `string` | `zh-CN` |
+| theme | 主题 | `{ mode: 'auto' | 'light' | 'dark', enableUserChange: boolean }` | `{ mode: 'auto', enableUserChange: true }` |
 | avatar | 头像 | `string` | - |
 | sitemap | 网站 sitemap 配置 | [SitemapOptions](https://docs.astro.build/zh-cn/guides/integrations-guide/sitemap/) | - |
 | readTime | 是否显示阅读时间 | `boolean` | `false` |

README.md

@@ -4,7 +4,7 @@ English · [中文](./README-zh_CN.md)
 
 ## ✨ Features
 
-- Minimalist style theme, adaptable to multiple platforms
+- Minimalist style theme, adaptable to multiple platforms, support `light` and `dark` mode.
 - Zero-based quick start, foolproof configuration, easy deployment
 - Support for article drafts, local preview, and automatic draft filtering in production builds
 - Default RSS generation with Follow subscription authentication
@@ -60,6 +60,7 @@ Theme configuration is done through `slate.config.ts` in the root directory.
 | title | Website title | `string` | - |
 | description | Website description | `string` | - |
 | lang | Language | `string` | `zh-CN` |
+| theme | Theme | `{ mode: 'auto' | 'light' | 'dark', enableUserChange: boolean }` | `{ mode: 'auto', enableUserChange: true }` |
 | avatar | Avatar | `string` | - |
 | sitemap | Website sitemap configuration | [SitemapOptions](https://docs.astro.build/en/guides/integrations-guide/sitemap/)  | - |
 | readTime | Show reading time | `boolean` | `false` |

astro.config.mjs

@@ -1,7 +1,7 @@
 import { defineConfig } from 'astro/config';
 import react from '@astrojs/react';
-import tailwind from '@astrojs/tailwind';
 import svgr from 'vite-plugin-svgr';
+import tailwindcss from "@tailwindcss/vite";
 import mdx from '@astrojs/mdx';
 import sitemap from '@astrojs/sitemap';
 import remarkGemoji from 'remark-gemoji';
@@ -17,7 +17,7 @@ import { remarkReadingTime } from './plugins/remark-reading-time';
 import slateConfig from './slate.config';
 
 function computedIntegrations() {
-  const result = [astroExpressiveCode(), mdx(), react(), tailwind(), sitemap(slateConfig.sitemap)];
+  const result = [astroExpressiveCode(), mdx(), react(), sitemap(slateConfig.sitemap)];
 
   return result;
 }
@@ -39,6 +39,7 @@ function generateAstroConfigure() {
     vite: {
       plugins: [
         svgr(),
+        tailwindcss(),
       ],
     },
   };

eslint.config.js

@@ -12,7 +12,7 @@ export default [
   ...eslintPluginAstro.configs['jsx-a11y-recommended'],
   // pluginReactConfig,
   {
-    ignores: ['node_modules', 'dist', '.astro', 'src/env.d.ts'],
+    ignores: ['node_modules', 'dist', '.astro', 'src/env.d.ts', '**/.obsidian'],
   },
   {
     languageOptions: {

package.json

@@ -29,19 +29,18 @@
   },
   "dependencies": {
     "@astrojs/check": "^0.9.4",
-    "@astrojs/mdx": "^4.0.2",
-    "@astrojs/react": "^4.1.1",
-    "@astrojs/rss": "^4.0.10",
+    "@astrojs/mdx": "^4.0.8",
+    "@astrojs/react": "^4.2.0",
+    "@astrojs/rss": "^4.0.11",
     "@astrojs/sitemap": "^3.2.1",
-    "@astrojs/tailwind": "^5.1.3",
     "@docsearch/css": "^3.6.2",
     "@docsearch/react": "^3.6.2",
     "@radix-ui/colors": "^3.0.0",
-    "@radix-ui/themes": "^3.1.4",
+    "@tailwindcss/vite": "^4.0.3",
     "@types/node": "^22.8.4",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
-    "astro": "^5.0.9",
+    "astro": "^5.2.5",
     "astro-expressive-code": "^0.37.1",
     "classnames": "^2.5.1",
     "dayjs": "^1.11.13",
@@ -55,7 +54,7 @@
     "remark-code-import": "^1.2.0",
     "remark-gemoji": "^8.0.0",
     "remark-math": "^6.0.0",
-    "tailwindcss": "^3.4.14",
+    "tailwindcss": "^4.0.3",
     "typescript": "^5.6.3",
     "vite-plugin-svgr": "^4.2.0"
   },
@@ -74,7 +73,7 @@
     "postcss-import": "^16.1.0",
     "prettier": "^3.3.3",
     "prettier-plugin-astro": "^0.14.1",
-    "prettier-plugin-tailwindcss": "^0.6.8",
+    "prettier-plugin-tailwindcss": "^0.6.11",
     "remark": "^15.0.1",
     "remark-html": "^16.0.1",
     "sanitize-html": "^2.14.0",