Skip to content

Commit e275d4c

Browse files
authored
Merge branch 'develop' into timfish/feat/cloudflare-traceparent
2 parents a0a6f6c + 4a5ba93 commit e275d4c

204 files changed

Lines changed: 3005 additions & 960 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.

.eslintrc.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ module.exports = {
2323
'types/**',
2424
'scripts/*.js',
2525
],
26+
rules: {
27+
'@typescript-eslint/no-explicit-any': 'error',
28+
},
2629
reportUnusedDisableDirectives: true,
2730
overrides: [
2831
{
@@ -36,6 +39,9 @@ module.exports = {
3639
parserOptions: {
3740
project: ['tsconfig.test.json'],
3841
},
42+
rules: {
43+
'@typescript-eslint/no-explicit-any': 'off',
44+
},
3945
},
4046
{
4147
files: ['scripts/**/*.ts'],

.github/workflows/build.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1144,15 +1144,6 @@ jobs:
11441144
retention-days: 7
11451145
if-no-files-found: ignore
11461146

1147-
- name: Deploy Astro to Cloudflare
1148-
uses: cloudflare/wrangler-action@v3
1149-
if: matrix.test-application == 'cloudflare-astro'
1150-
with:
1151-
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
1152-
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
1153-
command: pages deploy dist --project-name=${{ secrets.CLOUDFLARE_PROJECT_NAME }}
1154-
workingDirectory: ${{ runner.temp }}/test-application
1155-
11561147
job_required_jobs_passed:
11571148
name: All required jobs passed or were skipped
11581149
needs:

.size-limit.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,27 @@ module.exports = [
112112
gzip: true,
113113
limit: '35 KB',
114114
},
115+
{
116+
name: '@sentry/browser (incl. Metrics)',
117+
path: 'packages/browser/build/npm/esm/prod/index.js',
118+
import: createImport('init', 'metrics'),
119+
gzip: true,
120+
limit: '27 KB',
121+
},
122+
{
123+
name: '@sentry/browser (incl. Logs)',
124+
path: 'packages/browser/build/npm/esm/prod/index.js',
125+
import: createImport('init', 'logger'),
126+
gzip: true,
127+
limit: '27 KB',
128+
},
129+
{
130+
name: '@sentry/browser (incl. Metrics & Logs)',
131+
path: 'packages/browser/build/npm/esm/prod/index.js',
132+
import: createImport('init', 'metrics', 'logger'),
133+
gzip: true,
134+
limit: '28 KB',
135+
},
115136
// React SDK (ESM)
116137
{
117138
name: '@sentry/react',

CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,24 @@
44

55
- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
66

7+
Work in this release was contributed by @xgedev, @Mohataseem89, @sebws, and @G-Rath. Thank you for your contributions!
8+
9+
- ref(nextjs): Drop `resolve` dependency from the Next.js SDK ([#18618](https://github.com/getsentry/sentry-javascript/pull/18618))
10+
11+
## 10.32.1
12+
13+
- fix(cloudflare): Add hono transaction name when error is thrown ([#18529](https://github.com/getsentry/sentry-javascript/pull/18529))
14+
- fix(ember): Make `implementation` field optional (`hash` routes) ([#18564](https://github.com/getsentry/sentry-javascript/pull/18564))
15+
- fix(vercelai): Fix input token count ([#18574](https://github.com/getsentry/sentry-javascript/pull/18574))
16+
17+
<details>
18+
<summary> <strong>Internal Changes</strong> </summary>
19+
20+
- chore(lint): prefer 'unknown' to 'any', fix lint warnings
21+
- chore(test): Remove `cloudflare-astro` e2e test ([#18567](https://github.com/getsentry/sentry-javascript/pull/18567))
22+
23+
</details>
24+
725
## 10.32.0
826

927
### Important Changes

dev-packages/.eslintrc.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
module.exports = {
2+
extends: ['../.eslintrc.js'],
3+
rules: {
4+
// tests often have just cause to do evil
5+
'@typescript-eslint/no-explicit-any': 'off',
6+
},
7+
};

dev-packages/browser-integration-tests/.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module.exports = {
44
node: true,
55
},
66
// todo: remove regexp plugin from here once we add it to base.js eslint config for the whole project
7-
extends: ['../../.eslintrc.js', 'plugin:regexp/recommended'],
7+
extends: ['../.eslintrc.js', 'plugin:regexp/recommended'],
88
plugins: ['regexp'],
99
ignorePatterns: [
1010
'suites/**/subject.js',

dev-packages/browser-integration-tests/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/browser-integration-tests",
3-
"version": "10.32.0",
3+
"version": "10.32.1",
44
"main": "index.js",
55
"license": "MIT",
66
"engines": {
@@ -43,7 +43,7 @@
4343
"@babel/preset-typescript": "^7.16.7",
4444
"@playwright/test": "~1.56.0",
4545
"@sentry-internal/rrweb": "2.34.0",
46-
"@sentry/browser": "10.32.0",
46+
"@sentry/browser": "10.32.1",
4747
"@supabase/supabase-js": "2.49.3",
4848
"axios": "^1.12.2",
4949
"babel-loader": "^8.2.2",
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import * as Sentry from '@sentry/browser';
2+
3+
window.Sentry = Sentry;
4+
5+
Sentry.init({
6+
dsn: 'https://public@[2001:db8::1]/1337',
7+
sendClientReports: false,
8+
defaultIntegrations: false,
9+
});
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Sentry.captureException(new Error('Test error'));
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8" />
5+
<title></title>
6+
</head>
7+
<body>
8+
</body>
9+
</html>

0 commit comments

Comments
 (0)