Skip to content

Commit 7a8bea8

Browse files
committed
Merge branch 'develop' into billy/feat-reset-dsc-on-handle-global-event
2 parents bc10756 + 4cf5c61 commit 7a8bea8

372 files changed

Lines changed: 14475 additions & 3394 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.

.agents/skills/fix-security-vulnerability/SKILL.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ git pull origin develop
9292
git checkout -b fix/dependabot-alert-<alert-number>
9393
```
9494

95-
Then apply the fix commands from Step 5 of the single-alert workflow (edit `package.json`, `yarn install`, `yarn dedupe-deps:fix`, verify) — but **skip the "Do NOT commit" instruction**, since user approval was already obtained in Step 2b. After applying:
95+
Then apply the fix commands from Step 5 of the single-alert workflow (`npx yarn-update-dependency@latest <package>`, `yarn dedupe-deps:fix`, verify) — but **skip the "Do NOT commit" instruction**, since user approval was already obtained in Step 2b. After applying:
9696

9797
```bash
9898
# 3. Stage and commit the changes
@@ -263,8 +263,8 @@ Present findings and **wait for user approval** before making changes:
263263
<One of: Safe to bump / Version-specific test - do not bump / Bump parent package>
264264
265265
### Proposed Fix
266-
1. Update <file>: "<package>": "<new-version>"
267-
2. yarn install && yarn dedupe-deps:fix
266+
1. npx yarn-update-dependency@latest <package>
267+
2. yarn dedupe-deps:fix
268268
3. Verify with: yarn why <package>
269269
270270
Proceed?
@@ -273,15 +273,14 @@ Proceed?
273273
### Step 5: Apply Fix (After Approval)
274274
275275
```bash
276-
# 1. Edit package.json
277-
# 2. Update lockfile
278-
yarn install
279-
# 3. Deduplicate
276+
# 1. Upgrade the package (updates package.json + lockfile)
277+
npx yarn-update-dependency@latest <package>
278+
# 2. Deduplicate
280279
yarn dedupe-deps:fix
281-
# 4. Verify
280+
# 3. Verify
282281
yarn dedupe-deps:check
283282
yarn why <package>
284-
# 5. Show changes
283+
# 4. Show changes
285284
git diff
286285
```
287286
@@ -325,6 +324,7 @@ gh api --method PATCH repos/getsentry/sentry-javascript/dependabot/alerts/<numbe
325324
326325
| Command | Purpose |
327326
| ------------------------------------------------------------------------------------------------------------ | ---------------------------- |
327+
| `npx yarn-update-dependency@latest <pkg>` | Upgrade package across repo |
328328
| `yarn why <pkg>` | Show dependency tree |
329329
| `yarn dedupe-deps:fix` | Fix duplicates in yarn.lock |
330330
| `yarn dedupe-deps:check` | Verify no duplicate issues |

.github/FLAKY_CI_FAILURE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: '[Flaky CI]: {{ env.JOB_NAME }} - {{ env.TEST_NAME }}'
3-
labels: Tests
3+
labels: Tests, Bug
44
---
55

66
### Flakiness Type

.github/workflows/auto-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- name: Get auth token
2121
id: token
22-
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
22+
uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
2323
with:
2424
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
2525
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}
@@ -51,7 +51,7 @@ jobs:
5151
node-version-file: 'package.json'
5252

5353
- name: Prepare release
54-
uses: getsentry/craft@013a7b2113c2cac0ff32d5180cfeaefc7c9ce5b6 # v2.24.1
54+
uses: getsentry/craft@3dc647fee3586e57c7c31eb900fdec7cbb44f23f # v2.26.2
5555
if:
5656
github.event.pull_request.merged == true && steps.version-regex.outputs.match != '' &&
5757
steps.get_version.outputs.version != ''

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ jobs:
274274
pull-requests: write
275275
steps:
276276
- name: PR is opened against master
277-
uses: mshick/add-pr-comment@e7516d74559b5514092f5b096ed29a629a1237c6
277+
uses: mshick/add-pr-comment@8e4927817251f1ff60c001f04568532b38e0b4a0
278278
if: ${{ github.base_ref == 'master' && !startsWith(github.head_ref, 'prepare-release/') }}
279279
with:
280280
message: |
@@ -533,7 +533,7 @@ jobs:
533533
with:
534534
node-version-file: 'package.json'
535535
- name: Set up Deno
536-
uses: denoland/setup-deno@v2.0.3
536+
uses: denoland/setup-deno@v2.0.4
537537
with:
538538
deno-version: v2.1.5
539539
- name: Restore caches
@@ -1057,7 +1057,7 @@ jobs:
10571057
token: ${{ secrets.GITHUB_TOKEN }}
10581058
- name: Set up Deno
10591059
if: matrix.test-application == 'deno' || matrix.test-application == 'deno-streamed'
1060-
uses: denoland/setup-deno@v2.0.3
1060+
uses: denoland/setup-deno@v2.0.4
10611061
with:
10621062
deno-version: v2.1.5
10631063
- name: Restore caches

.github/workflows/bump-size-limits.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
steps:
3030
- name: Generate GitHub App token
3131
id: app-token
32-
uses: actions/create-github-app-token@v2
32+
uses: actions/create-github-app-token@v3
3333
with:
3434
app-id: ${{ vars.GITFLOW_APP_ID }}
3535
private-key: ${{ secrets.GITFLOW_APP_PRIVATE_KEY }}

.github/workflows/external-contributors.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737

3838
- name: Generate GitHub App token
3939
id: app-token
40-
uses: actions/create-github-app-token@v2
40+
uses: actions/create-github-app-token@v3
4141
with:
4242
app-id: ${{ vars.GITFLOW_APP_ID }}
4343
private-key: ${{ secrets.GITFLOW_APP_PRIVATE_KEY }}

.github/workflows/gitflow-sync-develop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
- name: Generate GitHub App token
2929
id: app-token
30-
uses: actions/create-github-app-token@v2
30+
uses: actions/create-github-app-token@v3
3131
with:
3232
app-id: ${{ vars.GITFLOW_APP_ID }}
3333
private-key: ${{ secrets.GITFLOW_APP_PRIVATE_KEY }}

.github/workflows/pr-review-reminder.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Checkout repository
28-
uses: actions/checkout@v4
28+
uses: actions/checkout@v6
2929

3030
- name: Remind pending reviewers
3131
uses: actions/github-script@v7

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
steps:
2424
- name: Get auth token
2525
id: token
26-
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
26+
uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
2727
with:
2828
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
2929
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}
@@ -36,7 +36,7 @@ jobs:
3636
with:
3737
node-version-file: 'package.json'
3838
- name: Prepare release
39-
uses: getsentry/craft@013a7b2113c2cac0ff32d5180cfeaefc7c9ce5b6 # v2.24.1
39+
uses: getsentry/craft@3dc647fee3586e57c7c31eb900fdec7cbb44f23f # v2.26.2
4040
env:
4141
GITHUB_TOKEN: ${{ steps.token.outputs.token }}
4242
with:

.oxlintrc.base.json

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -131,13 +131,17 @@
131131
}
132132
},
133133
{
134-
"files": [
135-
"**/scenarios/**",
136-
"**/rollup-utils/**",
137-
"**/bundle-analyzer-scenarios/**",
138-
"**/bundle-analyzer-scenarios/*.cjs",
139-
"**/bundle-analyzer-scenarios/*.js"
140-
],
134+
"files": ["**/integrations/tracing/redis/vendored/**/*.ts"],
135+
"rules": {
136+
"typescript/no-explicit-any": "off",
137+
"typescript/no-unsafe-member-access": "off",
138+
"typescript/no-this-alias": "off",
139+
"max-lines": "off",
140+
"no-bitwise": "off"
141+
}
142+
},
143+
{
144+
"files": ["**/scenarios/**", "**/rollup-utils/**"],
141145
"rules": {
142146
"no-console": "off"
143147
}

0 commit comments

Comments
 (0)