Skip to content

Commit dd572ef

Browse files
ivasilovivasilov
authored
chore: Switch repo to use pnpm (supabase#29928)
* Fix some missing and duplicate dependencies. * Fix the types for jest in ai-commands package. * Replace all npm commands with pnpm. Add pnpm files and workspace links. * Fix rimraf to work with pnpm. * Refactor the github actions to work with pnpm. * Delete package-lock.json. * Fix the tailwind configs to not include node_modules. * Fix random files. * Add preinstall scripts to all packages. * Fix the Dockerfile to work with pnpm. * Update the DEVELOPERS documentation.
1 parent 8166551 commit dd572ef

Some content is hidden

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

50 files changed

+28372
-43798
lines changed

‎.github/workflows/ai-tests.yml

+9-4
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,19 @@ jobs:
3333
with:
3434
sparse-checkout: |
3535
packages
36+
- uses: pnpm/action-setup@v4
37+
name: Install pnpm
38+
with:
39+
version: 9.10.0
40+
run_install: false
3641
- name: Use Node.js
3742
uses: actions/setup-node@v4
3843
with:
3944
node-version-file: '.nvmrc'
40-
cache: 'npm'
45+
cache: 'pnpm'
4146
- name: Install deps
42-
run: npm ci
47+
run: pnpm i
4348
- name: Type check
44-
run: npm run typecheck
49+
run: pnpm run typecheck
4550
- name: Run tests
46-
run: npm run test
51+
run: pnpm run test

‎.github/workflows/autofix_linters.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,21 @@ jobs:
2323
sparse-checkout: apps
2424
ref: ${{ github.head_ref }}
2525

26+
- uses: pnpm/action-setup@v4
27+
name: Install pnpm
28+
with:
29+
version: 9.10.0
30+
run_install: false
31+
2632
- uses: actions/setup-node@v4
2733
with:
2834
node-version-file: '.nvmrc'
2935

3036
- name: Install required dependencies
31-
run: npm ci
37+
run: pnpm i
3238

3339
- name: Run Prettier in fix mode
34-
run: npm run format
40+
run: pnpm run format
3541

3642
- name: Commit changes and push to existing branch
3743
run: |

‎.github/workflows/avoid-typos.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
exclude: |
2626
*.css
2727
**/package.json
28-
**/package-lock.json
28+
**/pnpm-lock.yaml
2929
./.git/*
3030
*.ipynb
3131
./i18n/README.*.md

‎.github/workflows/docs-last-changed.yml

+9-3
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,26 @@ jobs:
2626
sparse-checkout: |
2727
apps/docs
2828
29+
- uses: pnpm/action-setup@v4
30+
name: Install pnpm
31+
with:
32+
version: 9.10.0
33+
run_install: false
34+
2935
- name: Setup node
3036
uses: actions/setup-node@v4
3137
with:
3238
node-version-file: '.nvmrc'
3339

3440
- name: Download dependencies
35-
run: npm ci
41+
run: pnpm i
3642

3743
- name: Update last-changed dates
3844
working-directory: ./apps/docs
3945
if: ${{ !inputs.reset }}
40-
run: npm run last-changed
46+
run: pnpm run last-changed
4147

4248
- name: Reset last-changed dates
4349
working-directory: ./apps/docs
4450
if: ${{ inputs.reset }}
45-
run: npm run last-changed:reset
51+
run: pnpm run last-changed:reset

‎.github/workflows/docs-mgmt-api-update.yml

+34-28
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,37 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@v4
15-
with:
16-
ref: master
17-
sparse-checkout: |
18-
apps/docs
19-
20-
- name: Use Node.js
21-
uses: actions/setup-node@v4
22-
with:
23-
node-version-file: '.nvmrc'
24-
cache: 'npm'
25-
26-
- name: Install deps
27-
run: npm ci
28-
29-
- name: Change to apps/docs/spec directory and run make command
30-
working-directory: apps/docs/spec
31-
run: make download.api.v1 dereference.api.v1 generate.sections.api.v1 format
32-
33-
- name: Create pull request
34-
uses: peter-evans/create-pull-request@v6
35-
with:
36-
token: ${{ secrets.GITHUB_TOKEN }}
37-
commit-message: 'feat: update mgmt api docs'
38-
title: 'feat: update mgmt api docs'
39-
body: 'This PR updates mgmt api docs automatically.'
40-
branch: 'gha/auto-update-mgmt-api-docs'
41-
base: 'master'
14+
- uses: actions/checkout@v4
15+
with:
16+
ref: master
17+
sparse-checkout: |
18+
apps/docs
19+
20+
- uses: pnpm/action-setup@v4
21+
name: Install pnpm
22+
with:
23+
version: 9.10.0
24+
run_install: false
25+
26+
- name: Use Node.js
27+
uses: actions/setup-node@v4
28+
with:
29+
node-version-file: '.nvmrc'
30+
cache: 'pnpm'
31+
32+
- name: Install deps
33+
run: pnpm i
34+
35+
- name: Change to apps/docs/spec directory and run make command
36+
working-directory: apps/docs/spec
37+
run: make download.api.v1 dereference.api.v1 generate.sections.api.v1 format
38+
39+
- name: Create pull request
40+
uses: peter-evans/create-pull-request@v6
41+
with:
42+
token: ${{ secrets.GITHUB_TOKEN }}
43+
commit-message: 'feat: update mgmt api docs'
44+
title: 'feat: update mgmt api docs'
45+
body: 'This PR updates mgmt api docs automatically.'
46+
branch: 'gha/auto-update-mgmt-api-docs'
47+
base: 'master'

‎.github/workflows/docs-tests-smoke.yml

+9-3
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,20 @@ jobs:
2222
apps/docs
2323
packages
2424
25+
- uses: pnpm/action-setup@v4
26+
name: Install pnpm
27+
with:
28+
version: 9.10.0
29+
run_install: false
30+
2531
- name: Use Node.js
2632
uses: actions/setup-node@v4
2733
with:
2834
node-version-file: '.nvmrc'
29-
cache: 'npm'
35+
cache: 'pnpm'
3036

3137
- name: Install deps
32-
run: npm ci
38+
run: pnpm i
3339

3440
- name: Run tests
35-
run: npm --prefix="apps/docs" run test:smoke
41+
run: pnpm --prefix="apps/docs" run test:smoke

‎.github/workflows/docs-tests.yml

+9-3
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,20 @@ jobs:
2323
examples
2424
packages
2525
26+
- uses: pnpm/action-setup@v4
27+
name: Install pnpm
28+
with:
29+
version: 9.10.0
30+
run_install: false
31+
2632
- name: Use Node.js
2733
uses: actions/setup-node@v4
2834
with:
2935
node-version-file: '.nvmrc'
30-
cache: 'npm'
36+
cache: 'pnpm'
3137

3238
- name: Install deps
33-
run: npm ci
39+
run: pnpm i
3440

3541
- name: Run tests
36-
run: npm run test:docs
42+
run: pnpm run test:docs

‎.github/workflows/playwright.yml

+11-6
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ on:
44
branches: [master]
55
paths:
66
- 'apps/studio/**'
7-
- 'package-lock.json'
7+
- 'pnpm-lock.yaml'
88
pull_request:
99
branches: [master]
1010
paths:
1111
- 'apps/studio/**'
12-
- 'package-lock.json'
12+
- 'pnpm-lock.yaml'
1313

1414
# Cancel old builds on new commit for same workflow + branch/PR
1515
concurrency:
@@ -23,18 +23,23 @@ jobs:
2323

2424
steps:
2525
- uses: actions/checkout@v4
26+
- uses: pnpm/action-setup@v4
27+
name: Install pnpm
28+
with:
29+
version: 9.10.0
30+
run_install: false
2631
- name: Use Node.js
2732
uses: actions/setup-node@v4
2833
with:
2934
node-version-file: '.nvmrc'
30-
cache: 'npm'
35+
cache: 'pnpm'
3136
- uses: supabase/setup-cli@v1
3237
- name: Install dependencies
33-
run: npm ci
38+
run: pnpm i
3439
- name: Install Playwright Browsers
35-
run: npx playwright install --with-deps
40+
run: pnpm -C playwright-tests exec playwright install --with-deps
3641
- name: Run Playwright tests
37-
run: npm run test:playwright
42+
run: pnpm run test:playwright
3843
# mark the action as succeeded even if the tests failed. This is temporarily until we make the tests more stable.
3944
# continue-on-error: true
4045
- uses: actions/upload-artifact@v4

‎.github/workflows/prettier.yml

+28-13
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,22 @@ jobs:
1818
uses: actions/checkout@v4
1919
with:
2020
sparse-checkout: apps
21+
- uses: pnpm/action-setup@v4
22+
name: Install pnpm
23+
with:
24+
version: 9.10.0
25+
run_install: false
2126
- name: Setup node
2227
uses: actions/setup-node@v4
2328
with:
2429
node-version-file: '.nvmrc'
25-
# Installing all dependencies takes up to three minutes, hacking around to only installing prettier+deps
30+
cache: 'pnpm'
2631
- name: Download dependencies
2732
run: |
28-
npm ci
33+
pnpm i
2934
- name: Run prettier
3035
run: |-
31-
npm run test:prettier
36+
pnpm run test:prettier
3237
3338
# i18n is not a node package, so we handle that one separately
3439
format-i18n:
@@ -39,19 +44,22 @@ jobs:
3944
with:
4045
sparse-checkout: |
4146
i18n
47+
- uses: pnpm/action-setup@v4
48+
name: Install pnpm
49+
with:
50+
version: 9.10.0
51+
run_install: false
4252
- name: Setup node
4353
uses: actions/setup-node@v4
4454
with:
4555
node-version-file: '.nvmrc'
46-
# Installing all dependencies takes up to three minutes, hacking around to only installing prettier+deps
56+
cache: 'pnpm'
4757
- name: Download dependencies
4858
run: |
49-
rm package.json
50-
rm package-lock.json
51-
npm i [email protected] prettier-plugin-sql-cst
59+
pnpm i
5260
- name: Run prettier
5361
run: |-
54-
npx prettier -c 'i18n/**/*.{js,jsx,ts,tsx,css,md,mdx,json}'
62+
pnpm exec prettier -c 'i18n/**/*.{js,jsx,ts,tsx,css,md,mdx,json}'
5563
5664
format-sql:
5765
runs-on: ubuntu-latest
@@ -62,13 +70,20 @@ jobs:
6270
sparse-checkout: |
6371
apps/docs/pages
6472
apps/docs/content
65-
# Installing all dependencies takes up to three minutes, hacking around to only installing prettier+deps
73+
- uses: pnpm/action-setup@v4
74+
name: Install pnpm
75+
with:
76+
version: 9.10.0
77+
run_install: false
78+
- name: Setup node
79+
uses: actions/setup-node@v4
80+
with:
81+
node-version-file: '.nvmrc'
82+
cache: 'pnpm'
6683
- name: Download dependencies
6784
run: |
68-
rm package.json
69-
rm package-lock.json
70-
npm i [email protected] prettier-plugin-sql-cst
85+
pnpm i
7186
- name: Run prettier
7287
run: |-
7388
# Check mdx files which contain sql code blocks
74-
grep -lr '```sql' apps/docs/{pages,content}/**/*.mdx | xargs npx prettier -c
89+
grep -lr '```sql' apps/docs/{pages,content}/**/*.mdx | xargs pnpm exec prettier -c

‎.github/workflows/search.yml

+9-3
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,19 @@ jobs:
3838
apps/www/.env.local.example
3939
supabase
4040
41+
- uses: pnpm/action-setup@v4
42+
name: Install pnpm
43+
with:
44+
version: 9.10.0
45+
run_install: false
46+
4147
- name: Setup node
4248
uses: actions/setup-node@v4
4349
with:
4450
node-version-file: '.nvmrc'
4551

4652
- name: Download dependencies
47-
run: npm ci
53+
run: pnpm i
4854

4955
# Need the miscellaneous use API, which is available publicly (by design) in www
5056
- name: Copy environment variables
@@ -53,9 +59,9 @@ jobs:
5359
- name: Update embeddings
5460
working-directory: ./apps/docs
5561
if: ${{ !inputs.refresh }}
56-
run: npm run embeddings
62+
run: pnpm run embeddings
5763

5864
- name: Refresh embeddings
5965
working-directory: ./apps/docs
6066
if: ${{ inputs.refresh }}
61-
run: npm run embeddings:refresh
67+
run: pnpm run embeddings:refresh

‎.github/workflows/studio-tests.yml

+10-5
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ on:
88
branches: [master, studio]
99
paths:
1010
- 'apps/studio/**'
11-
- 'package-lock.json'
11+
- 'pnpm-lock.yaml'
1212
pull_request:
1313
branches: [master, studio]
1414
paths:
1515
- 'apps/studio/**'
16-
- 'package-lock.json'
16+
- 'pnpm-lock.yaml'
1717

1818
# Cancel old builds on new commit for same workflow + branch/PR
1919
concurrency:
@@ -31,17 +31,22 @@ jobs:
3131
sparse-checkout: |
3232
apps/studio
3333
packages
34+
- uses: pnpm/action-setup@v4
35+
name: Install pnpm
36+
with:
37+
version: 9.10.0
38+
run_install: false
3439
- name: Use Node.js
3540
uses: actions/setup-node@v4
3641
with:
3742
node-version-file: '.nvmrc'
38-
cache: 'npm'
43+
cache: 'pnpm'
3944
- name: Install deps
40-
run: npm ci
45+
run: pnpm i
4146
working-directory: ./
4247
- name: Run Tests
4348
env:
4449
# Default is 2 GB, increase to have less frequent OOM errors
4550
NODE_OPTIONS: '--max_old_space_size=3072'
46-
run: npm run test:studio
51+
run: pnpm run test:studio
4752
working-directory: ./

0 commit comments

Comments
 (0)