Skip to content

Commit 25bf722

Browse files
committed
Merge branch 'develop' into timfish/feat/fetch-breadcrumbs-without-tracing
2 parents c8a2344 + d007407 commit 25bf722

2,605 files changed

Lines changed: 73705 additions & 55966 deletions

File tree

Some content is hidden

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

.craft.yml

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,30 @@ targets:
55
# NPM Targets
66
## 1. Base Packages, node or browser SDKs depend on
77
## 1.1 Types
8-
# TODO(v9): Remove
98
- name: npm
109
id: '@sentry/types'
1110
includeNames: /^sentry-types-\d.*\.tgz$/
12-
## 1.2 Utils
13-
# TODO(v9): Remove
14-
- name: npm
15-
id: '@sentry/utils'
16-
includeNames: /^sentry-utils-\d.*\.tgz$/
17-
## 1.3 Core SDK
11+
## 1.2 Core SDK
1812
- name: npm
1913
id: '@sentry/core'
2014
includeNames: /^sentry-core-\d.*\.tgz$/
21-
## 1.4 Browser Utils package
15+
## 1.3 Browser Utils package
2216
- name: npm
2317
id: '@sentry-internal/browser-utils'
2418
includeNames: /^sentry-internal-browser-utils-\d.*\.tgz$/
25-
## 1.5 Replay Internal package (browser only)
19+
## 1.4 Replay Internal package (browser only)
2620
- name: npm
2721
id: '@sentry-internal/replay'
2822
includeNames: /^sentry-internal-replay-\d.*\.tgz$/
29-
## 1.6 OpenTelemetry package
23+
## 1.5 OpenTelemetry package
3024
- name: npm
3125
id: '@sentry/opentelemetry'
3226
includeNames: /^sentry-opentelemetry-\d.*\.tgz$/
33-
## 1.7 Feedback package (browser only)
27+
## 1.6 Feedback package (browser only)
3428
- name: npm
3529
id: '@sentry-internal/feedback'
3630
includeNames: /^sentry-internal-feedback-\d.*\.tgz$/
37-
## 1.8 ReplayCanvas package (browser only)
31+
## 1.7 ReplayCanvas package (browser only)
3832
- name: npm
3933
id: '@sentry-internal/replay-canvas'
4034
includeNames: /^sentry-internal-replay-canvas-\d.*\.tgz$/
@@ -83,14 +77,6 @@ targets:
8377
- name: npm
8478
id: '@sentry/deno'
8579
includeNames: /^sentry-deno-\d.*\.tgz$/
86-
- name: commit-on-git-repository
87-
# This will publish on the Deno registry
88-
id: getsentry/deno
89-
archive: /^sentry-deno-\d.*\.tgz$/
90-
repositoryUrl: https://github.com/getsentry/sentry-deno.git
91-
stripComponents: 1
92-
branch: main
93-
createTag: true
9480

9581
## 5. Node-based Packages
9682
- name: npm
@@ -122,12 +108,21 @@ targets:
122108
- name: npm
123109
id: '@sentry/sveltekit'
124110
includeNames: /^sentry-sveltekit-\d.*\.tgz$/
111+
- name: npm
112+
id: '@sentry/tanstackstart'
113+
includeNames: /^sentry-tanstackstart-\d.*\.tgz$/
114+
- name: npm
115+
id: '@sentry/tanstackstart-react'
116+
includeNames: /^sentry-tanstackstart-react-\d.*\.tgz$/
125117
- name: npm
126118
id: '@sentry/gatsby'
127119
includeNames: /^sentry-gatsby-\d.*\.tgz$/
128120
- name: npm
129121
id: '@sentry/astro'
130122
includeNames: /^sentry-astro-\d.*\.tgz$/
123+
- name: npm
124+
id: '@sentry/react-router'
125+
includeNames: /^sentry-react-router-\d.*\.tgz$/
131126

132127
## 7. Other Packages
133128
## 7.1
@@ -145,7 +140,7 @@ targets:
145140
# AWS Lambda Layer target
146141
- name: aws-lambda-layer
147142
includeNames: /^sentry-node-serverless-\d+.\d+.\d+(-(beta|alpha|rc)\.\d+)?\.zip$/
148-
layerName: SentryNodeServerlessSDK
143+
layerName: SentryNodeServerlessSDKv9
149144
compatibleRuntimes:
150145
- name: node
151146
versions:
@@ -198,12 +193,18 @@ targets:
198193
onlyIfPresent: /^sentry-gatsby-\d.*\.tgz$/
199194
'npm:@sentry/google-cloud-serverless':
200195
onlyIfPresent: /^sentry-google-cloud-serverless-\d.*\.tgz$/
196+
'npm:@sentry/nestjs':
197+
onlyIfPresent: /^sentry-nestjs-\d.*\.tgz$/
201198
'npm:@sentry/nextjs':
202199
onlyIfPresent: /^sentry-nextjs-\d.*\.tgz$/
200+
'npm:@sentry/nuxt':
201+
onlyIfPresent: /^sentry-nuxt-\d.*\.tgz$/
203202
'npm:@sentry/node':
204203
onlyIfPresent: /^sentry-node-\d.*\.tgz$/
205204
'npm:@sentry/react':
206205
onlyIfPresent: /^sentry-react-\d.*\.tgz$/
206+
'npm:@sentry/react-router':
207+
onlyIfPresent: /^sentry-react-router-\d.*\.tgz$/
207208
'npm:@sentry/remix':
208209
onlyIfPresent: /^sentry-remix-\d.*\.tgz$/
209210
'npm:@sentry/solid':
@@ -214,6 +215,8 @@ targets:
214215
onlyIfPresent: /^sentry-svelte-\d.*\.tgz$/
215216
'npm:@sentry/sveltekit':
216217
onlyIfPresent: /^sentry-sveltekit-\d.*\.tgz$/
218+
'npm:@sentry/tanstackstart-react':
219+
onlyIfPresent: /^sentry-tanstackstart-react-\d.*\.tgz$/
217220
'npm:@sentry/vercel-edge':
218221
onlyIfPresent: /^sentry-vercel-edge-\d.*\.tgz$/
219222
'npm:@sentry/vue':

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ module.exports = {
3838
},
3939
},
4040
{
41-
files: ['jest/**/*.ts', 'scripts/**/*.ts'],
41+
files: ['scripts/**/*.ts'],
4242
parserOptions: {
4343
project: ['tsconfig.dev.json'],
4444
},

.github/ISSUE_TEMPLATE/bug.yml

Lines changed: 4 additions & 3 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
@@ -85,9 +86,9 @@ body:
8586
attributes:
8687
label: Reproduction Example/SDK Setup
8788
description:
88-
To ensure that we can help you as fast as possible, please share a link to a reproduction example (GitHub repo or online code editor).
89-
This enables us to quickly understand and address your issue.
90-
If you do not post a link, kindly paste your `Sentry.init` code, so we can see how you set up Sentry.
89+
To ensure that we can help you as fast as possible, please share a link to a reproduction example (GitHub repo
90+
or online code editor). This enables us to quickly understand and address your issue. If you do not post a link,
91+
kindly paste your `Sentry.init` code, so we can see how you set up Sentry.
9192
placeholder: |-
9293
https://some-JS-online-code-editor.com/my-example
9394

.github/ISSUE_TEMPLATE/flaky.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ body:
1919
id: job-name
2020
attributes:
2121
label: Name of Job
22-
placeholder: "CI: Build & Test / Nextjs (Node 14) Tests"
22+
placeholder: 'CI: Build & Test / Nextjs (Node 18) Tests'
2323
description: name of job as reported in the status report
2424
validations:
2525
required: true

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
name: "Install yarn dependencies"
2-
description: "Installs yarn dependencies and caches them."
1+
name: 'Install yarn dependencies'
2+
description: 'Installs yarn dependencies and caches them.'
33

44
outputs:
55
cache_key:
6-
description: "The dependency cache key"
6+
description: 'The dependency cache key'
77
value: ${{ steps.compute_lockfile_hash.outputs.hash }}
88

99
runs:
10-
using: "composite"
10+
using: 'composite'
1111
steps:
1212
- name: Compute dependency cache key
1313
id: compute_lockfile_hash
Lines changed: 39 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,50 @@
1-
name: "Install Playwright dependencies"
2-
description: "Installs Playwright dependencies and caches them."
1+
name: 'Install Playwright dependencies'
2+
description: 'Installs Playwright dependencies and caches them.'
33
inputs:
44
browsers:
55
description: 'What browsers to install.'
66
default: 'chromium webkit firefox'
7+
cwd:
8+
description: 'The working directory to run Playwright in.'
9+
default: '.'
710

811
runs:
9-
using: "composite"
12+
using: 'composite'
1013
steps:
11-
- name: Get Playwright version
12-
id: playwright-version
13-
run: echo "version=$(node -p "require('@playwright/test/package.json').version")" >> $GITHUB_OUTPUT
14-
shell: bash
14+
- name: Get Playwright version
15+
id: playwright-version
16+
run: echo "version=$(node -p "require('@playwright/test/package.json').version")" >> $GITHUB_OUTPUT
17+
shell: bash
18+
working-directory: ${{ inputs.cwd }}
1519

16-
- name: Restore cached playwright binaries
17-
uses: actions/cache/restore@v4
18-
id: playwright-cache
19-
with:
20-
path: |
21-
~/.cache/ms-playwright
22-
key: playwright-${{ runner.os }}-${{ steps.playwright-version.outputs.version }}
20+
- name: Restore cached playwright binaries
21+
uses: actions/cache/restore@v4
22+
id: playwright-cache
23+
with:
24+
path: |
25+
~/.cache/ms-playwright
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 }}
2328

24-
# We always install all browsers, if uncached
25-
- name: Install Playwright dependencies (uncached)
26-
run: npx playwright install chromium webkit firefox --with-deps
27-
if: steps.playwright-cache.outputs.cache-hit != 'true'
28-
shell: bash
29+
# We always install all browsers, if uncached
30+
- name: Install Playwright dependencies (uncached)
31+
run: npx playwright install chromium webkit firefox --with-deps
32+
if: steps.playwright-cache.outputs.cache-hit != 'true'
33+
shell: bash
34+
working-directory: ${{ inputs.cwd }}
2935

30-
- name: Install Playwright system dependencies only (cached)
31-
run: npx playwright install-deps ${{ inputs.browsers || 'chromium webkit firefox' }}
32-
if: steps.playwright-cache.outputs.cache-hit == 'true'
33-
shell: bash
36+
- name: Install Playwright system dependencies only (cached)
37+
run: npx playwright install-deps ${{ inputs.browsers || 'chromium webkit firefox' }}
38+
if: steps.playwright-cache.outputs.cache-hit == 'true'
39+
shell: bash
40+
working-directory: ${{ inputs.cwd }}
3441

35-
# Only store cache on develop branch
36-
- name: Store cached playwright binaries
37-
uses: actions/cache/save@v4
38-
if: github.event_name == 'push' && github.ref == 'refs/heads/develop'
39-
with:
40-
path: |
41-
~/.cache/ms-playwright
42-
key: playwright-${{ runner.os }}-${{ steps.playwright-version.outputs.version }}
42+
# Only store cache on develop branch
43+
- name: Store cached playwright binaries
44+
uses: actions/cache/save@v4
45+
if: github.event_name == 'push' && github.ref == 'refs/heads/develop'
46+
with:
47+
path: |
48+
~/.cache/ms-playwright
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 }}
Lines changed: 18 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,27 @@
1-
name: "Restore dependency & build cache"
2-
description: "Restore the dependency & build cache."
1+
name: 'Restore dependency & build cache'
2+
description: 'Restore the dependency & build cache.'
33

44
inputs:
55
dependency_cache_key:
6-
description: "The dependency cache key"
6+
description: 'The dependency cache key'
77
required: true
8-
node_version:
9-
description: "If set, temporarily set node version to default one before installing, then revert to this version after."
10-
required: false
118

129
runs:
13-
using: "composite"
10+
using: 'composite'
1411
steps:
15-
- name: Check dependency cache
16-
id: dep-cache
17-
uses: actions/cache/restore@v4
18-
with:
19-
path: ${{ env.CACHED_DEPENDENCY_PATHS }}
20-
key: ${{ inputs.dependency_cache_key }}
12+
- name: Check dependency cache
13+
id: dep-cache
14+
uses: actions/cache/restore@v4
15+
with:
16+
path: ${{ env.CACHED_DEPENDENCY_PATHS }}
17+
key: ${{ inputs.dependency_cache_key }}
2118

22-
- name: Restore build artifacts
23-
uses: actions/download-artifact@v4
24-
with:
25-
name: build-output
19+
- name: Restore build artifacts
20+
uses: actions/download-artifact@v4
21+
with:
22+
name: build-output
2623

27-
- name: Use default node version for install
28-
if: inputs.node_version && steps.dep-cache.outputs.cache-hit != 'true'
29-
uses: actions/setup-node@v4
30-
with:
31-
node-version-file: 'package.json'
32-
33-
- name: Install dependencies
34-
if: steps.dep-cache.outputs.cache-hit != 'true'
35-
run: yarn install --ignore-engines --frozen-lockfile
36-
shell: bash
37-
38-
- name: Revert node version to ${{ inputs.node_version }}
39-
if: inputs.node_version && steps.dep-cache.outputs.cache-hit != 'true'
40-
uses: actions/setup-node@v4
41-
with:
42-
node-version: ${{ inputs.node_version }}
24+
- name: Install dependencies
25+
if: steps.dep-cache.outputs.cache-hit != 'true'
26+
run: yarn install --ignore-engines --frozen-lockfile
27+
shell: bash

.github/dependabot.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ updates:
1313
schedule:
1414
interval: 'weekly'
1515
allow:
16-
- dependency-name: "@sentry/*"
17-
- dependency-name: "@opentelemetry/*"
18-
- dependency-name: "@prisma/instrumentation"
19-
- dependency-name: "opentelemetry-instrumentation-remix"
16+
- dependency-name: '@sentry/*'
17+
- dependency-name: '@opentelemetry/*'
18+
- dependency-name: '@prisma/instrumentation'
19+
- dependency-name: 'opentelemetry-instrumentation-remix'
2020
versioning-strategy: increase
2121
commit-message:
2222
prefix: feat

.github/dependency-review-config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ allow-ghsas:
77
- GHSA-fr5h-rqp8-mj6g
88
# we need this for an E2E test for the minimum required version of Nuxt 3.7.0
99
- GHSA-v784-fjjh-f8r4
10+
# Next.js Cache poisoning - We require a vulnerable version for E2E testing
11+
- GHSA-gp8f-8m3g-qvj9

.github/workflows/auto-release.yml

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Gitflow: Auto prepare release"
1+
name: 'Gitflow: Auto prepare release'
22
on:
33
pull_request:
44
types:
@@ -9,13 +9,20 @@ 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:
16+
- name: Get auth token
17+
id: token
18+
uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547 # v1.12.0
19+
with:
20+
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
21+
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}
22+
1623
- uses: actions/checkout@v4
1724
with:
18-
token: ${{ secrets.GH_RELEASE_PAT }}
25+
token: ${{ steps.token.outputs.token }}
1926
fetch-depth: 0
2027

2128
# https://github.com/actions-ecosystem/action-regex-match
@@ -34,11 +41,18 @@ jobs:
3441
version=${version/'prepare-release/'/''}
3542
echo "version=$version" >> $GITHUB_OUTPUT
3643
44+
- name: Set up Node
45+
uses: actions/setup-node@v4
46+
with:
47+
node-version-file: 'package.json'
48+
3749
- name: Prepare release
3850
uses: getsentry/action-prepare-release@v1
39-
if: github.event.pull_request.merged == true && steps.version-regex.outputs.match != '' && steps.get_version.outputs.version != ''
51+
if:
52+
github.event.pull_request.merged == true && steps.version-regex.outputs.match != '' &&
53+
steps.get_version.outputs.version != ''
4054
env:
41-
GITHUB_TOKEN: ${{ secrets.GH_RELEASE_PAT }}
55+
GITHUB_TOKEN: ${{ steps.token.outputs.token }}
4256
with:
4357
version: ${{ steps.get_version.outputs.version }}
4458
force: false

0 commit comments

Comments
 (0)