Skip to content

Commit 7a6b77d

Browse files
committed
Merge pull request #4048 from udecode/react-19
React 19 and Tailwind 4
1 parent e75328b commit 7a6b77d

19 files changed

+2397
-4724
lines changed

.eslintignore

-5
This file was deleted.

.eslintrc.js

-286
This file was deleted.

.gitignore

+19-14
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
22

3-
.idea
4-
53
# dependencies
6-
node_modules
7-
.pnp
8-
.pnp.js
4+
/node_modules
5+
/.pnp
6+
.pnp.*
7+
.yarn/*
8+
!.yarn/patches
9+
!.yarn/plugins
10+
!.yarn/releases
11+
!.yarn/versions
912

1013
# testing
11-
coverage
14+
/coverage
1215

1316
# next.js
14-
.next/
15-
out/
16-
build
17-
tsconfig.tsbuildinfo
17+
/.next/
18+
/out/
19+
20+
# production
21+
/build
1822

1923
# misc
2024
.DS_Store
@@ -32,8 +36,9 @@ yarn-error.log*
3236
.env.test.local
3337
.env.production.local
3438

35-
# turbo
36-
.turbo
39+
# vercel
40+
.vercel
3741

38-
.contentlayer
39-
.env
42+
# typescript
43+
*.tsbuildinfo
44+
next-env.d.ts

components.json

+15-14
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
11
{
22
"$schema": "https://ui.shadcn.com/schema.json",
3+
"style": "default",
4+
"rsc": true,
5+
"tsx": true,
6+
"tailwind": {
7+
"config": "tailwind.config.ts",
8+
"css": "src/app/globals.css",
9+
"baseColor": "slate",
10+
"cssVariables": true,
11+
"prefix": ""
12+
},
313
"aliases": {
414
"components": "@/components",
5-
"hooks": "@/hooks",
6-
"lib": "@/lib",
15+
"utils": "@/lib/utils",
716
"ui": "@/components/ui",
8-
"utils": "@/lib/utils"
17+
"lib": "@/lib",
18+
"hooks": "@/hooks"
919
},
20+
"iconLibrary": "lucide",
1021
"registries": {
1122
"plate": {
1223
"aliases": {
1324
"ui": "@/components/plate-ui"
1425
},
1526
"url": "https://platejs.org/r"
1627
}
17-
},
18-
"rsc": true,
19-
"style": "default",
20-
"tailwind": {
21-
"baseColor": "slate",
22-
"config": "tailwind.config.ts",
23-
"css": "src/app/globals.css",
24-
"cssVariables": true,
25-
"prefix": ""
26-
},
27-
"tsx": true
28+
}
2829
}

0 commit comments

Comments
 (0)