Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
cd56ab1
pnpm lockfile
joshuarli May 8, 2025
b172a90
pnpm lockfile for api-docs
joshuarli May 8, 2025
39202de
s/yarn.lock/pnpm-lock.yaml
joshuarli May 8, 2025
dae0769
yarn install -> pnpm install
joshuarli May 8, 2025
93a952a
replace all yarn invocations with pnpm analogues
joshuarli May 8, 2025
835dd10
hoist
joshuarli May 8, 2025
9f98253
install pnpm in actions
joshuarli May 8, 2025
d69db7d
.
joshuarli May 8, 2025
776b6e2
:hammer_and_wrench: apply pre-commit fixes
getsantry[bot] May 8, 2025
57779bb
shame
joshuarli May 8, 2025
b3f9efc
Merge remote-tracking branch 'origin' into yarn-to-pnpm
joshuarli May 8, 2025
5fd3fc0
Revert "shame"
joshuarli May 8, 2025
7951c15
shamefully hoist
joshuarli May 8, 2025
6b46e86
:hammer_and_wrench: apply pre-commit fixes
getsantry[bot] May 8, 2025
9f44fdd
.
joshuarli May 8, 2025
e0ffa11
.
joshuarli May 8, 2025
a4d54f2
.
joshuarli May 8, 2025
16c3ac7
[skip ci] install pnpm
joshuarli May 28, 2025
0686bd6
Merge remote-tracking branch 'origin' into yarn-to-pnpm
joshuarli May 29, 2025
d2ebd73
Merge remote-tracking branch 'origin' into yarn-to-pnpm
joshuarli May 29, 2025
39399bc
updated lockfile
joshuarli May 29, 2025
9465d47
Merge remote-tracking branch 'origin' into yarn-to-pnpm
joshuarli May 29, 2025
a606bab
update gha
joshuarli May 29, 2025
0ff9d03
remerge but will need to regen lockfile
joshuarli May 29, 2025
34f8b95
Merge remote-tracking branch 'origin' into yarn-to-pnpm
joshuarli May 30, 2025
7b1f976
Merge remote-tracking branch 'origin' into yarn-to-pnpm
joshuarli May 30, 2025
aad4abc
update lockfile
joshuarli May 30, 2025
f408dd1
:hammer_and_wrench: apply pre-commit fixes
getsantry[bot] May 30, 2025
f44fdea
no tsc during prpd builds
joshuarli May 30, 2025
1c41f2a
fix: test-api-docs already installs
joshuarli May 30, 2025
468352d
[skip ci]
joshuarli May 30, 2025
5edda4a
fix for jest
joshuarli Jun 2, 2025
bcea78c
Merge remote-tracking branch 'origin' into yarn-to-pnpm
joshuarli Jun 2, 2025
44de0fc
regen lockfile
joshuarli Jun 2, 2025
868c671
Merge remote-tracking branch 'origin' into yarn-to-pnpm
joshuarli Jun 2, 2025
4a1d132
update lockfile
joshuarli Jun 2, 2025
dd85131
fixes
joshuarli Jun 2, 2025
6048d74
:hammer_and_wrench: apply pre-commit fixes
getsantry[bot] Jun 2, 2025
531ae02
.
joshuarli Jun 2, 2025
a9300ae
Merge remote-tracking branch 'origin' into yarn-to-pnpm
joshuarli Jun 2, 2025
dd1cb10
feedback
joshuarli Jun 2, 2025
79ba766
clean
joshuarli Jun 2, 2025
d25f961
pin
joshuarli Jun 3, 2025
f4e1ee4
[skip ci] disable use-store for prod builds
joshuarli Jun 3, 2025
e781faf
[skip ci] use-store isnt a thing anymore, do this
joshuarli Jun 3, 2025
728db5f
Merge remote-tracking branch 'origin' into yarn-to-pnpm
joshuarli Jun 3, 2025
5516bec
update lockfile
joshuarli Jun 3, 2025
7b97541
:hammer_and_wrench: apply pre-commit fixes
getsantry[bot] Jun 3, 2025
0300eca
Merge remote-tracking branch 'origin' into yarn-to-pnpm
joshuarli Jun 3, 2025
54b03f2
prod needs to still build with yarn for stage1 of 3 rollout
joshuarli Jun 3, 2025
4739df3
pnpm action setup needs explicit version without packageManager
joshuarli Jun 3, 2025
a862a6b
pc
joshuarli Jun 3, 2025
5625ca6
switch prod build over to pnpm
joshuarli Jun 3, 2025
0d204a0
fix
joshuarli Jun 3, 2025
69d8f24
update lockfile
joshuarli Jun 4, 2025
1924c72
Merge remote-tracking branch 'origin' into yarn-to-pnpm
joshuarli Jun 4, 2025
5ea1b51
Merge branch 'yarn-to-pnpm' into yarn-to-pnpm-stage2
joshuarli Jun 4, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ tsconfig.* @getsentry/owners-js-bu
webpack.config.* @getsentry/owners-js-build
.volta.json @getsentry/owners-js-deps
package.json @getsentry/owners-js-deps
yarn.lock @getsentry/owners-js-deps
pnpm-lock.yaml @getsentry/owners-js-deps

## Design
/static/app/icons/ @getsentry/design
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/acceptance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ jobs:
with:
node-version-file: '.volta.json'

- uses: pnpm/action-setup@36de12bed180fa130ed56a35e7344f2fa7a820ab # v4
with:
version: 10.10.0

- name: Step configurations
id: config
run: |
Expand All @@ -84,18 +88,18 @@ jobs:
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
with:
path: ${{ steps.config.outputs.webpack-path }}
key: ${{ runner.os }}-v2-webpack-cache-${{ hashFiles('rspack.config.ts', 'yarn.lock', 'package.json') }}
key: ${{ runner.os }}-v2-webpack-cache-${{ hashFiles('rspack.config.ts', 'pnpm-lock.yaml', 'package.json') }}

- name: node_modules cache
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
id: nodemodulescache
with:
path: node_modules
key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock', 'api-docs/yarn.lock', '.volta.json') }}
key: ${{ runner.os }}-node-modules-${{ hashFiles('pnpm-lock.yaml', 'api-docs/pnpm-lock.yaml', '.volta.json') }}

- name: Install Javascript Dependencies
if: steps.nodemodulescache.outputs.cache-hit != 'true'
run: yarn install --frozen-lockfile
run: pnpm install --frozen-lockfile

- name: webpack
env:
Expand All @@ -104,7 +108,7 @@ jobs:
CODECOV_ENABLE_BA: ${{ needs.files-changed.outputs.frontend_all == 'true'}}
GH_COMMIT_SHA: ${{ github.event.pull_request.head.sha }}
run: |
yarn build-acceptance
pnpm run build-acceptance

- name: Build chartcuterie configuration module
run: |
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ jobs:
with:
node-version-file: '.volta.json'

- uses: pnpm/action-setup@36de12bed180fa130ed56a35e7344f2fa7a820ab # v4
with:
version: 10.10.0

- name: Setup sentry python env
uses: ./.github/actions/setup-sentry
id: setup
Expand All @@ -63,7 +67,7 @@ jobs:
# conflicting deps when running scripts locally
# see: https://github.com/getsentry/sentry/pull/32328/files
run: |
yarn add ts-node && make test-api-docs
pnpm add ts-node && make test-api-docs

- name: Inspect failure
if: failure()
Expand Down
48 changes: 32 additions & 16 deletions .github/workflows/frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,20 @@ jobs:
with:
node-version-file: '.volta.json'

- uses: pnpm/action-setup@36de12bed180fa130ed56a35e7344f2fa7a820ab # v4
with:
version: 10.10.0

- name: node_modules cache
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
id: nodemodulescache
with:
path: node_modules
key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock', 'api-docs/yarn.lock', '.volta.json') }}
key: ${{ runner.os }}-node-modules-${{ hashFiles('pnpm-lock.yaml', 'api-docs/pnpm-lock.yaml', '.volta.json') }}

- name: Install Javascript Dependencies
if: steps.nodemodulescache.outputs.cache-hit != 'true'
run: yarn install --frozen-lockfile
run: pnpm install --frozen-lockfile

# Setup custom tsc matcher, see https://github.com/actions/setup-node/issues/97
- name: setup matchers
Expand All @@ -71,7 +75,7 @@ jobs:

- name: tsc
id: tsc
run: yarn tsc -p tsconfig.json
run: pnpm exec tsc -p tsconfig.json

eslint:
if: needs.files-changed.outputs.frontend_all == 'true'
Expand All @@ -86,16 +90,20 @@ jobs:
with:
node-version-file: '.volta.json'

- uses: pnpm/action-setup@36de12bed180fa130ed56a35e7344f2fa7a820ab # v4
with:
version: 10.10.0

- name: node_modules cache
uses: actions/cache@v4.2.0
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
id: nodemodulescache
with:
path: node_modules
key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock', 'api-docs/yarn.lock', '.volta.json') }}
key: ${{ runner.os }}-node-modules-${{ hashFiles('pnpm-lock.yaml', 'api-docs/pnpm-lock.yaml', '.volta.json') }}

- name: Install Javascript Dependencies
if: steps.nodemodulescache.outputs.cache-hit != 'true'
run: yarn install --frozen-lockfile
run: pnpm install --frozen-lockfile

# Setup custom eslint matcher, see https://github.com/actions/setup-node/issues/97
- name: setup matchers
Expand All @@ -105,7 +113,7 @@ jobs:

- name: eslint
id: eslint
run: yarn run lint:js
run: pnpm run lint:js

knip:
if: needs.files-changed.outputs.frontend_all == 'true'
Expand All @@ -120,16 +128,20 @@ jobs:
with:
node-version-file: '.volta.json'

- uses: pnpm/action-setup@36de12bed180fa130ed56a35e7344f2fa7a820ab # v4
with:
version: 10.10.0

- name: node_modules cache
uses: actions/cache@v4.2.0
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
id: nodemodulescache
with:
path: node_modules
key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock', 'api-docs/yarn.lock', '.volta.json') }}
key: ${{ runner.os }}-node-modules-${{ hashFiles('pnpm-lock.yaml', 'api-docs/pnpm-lock.yaml', '.volta.json') }}

- name: Install Javascript Dependencies
if: steps.nodemodulescache.outputs.cache-hit != 'true'
run: yarn install --frozen-lockfile
run: pnpm install --frozen-lockfile

# Setup custom eslint matcher, see https://github.com/actions/setup-node/issues/97
- name: setup matchers
Expand All @@ -139,11 +151,11 @@ jobs:

- name: knip
id: knip
run: yarn run knip
run: pnpm run knip

- name: knip-prod
id: knip-prod
run: yarn run knip:prod
run: pnpm run knip:prod

frontend-jest-tests:
if: needs.files-changed.outputs.testable_rules_changed == 'true' || needs.files-changed.outputs.testable_modified == 'true'
Expand Down Expand Up @@ -171,16 +183,20 @@ jobs:
with:
node-version-file: '.volta.json'

- uses: pnpm/action-setup@36de12bed180fa130ed56a35e7344f2fa7a820ab # v4
with:
version: 10.10.0

- name: node_modules cache
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
id: nodemodulescache
with:
path: node_modules
key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock', 'api-docs/yarn.lock', '.volta.json') }}
key: ${{ runner.os }}-node-modules-${{ hashFiles('pnpm-lock.yaml', 'api-docs/pnpm-lock.yaml', '.volta.json') }}

- name: Install Javascript Dependencies
if: steps.nodemodulescache.outputs.cache-hit != 'true'
run: yarn install --frozen-lockfile
run: pnpm install --frozen-lockfile

- name: jest
env:
Expand All @@ -200,9 +216,9 @@ jobs:
DEBUG_PRINT_LIMIT: 0
run: |
if [ ${{ github.ref }} = 'refs/heads/master' ]; then
yarn test-ci --forceExit --coverage
pnpm run test-ci --forceExit --coverage
else
yarn test-ci --forceExit
pnpm run test-ci --forceExit
fi

# We only upload coverage data for FE changes since it conflicts with
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/jest-balance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,26 @@ jobs:
with:
node-version-file: '.volta.json'

- uses: pnpm/action-setup@36de12bed180fa130ed56a35e7344f2fa7a820ab # v4
with:
version: 10.10.0

- name: node_modules cache
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
id: nodemodulescache
with:
path: node_modules
key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock', 'api-docs/yarn.lock', '.volta.json') }}
key: ${{ runner.os }}-node-modules-${{ hashFiles('pnpm-lock.yaml', 'api-docs/pnpm-lock.yaml', '.volta.json') }}

- name: Install Javascript Dependencies
if: steps.nodemodulescache.outputs.cache-hit != 'true'
run: yarn install --frozen-lockfile
run: pnpm install --frozen-lockfile

- name: jest balancer
env:
GITHUB_PR_SHA: ${{ github.event.pull_request.head.sha || github.sha }}
GITHUB_PR_REF: ${{ github.event.pull_request.head.ref || github.ref }}
run: JEST_TEST_BALANCER=1 yarn test-ci
run: JEST_TEST_BALANCER=1 pnpm run test-ci

- name: Create Pull Request
uses: peter-evans/create-pull-request@b4d51739f96fca8047ad065eccef63442d8e99f7 # v4.2.0
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/openapi-diff.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,17 @@ jobs:
with:
node-version-file: '.volta.json'

- uses: pnpm/action-setup@36de12bed180fa130ed56a35e7344f2fa7a820ab # v4
with:
version: 10.10.0

- name: Build OpenAPI Derefed JSON
if: steps.changes.outputs.api_docs == 'true'
# install ts-node for ts build scripts to execute properly without potentially installing
# conflicting deps when running scripts locally
# see: https://github.com/getsentry/sentry/pull/32328/files
run: |
yarn add ts-node && make build-api-docs
pnpm add ts-node && make build-api-docs

- name: Compare OpenAPI Derefed JSON
if: steps.changes.outputs.api_docs == 'true'
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/openapi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,17 @@ jobs:
with:
node-version-file: '.volta.json'

- uses: pnpm/action-setup@36de12bed180fa130ed56a35e7344f2fa7a820ab # v4
with:
version: 10.10.0

- name: Build OpenAPI Derefed JSON
if: steps.changes.outputs.api_docs == 'true'
# install ts-node for ts build scripts to execute properly without potentially installing
# conflicting deps when running scripts locally
# see: https://github.com/getsentry/sentry/pull/32328/files
run: |
yarn add ts-node && make build-api-docs
pnpm add ts-node && make build-api-docs

- name: Build RPC method schema
if: steps.changes.outputs.api_docs == 'true'
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,20 @@ jobs:
with:
node-version-file: '.volta.json'

- uses: pnpm/action-setup@36de12bed180fa130ed56a35e7344f2fa7a820ab # v4
with:
version: 10.10.0

- name: node_modules cache
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
id: nodemodulescache
with:
path: node_modules
key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock', 'api-docs/yarn.lock', '.volta.json') }}
key: ${{ runner.os }}-node-modules-${{ hashFiles('pnpm-lock.yaml', 'api-docs/pnpm-lock.yaml', '.volta.json') }}

- name: Install Javascript Dependencies
if: steps.nodemodulescache.outputs.cache-hit != 'true'
run: yarn install --frozen-lockfile
run: pnpm install --frozen-lockfile

- uses: getsentry/action-setup-venv@3a832a9604b3e1a4202ae559248f26867b467cc7 # v2.1.1
with:
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/self-hosted.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ jobs:
with:
node-version-file: '.volta.json'

- uses: pnpm/action-setup@36de12bed180fa130ed56a35e7344f2fa7a820ab # v4
with:
version: 10.10.0

- uses: getsentry/action-setup-venv@3a832a9604b3e1a4202ae559248f26867b467cc7 # v2.1.1
with:
python-version: 3.13.1
Expand All @@ -52,11 +56,11 @@ jobs:
id: nodemodulescache
with:
path: node_modules
key: ${{ runner.os }}-self-hosted-node-modules-${{ hashFiles('yarn.lock', '.volta.json') }}
key: ${{ runner.os }}-self-hosted-node-modules-${{ hashFiles('pnpm-lock.yaml', '.volta.json') }}

- name: Install Javascript Dependencies
if: steps.nodemodulescache.outputs.cache-hit != 'true'
run: yarn install --frozen-lockfile --production
run: pnpm install --frozen-lockfile --production

- run: |
python3 -m tools.fast_editable --path .
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/sync-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,16 @@ jobs:
with:
node-version-file: '.volta.json'

- uses: pnpm/action-setup@36de12bed180fa130ed56a35e7344f2fa7a820ab # v4
with:
version: 10.10.0

- name: Install github-label-sync
run: yarn global add github-label-sync@2.2.0
run: pnpm add github-label-sync@2.2.0

- name: Run github-label-sync
run: |
github-label-sync \
pnpm exec github-label-sync \
--access-token ${{ secrets.GITHUB_TOKEN }} \
--labels .github/labels.yml \
${{ github.event_name == 'pull_request' && '--dry-run' || '' }} \
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ Gemfile.lock
coverage.xml
junit.xml
*.codestyle.xml
package-lock.json
.webpack.meta
pip-wheel-metadata/
Brewfile.lock.json
Expand All @@ -64,3 +63,5 @@ model-manifest.json
.yalc/
yalc.lock
ngrok.yml
package-lock.json
yarn.lock
3 changes: 2 additions & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
package-lock=false
lockfile=true
shamefully-hoist=true
2 changes: 1 addition & 1 deletion .vercelignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
!config
!config/tsconfig.build.json
!webpack.config.js
!yarn.lock
!pnpm-lock.yaml
!tests
!fixtures
!fixtures/integration-docs
Expand Down
3 changes: 1 addition & 2 deletions .volta.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"volta": {
"node": "22.11.0",
"yarn": "1.22.22"
"node": "22.11.0"
}
}
6 changes: 0 additions & 6 deletions .yarnrc

This file was deleted.

Loading
Loading