Skip to content

Commit 1975a88

Browse files
authored
Merge branch 'develop' into timfish/test/vitest-google
2 parents a12a493 + 00a1018 commit 1975a88

File tree

361 files changed

+9758
-3757
lines changed

Some content is hidden

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

361 files changed

+9758
-3757
lines changed

.craft.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@ targets:
111111
- name: npm
112112
id: '@sentry/tanstackstart'
113113
includeNames: /^sentry-tanstackstart-\d.*\.tgz$/
114+
- name: npm
115+
id: '@sentry/tanstackstart-react'
116+
includeNames: /^sentry-tanstackstart-react-\d.*\.tgz$/
114117
- name: npm
115118
id: '@sentry/gatsby'
116119
includeNames: /^sentry-gatsby-\d.*\.tgz$/
@@ -196,6 +199,8 @@ targets:
196199
onlyIfPresent: /^sentry-node-\d.*\.tgz$/
197200
'npm:@sentry/react':
198201
onlyIfPresent: /^sentry-react-\d.*\.tgz$/
202+
'npm:@sentry/react-router':
203+
onlyIfPresent: /^sentry-react-router-\d.*\.tgz$/
199204
'npm:@sentry/remix':
200205
onlyIfPresent: /^sentry-remix-\d.*\.tgz$/
201206
'npm:@sentry/solid':

.github/ISSUE_TEMPLATE/bug.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ body:
5050
- '@sentry/solidstart'
5151
- '@sentry/svelte'
5252
- '@sentry/sveltekit'
53+
- '@sentry/tanstackstart-react'
5354
- '@sentry/vue'
5455
- '@sentry/wasm'
5556
- Sentry Browser Loader

.github/actions/install-playwright/action.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ runs:
2323
with:
2424
path: |
2525
~/.cache/ms-playwright
26-
key: playwright-${{ runner.os }}-${{ steps.playwright-version.outputs.version }}
26+
# Bump the iteration when bumping runner images to use a new cache
27+
key: playwright-${{ runner.os }}-iteration-1-${{ steps.playwright-version.outputs.version }}
2728

2829
# We always install all browsers, if uncached
2930
- name: Install Playwright dependencies (uncached)
@@ -45,4 +46,5 @@ runs:
4546
with:
4647
path: |
4748
~/.cache/ms-playwright
48-
key: playwright-${{ runner.os }}-${{ steps.playwright-version.outputs.version }}
49+
# Bump the iteration when bumping runner images to use a new cache
50+
key: playwright-${{ runner.os }}-iteration-1-${{ steps.playwright-version.outputs.version }}

.github/workflows/auto-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ on:
99
# This workflow tirggers a release when merging a branch with the pattern `prepare-release/VERSION` into master.
1010
jobs:
1111
release:
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-24.04
1313
name: 'Prepare a new version'
1414

1515
steps:
1616
- name: Get auth token
1717
id: token
18-
uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
18+
uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
1919
with:
2020
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
2121
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

.github/workflows/build.yml

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ env:
6767
jobs:
6868
job_get_metadata:
6969
name: Get Metadata
70-
runs-on: ubuntu-20.04
70+
runs-on: ubuntu-24.04
7171
permissions:
7272
pull-requests: read
7373
steps:
@@ -123,7 +123,7 @@ jobs:
123123
job_build:
124124
name: Build
125125
needs: job_get_metadata
126-
runs-on: ubuntu-20.04
126+
runs-on: ubuntu-24.04
127127
timeout-minutes: 15
128128
if: |
129129
needs.job_get_metadata.outputs.changed_any_code == 'true' ||
@@ -214,7 +214,7 @@ jobs:
214214
job_check_branches:
215215
name: Check PR branches
216216
needs: job_get_metadata
217-
runs-on: ubuntu-20.04
217+
runs-on: ubuntu-24.04
218218
if: github.event_name == 'pull_request'
219219
permissions:
220220
pull-requests: write
@@ -230,7 +230,7 @@ jobs:
230230
name: Size Check
231231
needs: [job_get_metadata, job_build]
232232
timeout-minutes: 15
233-
runs-on: ubuntu-20.04
233+
runs-on: ubuntu-24.04
234234
if:
235235
github.event_name == 'pull_request' || needs.job_get_metadata.outputs.is_base_branch == 'true' ||
236236
needs.job_get_metadata.outputs.is_release == 'true'
@@ -260,7 +260,7 @@ jobs:
260260
# inter-package dependencies resolve cleanly.
261261
needs: [job_get_metadata, job_build]
262262
timeout-minutes: 10
263-
runs-on: ubuntu-20.04
263+
runs-on: ubuntu-24.04
264264
steps:
265265
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
266266
uses: actions/checkout@v4
@@ -274,6 +274,9 @@ jobs:
274274
uses: ./.github/actions/restore-cache
275275
with:
276276
dependency_cache_key: ${{ needs.job_build.outputs.dependency_cache_key }}
277+
- name: Check for duplicate dependencies in lockfile
278+
# Run `yarn dedupe-deps:fix` locally to resolve any duplicates.
279+
run: yarn dedupe-deps:check
277280
- name: Lint source files
278281
run: yarn lint:lerna
279282
- name: Lint for ES compatibility
@@ -283,7 +286,7 @@ jobs:
283286
name: Check file formatting
284287
needs: [job_get_metadata]
285288
timeout-minutes: 10
286-
runs-on: ubuntu-20.04
289+
runs-on: ubuntu-24.04
287290
steps:
288291
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
289292
uses: actions/checkout@v4
@@ -306,7 +309,7 @@ jobs:
306309
name: Circular Dependency Check
307310
needs: [job_get_metadata, job_build]
308311
timeout-minutes: 10
309-
runs-on: ubuntu-20.04
312+
runs-on: ubuntu-24.04
310313
steps:
311314
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
312315
uses: actions/checkout@v4
@@ -326,7 +329,7 @@ jobs:
326329
job_artifacts:
327330
name: Upload Artifacts
328331
needs: [job_get_metadata, job_build]
329-
runs-on: ubuntu-20.04
332+
runs-on: ubuntu-24.04
330333
# Build artifacts are only needed for releasing workflow.
331334
if: needs.job_get_metadata.outputs.is_release == 'true'
332335
steps:
@@ -363,7 +366,7 @@ jobs:
363366
name: Browser Unit Tests
364367
needs: [job_get_metadata, job_build]
365368
timeout-minutes: 10
366-
runs-on: ubuntu-20.04
369+
runs-on: ubuntu-24.04
367370
steps:
368371
- name: Check out base commit (${{ github.event.pull_request.base.sha }})
369372
uses: actions/checkout@v4
@@ -410,7 +413,7 @@ jobs:
410413
needs: [job_get_metadata, job_build]
411414
if: needs.job_build.outputs.changed_bun == 'true' || github.event_name != 'pull_request'
412415
timeout-minutes: 10
413-
runs-on: ubuntu-20.04
416+
runs-on: ubuntu-24.04
414417
strategy:
415418
fail-fast: false
416419
steps:
@@ -437,7 +440,7 @@ jobs:
437440
needs: [job_get_metadata, job_build]
438441
if: needs.job_build.outputs.changed_deno == 'true' || github.event_name != 'pull_request'
439442
timeout-minutes: 10
440-
runs-on: ubuntu-20.04
443+
runs-on: ubuntu-24.04
441444
strategy:
442445
fail-fast: false
443446
steps:
@@ -467,7 +470,7 @@ jobs:
467470
name: Node (${{ matrix.node }}) Unit Tests
468471
needs: [job_get_metadata, job_build]
469472
timeout-minutes: 10
470-
runs-on: ubuntu-20.04
473+
runs-on: ubuntu-24.04
471474
strategy:
472475
fail-fast: false
473476
matrix:
@@ -522,7 +525,7 @@ jobs:
522525
matrix.project) || ''}}${{ matrix.shard && format(' ({0}/{1})', matrix.shard, matrix.shards) || ''}} Tests
523526
needs: [job_get_metadata, job_build]
524527
if: needs.job_build.outputs.changed_browser_integration == 'true' || github.event_name != 'pull_request'
525-
runs-on: ubuntu-20.04-large-js
528+
runs-on: ubuntu-24.04-large-js
526529
timeout-minutes: 25
527530
strategy:
528531
fail-fast: false
@@ -616,7 +619,7 @@ jobs:
616619
name: PW ${{ matrix.bundle }} Tests
617620
needs: [job_get_metadata, job_build]
618621
if: needs.job_build.outputs.changed_browser_integration == 'true' || github.event_name != 'pull_request'
619-
runs-on: ubuntu-20.04
622+
runs-on: ubuntu-24.04
620623
timeout-minutes: 15
621624
strategy:
622625
fail-fast: false
@@ -676,7 +679,7 @@ jobs:
676679
job_check_for_faulty_dts:
677680
name: Check for faulty .d.ts files
678681
needs: [job_get_metadata, job_build]
679-
runs-on: ubuntu-20.04
682+
runs-on: ubuntu-24.04
680683
timeout-minutes: 5
681684
steps:
682685
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
@@ -704,7 +707,7 @@ jobs:
704707
Tests
705708
needs: [job_get_metadata, job_build]
706709
if: needs.job_build.outputs.changed_node_integration == 'true' || github.event_name != 'pull_request'
707-
runs-on: ubuntu-20.04
710+
runs-on: ubuntu-24.04
708711
timeout-minutes: 15
709712
strategy:
710713
fail-fast: false
@@ -751,7 +754,7 @@ jobs:
751754
name: Remix (Node ${{ matrix.node }}) Tests
752755
needs: [job_get_metadata, job_build]
753756
if: needs.job_build.outputs.changed_remix == 'true' || github.event_name != 'pull_request'
754-
runs-on: ubuntu-20.04
757+
runs-on: ubuntu-24.04
755758
timeout-minutes: 10
756759
strategy:
757760
fail-fast: false
@@ -799,7 +802,7 @@ jobs:
799802
always() &&
800803
needs.job_build.result == 'success'
801804
needs: [job_get_metadata, job_build]
802-
runs-on: ubuntu-20.04-large-js
805+
runs-on: ubuntu-24.04-large-js
803806
timeout-minutes: 15
804807
outputs:
805808
matrix: ${{ steps.matrix.outputs.matrix }}
@@ -860,7 +863,7 @@ jobs:
860863
if:
861864
always() && needs.job_e2e_prepare.result == 'success' && needs.job_e2e_prepare.outputs.matrix != '{"include":[]}'
862865
needs: [job_get_metadata, job_build, job_e2e_prepare]
863-
runs-on: ubuntu-22.04
866+
runs-on: ubuntu-24.04
864867
timeout-minutes: 15
865868
env:
866869
# We just use a dummy DSN here, only send to the tunnel anyhow
@@ -979,7 +982,7 @@ jobs:
979982
needs.job_e2e_prepare.outputs.matrix-optional != '{"include":[]}' && (github.event_name != 'pull_request' ||
980983
github.event.pull_request.head.repo.full_name == github.repository) && github.actor != 'dependabot[bot]'
981984
needs: [job_get_metadata, job_build, job_e2e_prepare]
982-
runs-on: ubuntu-20.04
985+
runs-on: ubuntu-24.04
983986
timeout-minutes: 15
984987
env:
985988
E2E_TEST_AUTH_TOKEN: ${{ secrets.E2E_TEST_AUTH_TOKEN }}
@@ -1099,7 +1102,7 @@ jobs:
10991102
]
11001103
# Always run this, even if a dependent job failed
11011104
if: always()
1102-
runs-on: ubuntu-20.04
1105+
runs-on: ubuntu-24.04
11031106
steps:
11041107
- name: Check for failures
11051108
if: contains(needs.*.result, 'failure')

.github/workflows/canary.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ permissions:
2727
jobs:
2828
job_e2e_prepare:
2929
name: Prepare E2E Canary tests
30-
runs-on: ubuntu-20.04
30+
runs-on: ubuntu-24.04
3131
timeout-minutes: 30
3232
steps:
3333
- name: Check out current commit
@@ -54,7 +54,7 @@ jobs:
5454
job_e2e_tests:
5555
name: E2E ${{ matrix.label }} Test
5656
needs: [job_e2e_prepare]
57-
runs-on: ubuntu-20.04
57+
runs-on: ubuntu-24.04
5858
timeout-minutes: 20
5959
env:
6060
# We just use a dummy DSN here, only send to the tunnel anyhow
@@ -108,6 +108,12 @@ jobs:
108108
- test-application: 'react-router-6'
109109
build-command: 'test:build-canary'
110110
label: 'react-router-6 (canary)'
111+
- test-application: 'nuxt-3'
112+
build-command: 'test:build-canary'
113+
label: 'nuxt-3 (canary)'
114+
- test-application: 'nuxt-4'
115+
build-command: 'test:build-canary'
116+
label: 'nuxt-4 (canary)'
111117

112118
steps:
113119
- name: Check out current commit

.github/workflows/clear-cache.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on:
2121
jobs:
2222
clear-caches:
2323
name: Delete all caches
24-
runs-on: ubuntu-20.04
24+
runs-on: ubuntu-24.04
2525
steps:
2626
- uses: actions/checkout@v4
2727

.github/workflows/enforce-license-compliance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717

1818
jobs:
1919
enforce-license-compliance:
20-
runs-on: ubuntu-20.04
20+
runs-on: ubuntu-24.04
2121
steps:
2222
- name: 'Enforce License Compliance'
2323
uses: getsentry/action-enforce-license-compliance@main

.github/workflows/external-contributors.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
permissions:
1313
pull-requests: write
1414
contents: write
15-
runs-on: ubuntu-20.04
15+
runs-on: ubuntu-24.04
1616
if: |
1717
github.event.pull_request.merged == true
1818
&& github.event.pull_request.author_association != 'COLLABORATOR'
@@ -36,7 +36,7 @@ jobs:
3636
author_association: ${{ github.event.pull_request.author_association }}
3737

3838
- name: Create PR with changes
39-
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f
39+
uses: peter-evans/create-pull-request@dd2324fc52d5d43c699a5636bcf19fceaa70c284
4040
with:
4141
# This token is scoped to Daniel Griesser
4242
# If we used the default GITHUB_TOKEN, the resulting PR would not trigger CI :(

.github/workflows/flaky-test-detector.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ concurrency:
2323

2424
jobs:
2525
flaky-detector:
26-
runs-on: ubuntu-20.04
26+
runs-on: ubuntu-24.04
2727
timeout-minutes: 60
2828
name: 'Check tests for flakiness'
2929
# Also skip if PR is from master -> develop

0 commit comments

Comments
 (0)