Skip to content

Commit c7226d9

Browse files
committed
Merge branch 'develop' into timfish/time-side-effects
2 parents 253b7f4 + 6e7765a commit c7226d9

File tree

461 files changed

+10823
-2544
lines changed

Some content is hidden

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

461 files changed

+10823
-2544
lines changed

.craft.yml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -143,19 +143,20 @@ targets:
143143
includeNames: /^sentry-internal-eslint-config-sdk-\d.*\.tgz$/
144144

145145
# AWS Lambda Layer target
146-
- name: aws-lambda-layer
147-
includeNames: /^sentry-node-serverless-\d+.\d+.\d+(-(beta|alpha|rc)\.\d+)?\.zip$/
148-
layerName: SentryNodeServerlessSDK
149-
compatibleRuntimes:
150-
- name: node
151-
versions:
152-
- nodejs10.x
153-
- nodejs12.x
154-
- nodejs14.x
155-
- nodejs16.x
156-
- nodejs18.x
157-
- nodejs20.x
158-
license: MIT
146+
# TODO(v9): Once stable, re-add this target to publish the AWS Lambda layer
147+
# - name: aws-lambda-layer
148+
# includeNames: /^sentry-node-serverless-\d+.\d+.\d+(-(beta|alpha|rc)\.\d+)?\.zip$/
149+
# layerName: SentryNodeServerlessSDK
150+
# compatibleRuntimes:
151+
# - name: node
152+
# versions:
153+
# - nodejs10.x
154+
# - nodejs12.x
155+
# - nodejs14.x
156+
# - nodejs16.x
157+
# - nodejs18.x
158+
# - nodejs20.x
159+
# license: MIT
159160

160161
# CDN Bundle Target
161162
- name: gcs

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ 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:
912
using: "composite"
@@ -12,6 +15,8 @@ runs:
1215
id: playwright-version
1316
run: echo "version=$(node -p "require('@playwright/test/package.json').version")" >> $GITHUB_OUTPUT
1417
shell: bash
18+
working-directory: ${{ inputs.cwd }}
19+
1520

1621
- name: Restore cached playwright binaries
1722
uses: actions/cache/restore@v4
@@ -26,11 +31,13 @@ runs:
2631
run: npx playwright install chromium webkit firefox --with-deps
2732
if: steps.playwright-cache.outputs.cache-hit != 'true'
2833
shell: bash
34+
working-directory: ${{ inputs.cwd }}
2935

3036
- name: Install Playwright system dependencies only (cached)
3137
run: npx playwright install-deps ${{ inputs.browsers || 'chromium webkit firefox' }}
3238
if: steps.playwright-cache.outputs.cache-hit == 'true'
3339
shell: bash
40+
working-directory: ${{ inputs.cwd }}
3441

3542
# Only store cache on develop branch
3643
- name: Store cached playwright binaries

.github/workflows/auto-release.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,16 @@ jobs:
1313
name: 'Prepare a new version'
1414

1515
steps:
16+
- name: Get auth token
17+
id: token
18+
uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.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
@@ -38,7 +45,7 @@ jobs:
3845
uses: getsentry/action-prepare-release@v1
3946
if: github.event.pull_request.merged == true && steps.version-regex.outputs.match != '' && steps.get_version.outputs.version != ''
4047
env:
41-
GITHUB_TOKEN: ${{ secrets.GH_RELEASE_PAT }}
48+
GITHUB_TOKEN: ${{ steps.token.outputs.token }}
4249
with:
4350
version: ${{ steps.get_version.outputs.version }}
4451
force: false

.github/workflows/build.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -920,11 +920,6 @@ jobs:
920920
if: steps.restore-tarball-cache.outputs.cache-hit != 'true'
921921
run: yarn build:tarball
922922

923-
- name: Install Playwright
924-
uses: ./.github/actions/install-playwright
925-
with:
926-
browsers: chromium
927-
928923
- name: Get node version
929924
id: versions
930925
run: |
@@ -945,6 +940,12 @@ jobs:
945940
timeout-minutes: 7
946941
run: pnpm ${{ matrix.build-command || 'test:build' }}
947942

943+
- name: Install Playwright
944+
uses: ./.github/actions/install-playwright
945+
with:
946+
browsers: chromium
947+
cwd: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
948+
948949
- name: Run E2E test
949950
working-directory: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
950951
timeout-minutes: 10
@@ -984,7 +985,7 @@ jobs:
984985

985986
# - We skip optional tests on release branches
986987
job_optional_e2e_tests:
987-
name: E2E ${{ matrix.label || matrix.test-application }} Test
988+
name: E2E ${{ matrix.label || matrix.test-application }} Test (optional)
988989
# We only run E2E tests for non-fork PRs because the E2E tests require secrets to work and they can't be accessed from forks
989990
# We need to add the `always()` check here because the previous step has this as well :(
990991
# See: https://github.com/actions/runner/issues/2205
@@ -1039,11 +1040,6 @@ jobs:
10391040
if: steps.restore-tarball-cache.outputs.cache-hit != 'true'
10401041
run: yarn build:tarball
10411042

1042-
- name: Install Playwright
1043-
uses: ./.github/actions/install-playwright
1044-
with:
1045-
browsers: chromium
1046-
10471043
- name: Get node version
10481044
id: versions
10491045
run: |
@@ -1064,6 +1060,12 @@ jobs:
10641060
timeout-minutes: 7
10651061
run: pnpm ${{ matrix.build-command || 'test:build' }}
10661062

1063+
- name: Install Playwright
1064+
uses: ./.github/actions/install-playwright
1065+
with:
1066+
browsers: chromium
1067+
cwd: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
1068+
10671069
- name: Run E2E test
10681070
working-directory: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
10691071
timeout-minutes: 10

.github/workflows/canary.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,12 @@ jobs:
149149
timeout-minutes: 7
150150
run: yarn ${{ matrix.build-command }}
151151

152+
- name: Install Playwright
153+
uses: ./.github/actions/install-playwright
154+
with:
155+
browsers: chromium
156+
cwd: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
157+
152158
- name: Run E2E test
153159
working-directory: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
154160
timeout-minutes: 15

.github/workflows/issue-package-label.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,12 @@ jobs:
8383
"@sentry.solid": {
8484
"label": "Package: solidstart"
8585
},
86-
"@sentry.svelte": {
87-
"label": "Package: svelte"
88-
},
8986
"@sentry.sveltekit": {
9087
"label": "Package: sveltekit"
9188
},
89+
"@sentry.svelte": {
90+
"label": "Package: svelte"
91+
},
9292
"@sentry.vue": {
9393
"label": "Package: vue"
9494
},

.github/workflows/release.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,20 @@ jobs:
1717
runs-on: ubuntu-20.04
1818
name: 'Release a new version'
1919
steps:
20+
- name: Get auth token
21+
id: token
22+
uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
23+
with:
24+
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
25+
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}
2026
- uses: actions/checkout@v4
2127
with:
22-
token: ${{ secrets.GH_RELEASE_PAT }}
28+
token: ${{ steps.token.outputs.token }}
2329
fetch-depth: 0
2430
- name: Prepare release
2531
uses: getsentry/action-prepare-release@v1
2632
env:
27-
GITHUB_TOKEN: ${{ secrets.GH_RELEASE_PAT }}
33+
GITHUB_TOKEN: ${{ steps.token.outputs.token }}
2834
with:
2935
version: ${{ github.event.inputs.version }}
3036
force: ${{ github.event.inputs.force }}

.size-limit.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ module.exports = [
7979
path: 'packages/browser/build/npm/esm/index.js',
8080
import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'replayCanvasIntegration'),
8181
gzip: true,
82-
limit: '79 KB',
82+
limit: '80 KB',
8383
},
8484
{
8585
name: '@sentry/browser (incl. Tracing, Replay, Feedback)',
@@ -147,7 +147,7 @@ module.exports = [
147147
path: 'packages/svelte/build/esm/index.js',
148148
import: createImport('init'),
149149
gzip: true,
150-
limit: '24 KB',
150+
limit: '25 KB',
151151
},
152152
// Browser CDN bundles
153153
{
@@ -166,7 +166,7 @@ module.exports = [
166166
name: 'CDN Bundle (incl. Tracing, Replay)',
167167
path: createCDNPath('bundle.tracing.replay.min.js'),
168168
gzip: true,
169-
limit: '74 KB',
169+
limit: '80 KB',
170170
},
171171
{
172172
name: 'CDN Bundle (incl. Tracing, Replay, Feedback)',
@@ -194,7 +194,7 @@ module.exports = [
194194
path: createCDNPath('bundle.tracing.replay.min.js'),
195195
gzip: false,
196196
brotli: false,
197-
limit: '230 KB',
197+
limit: '240 KB',
198198
},
199199
{
200200
name: 'CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed',
@@ -228,7 +228,7 @@ module.exports = [
228228
import: createImport('init'),
229229
ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
230230
gzip: true,
231-
limit: '140 KB',
231+
limit: '170 KB',
232232
},
233233
{
234234
name: '@sentry/node - without tracing',
@@ -260,7 +260,7 @@ module.exports = [
260260
import: createImport('init'),
261261
ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
262262
gzip: true,
263-
limit: '130 KB',
263+
limit: '135 KB',
264264
},
265265
];
266266

0 commit comments

Comments
 (0)