Skip to content

Commit d56742f

Browse files
authored
Merge pull request #159 from LuanRoger/chore/tailwind-update
2 parents d73071f + 4d133a3 commit d56742f

File tree

9 files changed

+1148
-1563
lines changed

9 files changed

+1148
-1563
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ To develop a Electron app, you probably will need some UI, test, formatter, styl
2020
- [Prettier](https://prettier.io)
2121
- [ESLint 9](https://eslint.org)
2222
- [Zod](https://zod.dev)
23-
- [React Query (Tan Stack)](https://react-query.tanstack.com)
23+
- [React Query (TanStack)](https://react-query.tanstack.com)
2424

2525
### UI 🎨
2626

2727
- [React 19](https://reactjs.org)
28-
- [Tailwind CSS](https://tailwindcss.com)
28+
- [Tailwind 4](https://tailwindcss.com)
2929
- [Shadcn UI](https://ui.shadcn.com)
3030
- [Geist](https://vercel.com/font) as default font
3131
- [i18next](https://www.i18next.com)

package-lock.json

Lines changed: 1038 additions & 1441 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -22,66 +22,66 @@
2222
"author": "ROG <[email protected]>",
2323
"license": "MIT",
2424
"devDependencies": {
25-
"@electron-forge/cli": "^7.6.0",
26-
"@electron-forge/maker-deb": "^7.6.0",
27-
"@electron-forge/maker-rpm": "^7.6.0",
28-
"@electron-forge/maker-squirrel": "^7.6.0",
29-
"@electron-forge/maker-zip": "^7.6.0",
30-
"@electron-forge/plugin-auto-unpack-natives": "^7.6.0",
31-
"@electron-forge/plugin-fuses": "^7.6.0",
32-
"@electron-forge/plugin-vite": "^7.6.0",
25+
"@electron-forge/cli": "^7.6.1",
26+
"@electron-forge/maker-deb": "^7.6.1",
27+
"@electron-forge/maker-rpm": "^7.6.1",
28+
"@electron-forge/maker-squirrel": "^7.6.1",
29+
"@electron-forge/maker-zip": "^7.6.1",
30+
"@electron-forge/plugin-auto-unpack-natives": "^7.6.1",
31+
"@electron-forge/plugin-fuses": "^7.6.1",
32+
"@electron-forge/plugin-vite": "^7.6.1",
3333
"@electron-forge/shared-types": "^7.4.0",
3434
"@electron/fuses": "^1.8.0",
3535
"@eslint/compat": "^1.2.5",
3636
"@eslint/js": "^9.18.0",
37-
"@playwright/test": "^1.49.1",
37+
"@playwright/test": "^1.50.0",
38+
"@tailwindcss/postcss": "^4.0.0",
3839
"@testing-library/jest-dom": "^6.6.3",
3940
"@testing-library/react": "^16.2.0",
40-
"@testing-library/user-event": "^14.6.0",
41+
"@testing-library/user-event": "^14.6.1",
4142
"@types/electron-squirrel-startup": "^1.0.2",
4243
"@types/eslint-config-prettier": "^6.11.3",
4344
"@types/jest": "^29.5.14",
44-
"@types/node": "^22.10.7",
45-
"@types/react": "^19.0.7",
45+
"@types/node": "^22.10.10",
46+
"@types/react": "^19.0.8",
4647
"@types/react-dom": "^19.0.3",
47-
"autoprefixer": "^10.4.20",
48-
"electron": "34.0.0",
48+
"electron": "34.0.1",
4949
"electron-devtools-installer": "^4.0.0",
5050
"electron-playwright-helpers": "^1.7.1",
51-
"eslint": "^9.18.0",
51+
"eslint": "^9.19.0",
5252
"eslint-config-prettier": "^10.0.1",
53-
"eslint-plugin-prettier": "^5.2.2",
53+
"eslint-plugin-prettier": "^5.2.3",
5454
"eslint-plugin-react": "^7.37.4",
5555
"eslint-plugin-react-compiler": "^19.0.0-beta-e552027-20250112",
5656
"globals": "^15.14.0",
5757
"jest": "^29.7.0",
5858
"jest-environment-jsdom": "^29.7.0",
5959
"postcss": "^8.5.1",
6060
"prettier": "^3.4.2",
61-
"prettier-plugin-tailwindcss": "^0.6.10",
62-
"tailwindcss": "^3.4.17",
61+
"prettier-plugin-tailwindcss": "^0.6.11",
62+
"tailwindcss": "^4.0.0",
6363
"ts-jest": "^29.2.5",
6464
"ts-node": "^10.9.2",
6565
"typescript": "^5.7.3",
66-
"typescript-eslint": "^8.20.0",
67-
"vite": "^6.0.7"
66+
"typescript-eslint": "^8.21.0",
67+
"vite": "^6.0.11"
6868
},
6969
"dependencies": {
70-
"@icons-pack/react-simple-icons": "^11.1.0",
71-
"@radix-ui/react-navigation-menu": "^1.2.3",
70+
"@icons-pack/react-simple-icons": "^11.2.0",
71+
"@radix-ui/react-navigation-menu": "^1.2.4",
7272
"@radix-ui/react-slot": "^1.0.2",
7373
"@radix-ui/react-toggle": "^1.1.1",
7474
"@radix-ui/react-toggle-group": "^1.1.1",
75-
"@tanstack/react-query": "^5.64.1",
76-
"@tanstack/react-router": "^1.97.3",
77-
"@tanstack/router-devtools": "^1.97.3",
75+
"@tanstack/react-query": "^5.64.2",
76+
"@tanstack/react-router": "^1.97.23",
77+
"@tanstack/router-devtools": "^1.97.23",
7878
"@vitejs/plugin-react": "^4.3.4",
7979
"babel-plugin-react-compiler": "^19.0.0-beta-e552027-20250112",
8080
"class-variance-authority": "^0.7.1",
8181
"clsx": "^2.1.1",
8282
"electron-squirrel-startup": "^1.0.1",
83-
"i18next": "^24.2.1",
84-
"lucide-react": "^0.473.0",
83+
"i18next": "^24.2.2",
84+
"lucide-react": "^0.474.0",
8585
"react": "^19.0.0",
8686
"react-dom": "^19.0.0",
8787
"react-i18next": "^15.4.0",

postcss.config.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
export default {
22
plugins: {
3-
tailwindcss: {},
4-
autoprefixer: {},
3+
'@tailwindcss/postcss': {},
54
},
65
};

src/components/ui/button.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { cva, type VariantProps } from "class-variance-authority";
55
import { cn } from "@/utils/tailwind";
66

77
const buttonVariants = cva(
8-
"inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",
8+
"inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background cursor-pointer transition-colors focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",
99
{
1010
variants: {
1111
variant: {

src/components/ui/navigation-menu.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ NavigationMenuList.displayName = NavigationMenuPrimitive.List.displayName
4141
const NavigationMenuItem = NavigationMenuPrimitive.Item
4242

4343
const navigationMenuTriggerStyle = cva(
44-
"group inline-flex h-10 w-max items-center justify-center rounded-md bg-background px-4 py-2 text-sm font-medium transition-colors hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground focus:outline-none disabled:pointer-events-none disabled:opacity-50 data-[active]:bg-accent/50 data-[state=open]:bg-accent/50"
44+
"group inline-flex h-10 w-max items-center justify-center rounded-md bg-background px-4 py-2 text-sm font-medium transition-colors hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground focus:outline-hidden disabled:pointer-events-none disabled:opacity-50 data-active:bg-accent/50 data-[state=open]:bg-accent/50"
4545
)
4646

4747
const NavigationMenuTrigger = React.forwardRef<
@@ -104,7 +104,7 @@ const NavigationMenuIndicator = React.forwardRef<
104104
<NavigationMenuPrimitive.Indicator
105105
ref={ref}
106106
className={cn(
107-
"top-full z-[1] flex h-1.5 items-end justify-center overflow-hidden data-[state=visible]:animate-in data-[state=hidden]:animate-out data-[state=hidden]:fade-out data-[state=visible]:fade-in",
107+
"top-full z-1 flex h-1.5 items-end justify-center overflow-hidden data-[state=visible]:animate-in data-[state=hidden]:animate-out data-[state=hidden]:fade-out data-[state=visible]:fade-in",
108108
className
109109
)}
110110
{...props}

src/components/ui/toggle.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { cva, type VariantProps } from "class-variance-authority";
55
import { cn } from "@/utils/tailwind";
66

77
const toggleVariants = cva(
8-
"inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background transition-colors hover:bg-muted hover:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=on]:bg-accent data-[state=on]:text-accent-foreground",
8+
"inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background cursor-pointer transition-colors hover:bg-muted hover:text-muted-foreground focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=on]:bg-accent data-[state=on]:text-accent-foreground",
99
{
1010
variants: {
1111
variant: {

src/styles/global.css

Lines changed: 76 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,76 @@
1-
@tailwind base;
2-
@tailwind components;
3-
@tailwind utilities;
1+
@import 'tailwindcss';
2+
3+
@plugin 'tailwindcss-animate';
4+
5+
@custom-variant dark (&:is(.dark *));
6+
7+
@theme {
8+
--color-border: hsl(var(--border));
9+
--color-input: hsl(var(--input));
10+
--color-ring: hsl(var(--ring));
11+
--color-background: hsl(var(--background));
12+
--color-foreground: hsl(var(--foreground));
13+
14+
--color-primary: hsl(var(--primary));
15+
--color-primary-foreground: hsl(var(--primary-foreground));
16+
17+
--color-secondary: hsl(var(--secondary));
18+
--color-secondary-foreground: hsl(var(--secondary-foreground));
19+
20+
--color-destructive: hsl(var(--destructive));
21+
--color-destructive-foreground: hsl(var(--destructive-foreground));
22+
23+
--color-muted: hsl(var(--muted));
24+
--color-muted-foreground: hsl(var(--muted-foreground));
25+
26+
--color-accent: hsl(var(--accent));
27+
--color-accent-foreground: hsl(var(--accent-foreground));
28+
29+
--color-popover: hsl(var(--popover));
30+
--color-popover-foreground: hsl(var(--popover-foreground));
31+
32+
--color-card: hsl(var(--card));
33+
--color-card-foreground: hsl(var(--card-foreground));
34+
35+
--font-sans: Geist, sans-serif;
36+
--font-mono: Geist Mono, monospace;
37+
--font-tomorrow: Tomorrow, sans-serif;
38+
39+
--radius-lg: var(--radius);
40+
--radius-md: calc(var(--radius) - 2px);
41+
--radius-sm: calc(var(--radius) - 4px);
42+
43+
--animate-accordion-down: accordion-down 0.2s ease-out;
44+
--animate-accordion-up: accordion-up 0.2s ease-out;
45+
46+
@keyframes accordion-down {
47+
from {
48+
height: 0;
49+
}
50+
to {
51+
height: var(--radix-accordion-content-height);
52+
}
53+
}
54+
@keyframes accordion-up {
55+
from {
56+
height: var(--radix-accordion-content-height);
57+
}
58+
to {
59+
height: 0;
60+
}
61+
}
62+
}
63+
64+
@utility container {
65+
margin-inline: auto;
66+
padding-inline: 2rem;
67+
@media (width >= --theme(--breakpoint-sm)) {
68+
max-width: none;
69+
}
70+
@media (width >= 1400px) {
71+
max-width: 1400px;
72+
}
73+
}
474

575
@layer base {
676
@font-face {
@@ -120,4 +190,7 @@
120190
@apply bg-background;
121191
-webkit-app-region: drag;
122192
}
193+
button {
194+
@apply cursor-pointer;
195+
}
123196
}

tailwind.config.ts

Lines changed: 0 additions & 84 deletions
This file was deleted.

0 commit comments

Comments
 (0)