Skip to content

Commit df3b232

Browse files
committed
Merge pull request #3480 from udecode/migrate-templates-37
Migrate Templates 37
1 parent f5123f9 commit df3b232

File tree

6 files changed

+3638
-2881
lines changed

6 files changed

+3638
-2881
lines changed

.eslintrc.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
const path = require('path');
12
const prettierConfig = require('./prettier.config.js');
23

34
module.exports = {
@@ -11,7 +12,7 @@ module.exports = {
1112
plugins: ['tailwindcss', 'unused-imports', 'prettier'],
1213
rules: {
1314
'@next/next/no-html-link-for-pages': 'off',
14-
'prettier/prettier': ['warn', prettierConfig],
15+
'prettier/prettier': ['warn', { ...prettierConfig }],
1516
'react/jsx-key': 'off',
1617
'tailwindcss/classnames-order': 'warn',
1718
'tailwindcss/no-custom-classname': 'error',
@@ -30,7 +31,7 @@ module.exports = {
3031
settings: {
3132
tailwindcss: {
3233
callees: ['cn', 'cva', 'withCn'],
33-
config: 'tailwind.config.js',
34+
config: path.join(__dirname, './tailwind.config.js'),
3435
},
3536
next: {
3637
rootDir: ['./'],

package.json

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,46 +12,46 @@
1212
"typecheck": "tsc --noEmit"
1313
},
1414
"dependencies": {
15-
"@radix-ui/react-slot": "^1.0.2",
16-
"@radix-ui/react-tooltip": "^1.0.7",
17-
"@udecode/cn": "^29.0.1",
18-
"@udecode/plate-common": "^30.1.2",
15+
"@radix-ui/react-slot": "^1.1.0",
16+
"@radix-ui/react-tooltip": "^1.1.2",
17+
"@udecode/cn": "^37.0.0",
18+
"@udecode/plate-common": "^37.0.0",
1919
"class-variance-authority": "0.7.0",
20-
"eslint-plugin-prettier": "^5.1.3",
21-
"lucide-react": "0.323.0",
22-
"next": "^14.1.0",
23-
"next-themes": "^0.2.1",
24-
"react": "^18.2.0",
20+
"eslint-plugin-prettier": "^5.2.1",
21+
"lucide-react": "0.436.0",
22+
"next": "^14.2.7",
23+
"next-themes": "^0.3.0",
24+
"react": "^18.3.1",
2525
"react-dnd": "^16.0.1",
2626
"react-dnd-html5-backend": "^16.0.1",
27-
"react-dom": "^18.2.0",
28-
"slate": "0.102.0",
29-
"slate-history": "0.100.0",
27+
"react-dom": "^18.3.1",
28+
"slate": "0.103.0",
29+
"slate-history": "0.109.0",
3030
"slate-hyperscript": "0.100.0",
31-
"slate-react": "0.102.0",
32-
"tailwind-merge": "2.2.1",
31+
"slate-react": "0.109.0",
32+
"tailwind-merge": "2.5.2",
3333
"tailwindcss-animate": "1.0.7"
3434
},
3535
"devDependencies": {
36-
"@ianvs/prettier-plugin-sort-imports": "^4.1.1",
37-
"@types/node": "^20.11.16",
38-
"@types/react": "^18.2.55",
39-
"@types/react-dom": "^18.2.18",
40-
"@typescript-eslint/parser": "^6.21.0",
41-
"autoprefixer": "^10.4.17",
36+
"@ianvs/prettier-plugin-sort-imports": "^4.3.1",
37+
"@types/node": "^22.5.1",
38+
"@types/react": "^18.3.4",
39+
"@types/react-dom": "^18.3.0",
40+
"@typescript-eslint/parser": "^8.3.0",
41+
"autoprefixer": "^10.4.20",
4242
"encoding": "^0.1.13",
4343
"eslint": "^8.56.0",
44-
"eslint-config-next": "14.1.0",
44+
"eslint-config-next": "14.2.7",
4545
"eslint-config-prettier": "^9.1.0",
46-
"eslint-plugin-react": "^7.33.2",
47-
"eslint-plugin-tailwindcss": "^3.14.2",
48-
"eslint-plugin-unused-imports": "^3.0.0",
49-
"postcss": "^8.4.34",
50-
"prettier": "^3.2.5",
51-
"tailwindcss": "^3.4.1",
52-
"typescript": "5.4.2"
46+
"eslint-plugin-react": "^7.35.0",
47+
"eslint-plugin-tailwindcss": "^3.17.4",
48+
"eslint-plugin-unused-imports": "^4.1.3",
49+
"postcss": "^8.4.41",
50+
"prettier": "^3.3.3",
51+
"tailwindcss": "^3.4.10",
52+
"typescript": "5.5.4"
5353
},
54-
"packageManager": "pnpm@8.6.1",
54+
"packageManager": "pnpm@9.2.0",
5555
"pnpm": {
5656
"peerDependencyRules": {
5757
"allowAny": [

0 commit comments

Comments
 (0)