Skip to content

Commit df365e4

Browse files
authored
Merge pull request #4842 from electroluxcode/chore/pnpm
2 parents 3732040 + 2bd0f49 commit df365e4

File tree

140 files changed

+22891
-23277
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+22891
-23277
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
**Checklist**
22

3-
- [x] `yarn typecheck`
4-
- [x] `yarn lint:fix`
5-
- [x] `yarn test`
6-
- [x] `yarn brl`
7-
- [x] `yarn changeset`
3+
- [x] `pnpm typecheck`
4+
- [x] `pnpm lint:fix`
5+
- [x] `pnpm test`
6+
- [x] `pnpm brl`
7+
- [x] `pnpm changeset`
88
- [x] [ui changelog](docs/components/changelog.mdx)
99

1010
<!--
1111
1212
Thanks for the PR. Please complete the checklist below to ensure your PR can be
1313
merged as soon as possible.
1414
15-
- yarn brl: Required if adding, moving or removing a file in a package.
16-
- yarn changeset: Required if updating `packages`. Please be brief and descriptive. For breaking
15+
- pnpm brl: Required if adding, moving or removing a file in a package.
16+
- pnpm changeset: Required if updating `packages`. Please be brief and descriptive. For breaking
1717
changes, use a major changeset. For new features, use a minor changeset. For
1818
bug fixes, use a patch changeset.
1919
- changelog: Required if updating `apps/www/src/registry`. See `apps/www/src/registry/components/changelog.mdx`.
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
########################################################################################
2+
# "pnpm install" composite action for pnpm workspaces #
3+
########################################################################################
4+
5+
name: 'Monorepo install (pnpm)'
6+
description: 'Run pnpm install with cache enabled'
7+
inputs:
8+
cwd:
9+
description: "Changes node's process.cwd() if the project is not located on the root"
10+
required: false
11+
default: '.'
12+
cache-prefix:
13+
description: 'Add a specific cache-prefix'
14+
required: false
15+
default: 'default'
16+
17+
runs:
18+
using: 'composite'
19+
20+
steps:
21+
- name: ⚙️ Install pnpm
22+
uses: pnpm/action-setup@v4
23+
24+
- name: ⚙️ Setup Node.js
25+
uses: actions/setup-node@v4
26+
with:
27+
node-version: 22
28+
cache: 'pnpm'
29+
30+
- name: 📥 Install dependencies
31+
shell: bash
32+
working-directory: ${{ inputs.cwd }}
33+
run: pnpm install --frozen-lockfile
34+
env:
35+
HUSKY: '0'

.github/workflows/ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ on:
99
- 'packages/**'
1010
- '.github/actions/**'
1111
- '.github/workflows/lint-typecheck.yml'
12-
- '.yarnrc.yml'
13-
- 'yarn.lock'
12+
- 'pnpm-workspace.yaml'
13+
- 'pnpm-lock.yaml'
1414
- 'biome.jsonc'
1515
- 'eslint*'
1616
- 'bunfig.toml'
@@ -28,8 +28,8 @@ on:
2828
- 'packages/**'
2929
- '.github/actions/**'
3030
- '.github/workflows/**'
31-
- '.yarnrc.yml'
32-
- 'yarn.lock'
31+
- 'pnpm-workspace.yaml'
32+
- 'pnpm-lock.yaml'
3333
- 'biome.jsonc'
3434
- 'eslint*'
3535
- 'bunfig.toml'
@@ -65,27 +65,27 @@ jobs:
6565
bun-version: latest
6666

6767
- name: 📥 Monorepo install
68-
uses: ./.github/actions/yarn-nm-install
68+
uses: ./.github/actions/pnpm-install
6969

7070
- name: 🔬 Lint
71-
run: yarn lint
71+
run: pnpm lint
7272

7373
- name: ♻️ Restore packages cache
7474
uses: actions/cache@v4
7575
with:
7676
path: |
7777
${{ github.workspace }}/.cache
7878
${{ github.workspace }}/**/tsconfig.tsbuildinfo
79-
key: packages-cache-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
79+
key: packages-cache-${{ runner.os }}-${{ hashFiles('pnpm-lock.yaml') }}
8080

8181
- name: 🏗 Build
82-
run: yarn build
82+
run: pnpm build
8383

8484
- name: 🕵️ Typecheck
85-
run: yarn typecheck
85+
run: pnpm typecheck
8686

8787
- name: 🧪 Test
88-
run: yarn test
88+
run: pnpm test
8989

9090
# - name: 📥 Install Playwright dependencies
9191
# run: |

.github/workflows/registry.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@ jobs:
2727
node-version: 22
2828

2929
- name: 📥 Monorepo install
30-
uses: ./.github/actions/yarn-nm-install
30+
uses: ./.github/actions/pnpm-install
3131

3232
- name: ♻️ Restore packages cache
3333
uses: actions/cache@v4
3434
with:
3535
path: |
3636
${{ github.workspace }}/.cache
3737
${{ github.workspace }}/**/tsconfig.tsbuildinfo
38-
key: packages-cache-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
38+
key: packages-cache-${{ runner.os }}-${{ hashFiles('pnpm-lock.yaml') }}
3939

4040
- name: 🏗 Build Registry
41-
run: yarn r && yarn build:tw
41+
run: pnpm build:registry && pnpm build:tw
4242

4343
- name: ◻️ Create Pull Request
4444
uses: peter-evans/create-pull-request@v4

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
node-version: 22
2525

2626
- name: 📦 Monorepo install
27-
uses: ./.github/actions/yarn-nm-install
27+
uses: ./.github/actions/pnpm-install
2828

2929
# @link https://github.com/changesets/action
3030
- name: 🦋 Create Release Pull Request or Publish
@@ -33,7 +33,7 @@ jobs:
3333
with:
3434
cwd: ${{ github.workspace }}
3535
title: '[Release] Version packages'
36-
publish: yarn release
36+
publish: pnpm release
3737
env:
3838
# See https://github.com/changesets/action/issues/147
3939
HOME: ${{ github.workspace }}

.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

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

.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

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

.yarn/releases/yarn-4.12.0.cjs

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

.yarnrc.yml

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

apps/www/package.json

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,17 @@
55
"description": "Plate documentation website",
66
"type": "module",
77
"scripts": {
8-
"prebuild": "yarn build:contentlayer",
9-
"build": "yarn prebuild && yarn r && NODE_OPTIONS='--max-old-space-size=8192' next build",
8+
"prebuild": "pnpm build:contentlayer",
9+
"build": "pnpm prebuild && pnpm build:registry && next build",
1010
"build:contentlayer": "contentlayer2 build",
11-
"build:registry": "NODE_ENV=production tsx --tsconfig ./scripts/tsconfig.scripts.json scripts/build-registry.mts",
12-
"build:tw": "yarn tailwindcss -i ./src/app/globals.css -o ./public/tailwind.css --minify",
13-
"dev": "concurrently \"contentlayer2 dev\" \"next dev\" \"PORT=4444 node ../../node_modules/y-webrtc/bin/server.js\"",
14-
"lint": "yarn p:lint",
15-
"lint:fix": "yarn p:lint:fix",
11+
"build:registry": "tsx --tsconfig ./scripts/tsconfig.scripts.json scripts/build-registry.mts",
12+
"build:tw": "pnpm tailwindcss -i ./src/styles/globals.css -o ./public/tailwind.css --minify",
13+
"dev": "concurrently \"contentlayer2 dev\" \"next dev\"",
14+
"lint": "npx eslint . --ext .js,.jsx,.ts,.tsx",
15+
"lint:debug": "TIMING=1 DEBUG=eslint:cli-engine pnpm lint:fix",
16+
"lint:fix": "pnpm lint --fix",
1617
"preview": "next build && next start",
17-
"r": "concurrently \"yarn build:registry\" \"yarn build:tw\"",
18+
"r": "concurrently \"pnpm build:registry\" \"pnpm build:tw\"",
1819
"rc": "concurrently \"contentlayer2 dev\" \"next dev\" \"PORT=4444 node ../../node_modules/y-webrtc/bin/server.js\"",
1920
"rd": "NODE_ENV=development tsx --tsconfig ./scripts/tsconfig.scripts.json scripts/build-registry.mts",
2021
"registry:capture": "tsx --tsconfig ./scripts/tsconfig.scripts.json ./scripts/capture-registry.mts",
@@ -23,9 +24,8 @@
2324
"shadcn:dev": "shadcn build public/rd/registry.json --output public/rd",
2425
"shadcn:dev:docs": "shadcn build public/rd/registry-docs.json --output public/rd",
2526
"start": "next start",
26-
"test:r": "tsx --tsconfig ./scripts/tsconfig.scripts.json ./scripts/test-registry.mts",
27-
"typecheck": "yarn prebuild && tsc --noEmit",
28-
"typecheck:watch": "yarn typecheck --watch"
27+
"typecheck": "pnpm prebuild && tsc --noEmit",
28+
"typecheck:watch": "pnpm typecheck --watch"
2929
},
3030
"browserslist": {
3131
"production": [
@@ -39,6 +39,10 @@
3939
"last 1 safari version"
4040
]
4141
},
42+
"resolutions": {
43+
"react": "^18.3.1",
44+
"react-dom": "^18.3.1"
45+
},
4246
"dependencies": {
4347
"@ai-sdk/gateway": "^3.0.0",
4448
"@ai-sdk/google": "^3.0.0",
@@ -92,6 +96,7 @@
9296
"@platejs/test-utils": "workspace:^",
9397
"@platejs/toc": "workspace:^",
9498
"@platejs/toggle": "workspace:^",
99+
"@platejs/yjs": "workspace:^",
95100
"@radix-ui/react-accordion": "1.2.11",
96101
"@radix-ui/react-alert-dialog": "1.1.14",
97102
"@radix-ui/react-aspect-ratio": "1.1.7",
@@ -124,6 +129,7 @@
124129
"ai": "^6.0.0",
125130
"babel-plugin-react-compiler": "1.0.0",
126131
"class-variance-authority": "0.7.1",
132+
"clsx": "^2.1.1",
127133
"cmdk": "1.1.1",
128134
"contentlayer2": "0.4.6",
129135
"crypto-browserify": "3.12.1",
@@ -138,7 +144,8 @@
138144
"lodash": "4.17.21",
139145
"lowlight": "3.3.0",
140146
"lucide-react": "0.514.0",
141-
"next": "16.0.10",
147+
"nanoid": "^5.1.6",
148+
"next": "16.1.6",
142149
"next-contentlayer2": "0.4.6",
143150
"next-themes": "0.4.6",
144151
"node-fetch": "3.3.2",
@@ -147,6 +154,7 @@
147154
"platejs": "workspace:^",
148155
"prismjs": "1.30.0",
149156
"react": "19.2.3",
157+
"react-compiler-runtime": "^1.0.0",
150158
"react-day-picker": "8.10.1",
151159
"react-dnd": "16.0.1",
152160
"react-dnd-html5-backend": "16.0.1",
@@ -166,6 +174,7 @@
166174
"sass": "1.89.2",
167175
"shadcn": "2.6.3",
168176
"shadcn-prose": "1.0.8",
177+
"slate": "0.120.0",
169178
"sonner": "2.0.5",
170179
"stream-browserify": "3.0.0",
171180
"tailwind-merge": "3.3.1",
@@ -183,6 +192,7 @@
183192
"autoprefixer": "10.4.21",
184193
"concurrently": "9.1.2",
185194
"glob": "11.0.2",
195+
"gray-matter": "^4.0.3",
186196
"kleur": "4.1.5",
187197
"listr2": "8.3.3",
188198
"mdast-util-toc": "7.1.0",

0 commit comments

Comments
 (0)