Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update tailwindcss to v4 #2056

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

chore: update tailwindcss to v4 #2056

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d4cf69b
chore: update tailwind to v4 in cli
elianrichard Feb 7, 2025
7c5d33c
chore: update tailwind to v4 in upgrade dir
elianrichard Feb 7, 2025
6e1070e
chore: ran lint and formatting check
elianrichard Feb 7, 2025
0a3a24f
fix: downgrade tailwind in www
elianrichard Feb 7, 2025
d67f16d
fix: updated pnpm-lock.yaml
elianrichard Feb 7, 2025
9a8f962
feat: migrate to css config theme
elianrichard Feb 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"@prisma/adapter-planetscale": "^5.14.0",
"@prisma/client": "^5.14.0",
"@t3-oss/env-nextjs": "^0.10.1",
"@tailwindcss/postcss": "^4.0.0",
"@tanstack/react-query": "^5.49.2",
"@trpc/client": "11.0.0-rc.441",
"@trpc/next": "11.0.0-rc.441",
Expand All @@ -84,12 +85,12 @@
"next-auth": "^4.24.7",
"postgres": "^3.4.4",
"prettier": "^3.3.2",
"prettier-plugin-tailwindcss": "^0.6.5",
"prettier-plugin-tailwindcss": "^0.6.11",
"prisma": "^5.14.0",
"react": "^18.3.0",
"react-dom": "^18.3.0",
"superjson": "^2.2.1",
"tailwindcss": "^3.4.3",
"tailwindcss": "^4.0.0",
"tsup": "^6.7.0",
"type-fest": "^3.13.1",
"typescript": "^5.5.3",
Expand Down
5 changes: 3 additions & 2 deletions cli/src/installers/dependencyVersionMap.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,11 @@ export const dependencyVersionMap = {
"@libsql/client": "^0.9.0",

// TailwindCSS
tailwindcss: "^3.4.3",
tailwindcss: "^4.0.0",
postcss: "^8.4.39",
prettier: "^3.3.2",
"prettier-plugin-tailwindcss": "^0.6.5",
"prettier-plugin-tailwindcss": "^0.6.11",
"@tailwindcss/postcss": "^4.0.0",

// tRPC
"@trpc/client": "^11.0.0-rc.446",
Expand Down
1 change: 1 addition & 0 deletions cli/src/installers/tailwind.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export const tailwindInstaller: Installer = ({ projectDir }) => {
"postcss",
"prettier",
"prettier-plugin-tailwindcss",
"@tailwindcss/postcss",
],
devMode: true,
});
Expand Down
2 changes: 1 addition & 1 deletion cli/template/extras/config/postcss.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export default {
plugins: {
tailwindcss: {},
"@tailwindcss/postcss": {},
},
};
4 changes: 2 additions & 2 deletions cli/template/extras/config/tailwind.config.ts
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Migrate to CSS config?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done, kindly check again

Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { type Config } from "tailwindcss";
import { fontFamily } from "tailwindcss/defaultTheme";
import defaultTheme from "tailwindcss/defaultTheme";

export default {
content: ["./src/**/*.tsx"],
theme: {
extend: {
fontFamily: {
sans: ["var(--font-geist-sans)", ...fontFamily.sans],
sans: ["var(--font-geist-sans)", ...defaultTheme.fontFamily.sans],
},
},
},
Expand Down
6 changes: 3 additions & 3 deletions cli/template/extras/src/styles/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
@import "tailwindcss";

@config "../../tailwind.config.ts";
Loading
Loading