From 8a8bf19e35797adac1e0ce6d2434472efc84bf37 Mon Sep 17 00:00:00 2001 From: HPCesia Date: Fri, 7 Feb 2025 21:39:05 +0800 Subject: [PATCH] build(deps): upgrade TailwindCSS to v4 - Upgrade TailwindCSS to v4 - Upgrade daisyUI to v5 beta. - Delete the PostCSS TailwindCSS compatibility layer. - Delete Sass dependency because TailwindCSS v4 will generate nested CSS, so we don't need Sass anymore. --- astro.config.mjs | 6 +- package.json | 8 +- postcss.config.mjs | 12 -- src/components/Navbar.astro | 4 +- src/components/PageFooter.astro | 10 +- src/components/Search.astro | 4 +- src/components/SideToolBar.astro | 4 +- src/components/TimeArchives.astro | 2 +- src/components/Timeline.astro | 24 +-- src/components/comment/Twikoo.astro | 2 +- src/components/misc/CategoryBar.astro | 2 +- src/components/misc/License.astro | 2 +- src/components/search/Pagefind.astro | 12 +- src/components/utils/Markdown.astro | 6 +- src/components/widgets/MetaIcon.astro | 5 +- src/components/widgets/Pagination.astro | 2 +- src/components/widgets/PostCard.astro | 6 +- src/components/widgets/PostCardCover.astro | 26 ++- src/components/widgets/ProfileCard.astro | 6 +- src/components/widgets/ReadMoreButton.astro | 24 ++- src/components/widgets/TOC.astro | 12 +- src/layouts/GlobalLayout.astro | 7 +- src/layouts/GridLayout.astro | 2 +- src/pages/about.astro | 2 +- src/pages/archives/categories/index.astro | 4 +- src/pages/archives/tags/[tag]/[page].astro | 2 +- src/pages/archives/tags/index.astro | 4 +- src/pages/posts/[article].astro | 2 +- src/plugins/remark-excerpt.js | 14 +- src/styles/global.css | 46 ++++++ src/styles/globals.scss | 11 -- src/styles/{markdown.scss => markdown.css} | 52 +++--- src/styles/{twikoo.scss => twikoo.css} | 167 +++++++++++--------- stylelint.config.mjs | 12 +- tailwind.config.mjs | 46 ------ 35 files changed, 251 insertions(+), 299 deletions(-) delete mode 100644 postcss.config.mjs create mode 100644 src/styles/global.css delete mode 100644 src/styles/globals.scss rename src/styles/{markdown.scss => markdown.css} (83%) rename src/styles/{twikoo.scss => twikoo.css} (64%) delete mode 100644 tailwind.config.mjs diff --git a/astro.config.mjs b/astro.config.mjs index 2dd1524..5f3b614 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -5,7 +5,7 @@ import { remarkExcerpt } from './src/plugins/remark-excerpt'; import { remarkReadingTime } from './src/plugins/remark-reading-time.mjs'; import { rehypeHeadingIds } from '@astrojs/markdown-remark'; import sitemap from '@astrojs/sitemap'; -import tailwind from '@astrojs/tailwind'; +import tailwindcss from '@tailwindcss/vite'; import icon from 'astro-icon'; import pagefind from 'astro-pagefind'; import { defineConfig } from 'astro/config'; @@ -21,7 +21,6 @@ export default defineConfig({ output: 'static', trailingSlash: 'ignore', integrations: [ - tailwind({ nesting: true, applyBaseStyles: false }), icon(), sitemap({ filter: (page) => !page.includes('/archives/') && !page.includes('/about/') }), pagefind(), @@ -76,4 +75,7 @@ export default defineConfig({ rehypeWrapTables, ], }, + vite: { + plugins: [tailwindcss()], + }, }); diff --git a/package.json b/package.json index 5976dc1..8467518 100644 --- a/package.json +++ b/package.json @@ -16,15 +16,15 @@ "@astrojs/markdown-remark": "^6.1.0", "@astrojs/rss": "^4.0.11", "@astrojs/sitemap": "^3.2.1", - "@astrojs/tailwind": "^5.1.5", "@iconify-json/material-symbols": "^1.2.14", "@iconify-json/mdi": "^1.2.3", + "@tailwindcss/vite": "^4.0.4", "astro": "^5.2.5", "astro-compress": "2.3.5", "astro-icon": "^1.1.5", "astro-pagefind": "^1.8.0", "autoprefixer": "^10.4.20", - "daisyui": "^4.12.23", + "daisyui": "5.0.0-beta.7", "mdast-util-to-string": "^4.0.0", "postcss-load-config": "^6.0.1", "reading-time": "^1.5.0", @@ -32,9 +32,8 @@ "rehype-mathjax": "^6.0.0", "remark-github-beta-blockquote-admonitions": "^3.1.1", "remark-math": "^6.0.0", - "sass": "^1.84.0", "sharp": "^0.33.5", - "tailwindcss": "^3.4.17", + "tailwindcss": "^4.0.4", "typescript": "^5.7.3", "unist-util-visit": "^5.0.0" }, @@ -55,7 +54,6 @@ "prettier-plugin-tailwindcss": "^0.6.11", "stylelint": "^16.14.1", "stylelint-config-html": "^1.1.0", - "stylelint-config-standard-scss": "^14.0.0", "typescript-eslint": "^8.23.0" } } \ No newline at end of file diff --git a/postcss.config.mjs b/postcss.config.mjs deleted file mode 100644 index e6b3a3c..0000000 --- a/postcss.config.mjs +++ /dev/null @@ -1,12 +0,0 @@ -import postcssImport from 'postcss-import'; -import tailwindcss from 'tailwindcss'; -import postcssNesting from 'tailwindcss/nesting/index.js'; - -/** @type {import('postcss-load-config').Config} */ -export default { - plugins: { - 'postcss-import': postcssImport, // to combine multiple css files - 'tailwindcss/nesting': postcssNesting, - tailwindcss: tailwindcss, - }, -}; diff --git a/src/components/Navbar.astro b/src/components/Navbar.astro index 67834b1..97bfd71 100644 --- a/src/components/Navbar.astro +++ b/src/components/Navbar.astro @@ -19,7 +19,7 @@ if (!title) title = 'Astral Halo';