Skip to content

Commit 4e0d9bd

Browse files
committed
Merge branch 'develop' into colin/log-api
2 parents 9048164 + 9c1f79b commit 4e0d9bd

File tree

679 files changed

+11391
-5238
lines changed

Some content is hidden

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

679 files changed

+11391
-5238
lines changed

.craft.yml

+8
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,18 @@ targets:
108108
- name: npm
109109
id: '@sentry/sveltekit'
110110
includeNames: /^sentry-sveltekit-\d.*\.tgz$/
111+
- name: npm
112+
id: '@sentry/tanstackstart'
113+
includeNames: /^sentry-tanstackstart-\d.*\.tgz$/
111114
- name: npm
112115
id: '@sentry/gatsby'
113116
includeNames: /^sentry-gatsby-\d.*\.tgz$/
114117
- name: npm
115118
id: '@sentry/astro'
116119
includeNames: /^sentry-astro-\d.*\.tgz$/
120+
- name: npm
121+
id: '@sentry/react-router'
122+
includeNames: /^sentry-react-router-\d.*\.tgz$/
117123

118124
## 7. Other Packages
119125
## 7.1
@@ -190,6 +196,8 @@ targets:
190196
onlyIfPresent: /^sentry-node-\d.*\.tgz$/
191197
'npm:@sentry/react':
192198
onlyIfPresent: /^sentry-react-\d.*\.tgz$/
199+
'npm:@sentry/react-router':
200+
onlyIfPresent: /^sentry-react-router-\d.*\.tgz$/
193201
'npm:@sentry/remix':
194202
onlyIfPresent: /^sentry-remix-\d.*\.tgz$/
195203
'npm:@sentry/solid':

.github/CANARY_FAILURE_TEMPLATE.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
title: '{{ env.TITLE }}'
33
labels: 'Type: Tests, Waiting for: Product Owner'
4+
type: 'task'
45
---
56

67
Canary tests failed: {{ env.RUN_LINK }}

.github/ISSUE_TEMPLATE/bug.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ body:
8585
attributes:
8686
label: Reproduction Example/SDK Setup
8787
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.
88+
To ensure that we can help you as fast as possible, please share a link to a reproduction example (GitHub repo
89+
or online code editor). This enables us to quickly understand and address your issue. If you do not post a link,
90+
kindly paste your `Sentry.init` code, so we can see how you set up Sentry.
9191
placeholder: |-
9292
https://some-JS-online-code-editor.com/my-example
9393

.github/ISSUE_TEMPLATE/flaky.yml

+1-1
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 18) 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

+4-4
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
+36-35
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
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.'
@@ -9,41 +9,42 @@ inputs:
99
default: '.'
1010

1111
runs:
12-
using: "composite"
12+
using: 'composite'
1313
steps:
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 }}
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 }}
1919

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 }}
2028

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

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 }}
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 }}
3541

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 }}
41-
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-
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 }}
+18-18
Original file line numberDiff line numberDiff line change
@@ -1,27 +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
88

99
runs:
10-
using: "composite"
10+
using: 'composite'
1111
steps:
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 }}
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 }}
1818

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

24-
- name: Install dependencies
25-
if: steps.dep-cache.outputs.cache-hit != 'true'
26-
run: yarn install --ignore-engines --frozen-lockfile
27-
shell: bash
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

+4-4
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/workflows/auto-release.yml

+6-4
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,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 }}
@@ -48,7 +48,9 @@ jobs:
4848

4949
- name: Prepare release
5050
uses: getsentry/action-prepare-release@v1
51-
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 != ''
5254
env:
5355
GITHUB_TOKEN: ${{ steps.token.outputs.token }}
5456
with:

0 commit comments

Comments
 (0)