Skip to content

Commit

Permalink
Merge pull request #3480 from udecode/migrate-templates-37
Browse files Browse the repository at this point in the history
Migrate Templates 37
  • Loading branch information
zbeyens committed Aug 30, 2024
1 parent f5123f9 commit df3b232
Show file tree
Hide file tree
Showing 6 changed files with 3,638 additions and 2,881 deletions.
5 changes: 3 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
const path = require('path');
const prettierConfig = require('./prettier.config.js');

module.exports = {
Expand All @@ -11,7 +12,7 @@ module.exports = {
plugins: ['tailwindcss', 'unused-imports', 'prettier'],
rules: {
'@next/next/no-html-link-for-pages': 'off',
'prettier/prettier': ['warn', prettierConfig],
'prettier/prettier': ['warn', { ...prettierConfig }],
'react/jsx-key': 'off',
'tailwindcss/classnames-order': 'warn',
'tailwindcss/no-custom-classname': 'error',
Expand All @@ -30,7 +31,7 @@ module.exports = {
settings: {
tailwindcss: {
callees: ['cn', 'cva', 'withCn'],
config: 'tailwind.config.js',
config: path.join(__dirname, './tailwind.config.js'),
},
next: {
rootDir: ['./'],
Expand Down
58 changes: 29 additions & 29 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,46 +12,46 @@
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@radix-ui/react-slot": "^1.0.2",
"@radix-ui/react-tooltip": "^1.0.7",
"@udecode/cn": "^29.0.1",
"@udecode/plate-common": "^30.1.2",
"@radix-ui/react-slot": "^1.1.0",
"@radix-ui/react-tooltip": "^1.1.2",
"@udecode/cn": "^37.0.0",
"@udecode/plate-common": "^37.0.0",
"class-variance-authority": "0.7.0",
"eslint-plugin-prettier": "^5.1.3",
"lucide-react": "0.323.0",
"next": "^14.1.0",
"next-themes": "^0.2.1",
"react": "^18.2.0",
"eslint-plugin-prettier": "^5.2.1",
"lucide-react": "0.436.0",
"next": "^14.2.7",
"next-themes": "^0.3.0",
"react": "^18.3.1",
"react-dnd": "^16.0.1",
"react-dnd-html5-backend": "^16.0.1",
"react-dom": "^18.2.0",
"slate": "0.102.0",
"slate-history": "0.100.0",
"react-dom": "^18.3.1",
"slate": "0.103.0",
"slate-history": "0.109.0",
"slate-hyperscript": "0.100.0",
"slate-react": "0.102.0",
"tailwind-merge": "2.2.1",
"slate-react": "0.109.0",
"tailwind-merge": "2.5.2",
"tailwindcss-animate": "1.0.7"
},
"devDependencies": {
"@ianvs/prettier-plugin-sort-imports": "^4.1.1",
"@types/node": "^20.11.16",
"@types/react": "^18.2.55",
"@types/react-dom": "^18.2.18",
"@typescript-eslint/parser": "^6.21.0",
"autoprefixer": "^10.4.17",
"@ianvs/prettier-plugin-sort-imports": "^4.3.1",
"@types/node": "^22.5.1",
"@types/react": "^18.3.4",
"@types/react-dom": "^18.3.0",
"@typescript-eslint/parser": "^8.3.0",
"autoprefixer": "^10.4.20",
"encoding": "^0.1.13",
"eslint": "^8.56.0",
"eslint-config-next": "14.1.0",
"eslint-config-next": "14.2.7",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-tailwindcss": "^3.14.2",
"eslint-plugin-unused-imports": "^3.0.0",
"postcss": "^8.4.34",
"prettier": "^3.2.5",
"tailwindcss": "^3.4.1",
"typescript": "5.4.2"
"eslint-plugin-react": "^7.35.0",
"eslint-plugin-tailwindcss": "^3.17.4",
"eslint-plugin-unused-imports": "^4.1.3",
"postcss": "^8.4.41",
"prettier": "^3.3.3",
"tailwindcss": "^3.4.10",
"typescript": "5.5.4"
},
"packageManager": "pnpm@8.6.1",
"packageManager": "pnpm@9.2.0",
"pnpm": {
"peerDependencyRules": {
"allowAny": [
Expand Down
Loading

0 comments on commit df3b232

Please sign in to comment.