From 2c1ec48c5cd094d2cb0681c2839b5636415f2aba Mon Sep 17 00:00:00 2001 From: winches <329487092@qq.com> Date: Sat, 15 Feb 2025 00:14:10 +0800 Subject: [PATCH 1/5] feat: upgrade tailwindcss v4 and heroui tailwindcss v4 upgrade --- .gitignore | 1 - .vscode/settings.json | 5 +++++ package.json | 26 ++++++++++++++------------ postcss.config.js | 9 ++++----- src/styles/globals.css | 6 +++--- vite.config.ts | 11 ++++++----- 6 files changed, 32 insertions(+), 26 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.gitignore b/.gitignore index 3d27651..c64d8f8 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,6 @@ dist-ssr *.local # Editor directories and files -.vscode/* !.vscode/extensions.json .idea .DS_Store diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..fb37c88 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "tailwindCSS.experimental.classRegex": [ + ["([\"'`][^\"'`]*.*?[\"'`])", "[\"'`]([^\"'`]*).*?[\"'`]"] + ], +} \ No newline at end of file diff --git a/package.json b/package.json index fc72e62..173b141 100644 --- a/package.json +++ b/package.json @@ -10,26 +10,28 @@ "preview": "vite preview" }, "dependencies": { - "@heroui/button": "2.2.9", - "@heroui/code": "2.2.6", - "@heroui/dropdown": "2.3.9", - "@heroui/input": "2.4.9", - "@heroui/kbd": "2.2.6", - "@heroui/link": "2.2.7", - "@heroui/navbar": "2.2.8", - "@heroui/snippet": "2.2.10", - "@heroui/switch": "2.2.8", - "@heroui/system": "2.4.6", - "@heroui/theme": "2.4.5", + "@heroui/button": "https://pkg.pr.new/@heroui/button@4656", + "@heroui/code": "https://pkg.pr.new/@heroui/code@4656", + "@heroui/dropdown": "https://pkg.pr.new/@heroui/dropdown@4656", + "@heroui/input": "https://pkg.pr.new/@heroui/input@4656", + "@heroui/kbd": "https://pkg.pr.new/@heroui/kbd@4656", + "@heroui/link": "https://pkg.pr.new/@heroui/link@4656", + "@heroui/navbar": "https://pkg.pr.new/@heroui/navbar@4656", + "@heroui/snippet": "https://pkg.pr.new/@heroui/snippet@4656", + "@heroui/switch": "https://pkg.pr.new/@heroui/switch@4656", + "@heroui/system": "https://pkg.pr.new/@heroui/system@4656", + "@heroui/theme": "https://pkg.pr.new/@heroui/theme@4656", "@react-aria/visually-hidden": "3.8.12", "@react-types/shared": "3.26.0", + "@tailwindcss/postcss": "^4.0.6", + "@tailwindcss/vite": "^4.0.6", "clsx": "2.1.1", "framer-motion": "11.15.0", "react": "18.3.1", "react-dom": "18.3.1", "react-router-dom": "6.23.0", "tailwind-variants": "0.1.20", - "tailwindcss": "3.4.16" + "tailwindcss": "4.0.6" }, "devDependencies": { "@types/node": "20.5.7", diff --git a/postcss.config.js b/postcss.config.js index 2c02c54..fe1e17e 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -1,6 +1,5 @@ export default { - plugins: { - tailwindcss: {}, - autoprefixer: {}, - }, - }; \ No newline at end of file + plugins: { + "@tailwindcss/postcss": {}, + }, +}; \ No newline at end of file diff --git a/src/styles/globals.css b/src/styles/globals.css index b5c61c9..e012273 100644 --- a/src/styles/globals.css +++ b/src/styles/globals.css @@ -1,3 +1,3 @@ -@tailwind base; -@tailwind components; -@tailwind utilities; +@import "tailwindcss"; + +@config "../../tailwind.config.js" \ No newline at end of file diff --git a/vite.config.ts b/vite.config.ts index 3e8ce05..655ffd7 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,8 +1,9 @@ -import { defineConfig } from 'vite' -import react from '@vitejs/plugin-react' -import tsconfigPaths from 'vite-tsconfig-paths' +import { defineConfig } from "vite"; +import react from "@vitejs/plugin-react"; +import tsconfigPaths from "vite-tsconfig-paths"; +import tailwindcss from "@tailwindcss/vite"; // https://vitejs.dev/config/ export default defineConfig({ - plugins: [react(), tsconfigPaths()], -}) + plugins: [react(), tsconfigPaths(), tailwindcss()], +}); From 0200f1dd389b838c0fd9edd6a2788e9cf4d0a6f0 Mon Sep 17 00:00:00 2001 From: winches <329487092@qq.com> Date: Wed, 19 Mar 2025 17:27:22 +0800 Subject: [PATCH 2/5] chore: upgrade version --- package.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 173b141..ee0b0f3 100644 --- a/package.json +++ b/package.json @@ -10,17 +10,17 @@ "preview": "vite preview" }, "dependencies": { - "@heroui/button": "https://pkg.pr.new/@heroui/button@4656", - "@heroui/code": "https://pkg.pr.new/@heroui/code@4656", - "@heroui/dropdown": "https://pkg.pr.new/@heroui/dropdown@4656", - "@heroui/input": "https://pkg.pr.new/@heroui/input@4656", - "@heroui/kbd": "https://pkg.pr.new/@heroui/kbd@4656", - "@heroui/link": "https://pkg.pr.new/@heroui/link@4656", - "@heroui/navbar": "https://pkg.pr.new/@heroui/navbar@4656", - "@heroui/snippet": "https://pkg.pr.new/@heroui/snippet@4656", - "@heroui/switch": "https://pkg.pr.new/@heroui/switch@4656", - "@heroui/system": "https://pkg.pr.new/@heroui/system@4656", - "@heroui/theme": "https://pkg.pr.new/@heroui/theme@4656", + "@heroui/button": "2.2.17-beta.2", + "@heroui/code": "2.2.13-beta.1", + "@heroui/dropdown": "2.3.17-beta.2", + "@heroui/input": "2.4.17-beta.2", + "@heroui/kbd": "2.2.13-beta.1", + "@heroui/link": "2.2.14-beta.1", + "@heroui/navbar": "2.2.15-beta.2", + "@heroui/snippet": "2.2.18-beta.2", + "@heroui/switch": "2.2.15-beta.1", + "@heroui/system": "2.4.13-beta.2", + "@heroui/theme": "2.4.13-beta.2", "@react-aria/visually-hidden": "3.8.12", "@react-types/shared": "3.26.0", "@tailwindcss/postcss": "^4.0.6", From c0493e4145636cd697ce5871a2f5d655d25918dc Mon Sep 17 00:00:00 2001 From: winches <329487092@qq.com> Date: Sat, 12 Apr 2025 18:09:53 +0800 Subject: [PATCH 3/5] chore: upgrade version --- package.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index ee0b0f3..9aca391 100644 --- a/package.json +++ b/package.json @@ -10,17 +10,17 @@ "preview": "vite preview" }, "dependencies": { - "@heroui/button": "2.2.17-beta.2", - "@heroui/code": "2.2.13-beta.1", - "@heroui/dropdown": "2.3.17-beta.2", - "@heroui/input": "2.4.17-beta.2", - "@heroui/kbd": "2.2.13-beta.1", - "@heroui/link": "2.2.14-beta.1", - "@heroui/navbar": "2.2.15-beta.2", - "@heroui/snippet": "2.2.18-beta.2", - "@heroui/switch": "2.2.15-beta.1", - "@heroui/system": "2.4.13-beta.2", - "@heroui/theme": "2.4.13-beta.2", + "@heroui/button": "2.2.18-beta.0", + "@heroui/code": "2.2.14-beta.0", + "@heroui/dropdown": "2.3.18-beta.0", + "@heroui/input": "2.4.18-beta.0", + "@heroui/kbd": "2.2.14-beta.0", + "@heroui/link": "2.2.15-beta.0", + "@heroui/navbar": "2.2.16-beta.0", + "@heroui/snippet": "2.2.19-beta.0", + "@heroui/switch": "2.2.16-beta.0", + "@heroui/system": "2.4.14-beta.0", + "@heroui/theme": "2.4.14-beta.0", "@react-aria/visually-hidden": "3.8.12", "@react-types/shared": "3.26.0", "@tailwindcss/postcss": "^4.0.6", From 036bed5c6861b3c31e9f815fcc49b2c19fef00bf Mon Sep 17 00:00:00 2001 From: WK Wong Date: Tue, 15 Jul 2025 11:50:50 +0800 Subject: [PATCH 4/5] chore: remove leading-9 --- src/components/primitives.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/primitives.ts b/src/components/primitives.ts index 472973c..ef587a7 100644 --- a/src/components/primitives.ts +++ b/src/components/primitives.ts @@ -14,7 +14,7 @@ export const title = tv({ }, size: { sm: "text-3xl lg:text-4xl", - md: "text-[2.3rem] lg:text-5xl leading-9", + md: "text-[2.3rem] lg:text-5xl", lg: "text-4xl lg:text-6xl", }, fullWidth: { From 62271545950cca4ad2bc7114d562138c53593884 Mon Sep 17 00:00:00 2001 From: WK Wong Date: Tue, 15 Jul 2025 11:51:01 +0800 Subject: [PATCH 5/5] chore(deps): bump versions --- package.json | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index bccae5f..5f9f2da 100644 --- a/package.json +++ b/package.json @@ -10,28 +10,29 @@ "preview": "vite preview" }, "dependencies": { - "@heroui/button": "2.2.18-beta.0", - "@heroui/code": "2.2.14-beta.0", - "@heroui/dropdown": "2.3.18-beta.0", - "@heroui/input": "2.4.18-beta.0", - "@heroui/kbd": "2.2.14-beta.0", - "@heroui/link": "2.2.15-beta.0", - "@heroui/navbar": "2.2.16-beta.0", - "@heroui/snippet": "2.2.19-beta.0", - "@heroui/switch": "2.2.16-beta.0", - "@heroui/system": "2.4.14-beta.0", - "@heroui/theme": "2.4.14-beta.0", - "@react-aria/visually-hidden": "3.8.12", - "@react-types/shared": "3.26.0", - "@tailwindcss/postcss": "4.1.10", - "@tailwindcss/vite": "4.1.10", + "@heroui/button": "2.2.23", + "@heroui/code": "2.2.17", + "@heroui/dropdown": "2.3.23", + "@heroui/input": "2.4.23", + "@heroui/kbd": "2.2.18", + "@heroui/link": "2.2.20", + "@heroui/navbar": "2.2.21", + "@heroui/snippet": "2.2.24", + "@heroui/switch": "2.2.21", + "@heroui/system": "2.4.19", + "@heroui/theme": "2.4.18", + "@heroui/use-theme": "2.1.10", + "@react-aria/visually-hidden": "3.8.25", + "@react-types/shared": "3.30.0", + "@tailwindcss/postcss": "4.1.11", + "@tailwindcss/vite": "4.1.11", "clsx": "2.1.1", "framer-motion": "11.18.2", "react": "18.3.1", "react-dom": "18.3.1", "react-router-dom": "6.23.0", "tailwind-variants": "1.0.0", - "tailwindcss": "4.1.10" + "tailwindcss": "4.1.11" }, "devDependencies": { "@eslint/compat": "1.2.8", @@ -43,7 +44,6 @@ "@typescript-eslint/eslint-plugin": "8.31.1", "@typescript-eslint/parser": "8.31.1", "@vitejs/plugin-react": "4.4.1", - "autoprefixer": "10.4.21", "eslint": "9.25.1", "eslint-config-prettier": "9.1.0", "eslint-plugin-import": "2.31.0", @@ -54,7 +54,7 @@ "eslint-plugin-react-hooks": "5.2.0", "eslint-plugin-unused-imports": "4.1.4", "globals": "16.0.0", - "postcss": "8.5.3", + "postcss": "8.5.6", "prettier": "3.5.3", "typescript": "5.6.3", "vite": "5.2.0",