Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
zbeyens committed Dec 27, 2023
1 parent 6522c1a commit 630e162
Show file tree
Hide file tree
Showing 16 changed files with 1,179 additions and 1,100 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ module.exports = {
},
settings: {
tailwindcss: {
callees: ['cn'],
callees: ['cn', 'cva', 'withCn'],
config: 'tailwind.config.js',
},
next: {
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
jobs:
build:
name: ${{ matrix.command }}
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v3
Expand Down Expand Up @@ -50,5 +50,5 @@ jobs:
run: pnpm install

# Lint, typecheck, build
- name: Build
- name: 🏗 Run build
run: pnpm build
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Playground Template

A minimal template for building rich-text editors with [Plate](https://platejs.org/) and Next.js 13.
A minimal template for building rich-text editors with [Plate](https://platejs.org/) and Next.js 14.

## Usage

Expand All @@ -10,7 +10,7 @@ pnpm create next-app -e https://github.com/udecode/plate-template

## Features

- Next.js 13 App Directory
- Next.js 14 App Directory
- [Plate](https://platejs.org/) Editor
- [shadcn/ui](https://ui.shadcn.com/)
- Radix UI Primitives
Expand Down
5 changes: 2 additions & 3 deletions components.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"cssVariables": true
},
"aliases": {
"components": "@/components",
"utils": "@/lib/utils"
"components": "@/components"
}
}
}
46 changes: 23 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,41 +13,41 @@
},
"dependencies": {
"@radix-ui/react-slot": "^1.0.2",
"@radix-ui/react-tooltip": "^1.0.6",
"@udecode/plate-common": "^24.3.5",
"@radix-ui/react-tooltip": "^1.0.7",
"@udecode/cn": "^29.0.0",
"@udecode/plate-common": "^29.0.0",
"class-variance-authority": "0.7.0",
"clsx": "2.0.0",
"eslint-plugin-prettier": "^5.0.0",
"lucide-react": "0.279.0",
"next": "^13.4.19",
"eslint-plugin-prettier": "^5.1.2",
"lucide-react": "0.302.0",
"next": "^14.0.4",
"next-themes": "^0.2.1",
"react": "^18.2.0",
"react-dnd": "^16.0.1",
"react-dnd-html5-backend": "^16.0.1",
"react-dom": "^18.2.0",
"slate": "0.94.1",
"slate-history": "0.93.0",
"slate-react": "0.99.0",
"tailwind-merge": "1.14.0",
"slate": "0.101.5",
"slate-history": "0.100.0",
"slate-react": "0.101.5",
"tailwind-merge": "2.2.0",
"tailwindcss-animate": "1.0.7"
},
"devDependencies": {
"@ianvs/prettier-plugin-sort-imports": "^4.1.0",
"@types/node": "^20.6.2",
"@types/react": "^18.2.21",
"@types/react-dom": "^18.2.7",
"@typescript-eslint/parser": "^6.7.0",
"autoprefixer": "^10.4.15",
"@ianvs/prettier-plugin-sort-imports": "^4.1.1",
"@types/node": "^20.10.5",
"@types/react": "^18.2.45",
"@types/react-dom": "^18.2.18",
"@typescript-eslint/parser": "^6.16.0",
"autoprefixer": "^10.4.16",
"encoding": "^0.1.13",
"eslint": "^8.49.0",
"eslint-config-next": "13.4.19",
"eslint-config-prettier": "^9.0.0",
"eslint": "^8.56.0",
"eslint-config-next": "14.0.4",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-tailwindcss": "^3.13.0",
"eslint-plugin-unused-imports": "^3.0.0",
"postcss": "^8.4.29",
"prettier": "^3.0.3",
"tailwindcss": "^3.3.3",
"typescript": "5.2.2"
"postcss": "^8.4.32",
"prettier": "^3.1.1",
"tailwindcss": "^3.4.0",
"typescript": "5.3.3"
}
}
Loading

0 comments on commit 630e162

Please sign in to comment.