Skip to content

Commit bc4727b

Browse files
authored
Merge branch 'develop' into sig/react-router-react-exports
2 parents 0aa25a4 + dcdf074 commit bc4727b

58 files changed

Lines changed: 369 additions & 244 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.

CHANGELOG.md

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
# Changelog
22

3-
<!-- prettier-ignore-start -->
4-
> [!IMPORTANT]
5-
> If you are upgrading to the `9.x` versions of the SDK from `8.x` or below, make sure you follow our
6-
> [migration guide](https://docs.sentry.io/platforms/javascript/migration/) first.
7-
<!-- prettier-ignore-end -->
3+
## 9.25.1
84

9-
## Unreleased
10-
11-
- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
5+
- fix(otel): Don't ignore child spans after the root is sent ([#16416](https://github.com/getsentry/sentry-javascript/pull/16416))
126

137
## 9.25.0
148

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": "9.25.0",
3+
"version": "9.25.1",
44
"main": "index.js",
55
"license": "MIT",
66
"engines": {
@@ -42,7 +42,7 @@
4242
"@babel/preset-typescript": "^7.16.7",
4343
"@playwright/test": "~1.50.0",
4444
"@sentry-internal/rrweb": "2.34.0",
45-
"@sentry/browser": "9.25.0",
45+
"@sentry/browser": "9.25.1",
4646
"@supabase/supabase-js": "2.49.3",
4747
"axios": "1.8.2",
4848
"babel-loader": "^8.2.2",

dev-packages/bundle-analyzer-scenarios/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/bundle-analyzer-scenarios",
3-
"version": "9.25.0",
3+
"version": "9.25.1",
44
"description": "Scenarios to test bundle analysis with",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/dev-packages/bundle-analyzer-scenarios",

dev-packages/clear-cache-gh-action/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@sentry-internal/clear-cache-gh-action",
33
"description": "An internal Github Action to clear GitHub caches.",
4-
"version": "9.25.0",
4+
"version": "9.25.1",
55
"license": "MIT",
66
"engines": {
77
"node": ">=18"

dev-packages/e2e-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/e2e-tests",
3-
"version": "9.25.0",
3+
"version": "9.25.1",
44
"license": "MIT",
55
"private": true,
66
"scripts": {

dev-packages/e2e-tests/test-applications/nextjs-14/playwright.config.ts

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,9 @@ if (!testEnv) {
55
throw new Error('No test env defined');
66
}
77

8-
const config = getPlaywrightConfig(
9-
{
10-
startCommand: testEnv === 'development' ? 'pnpm next dev -p 3030' : 'pnpm next start -p 3030',
11-
port: 3030,
12-
},
13-
{
14-
// This comes with the risk of tests leaking into each other but the tests run quite slow so we should parallelize
15-
workers: '100%',
16-
},
17-
);
8+
const config = getPlaywrightConfig({
9+
startCommand: testEnv === 'development' ? 'pnpm next dev -p 3030' : 'pnpm next start -p 3030',
10+
port: 3030,
11+
});
1812

1913
export default config;

dev-packages/e2e-tests/test-applications/nextjs-app-dir/playwright.config.mjs

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,9 @@ if (!testEnv) {
55
throw new Error('No test env defined');
66
}
77

8-
const config = getPlaywrightConfig(
9-
{
10-
startCommand: testEnv === 'development' ? 'pnpm next dev -p 3030' : 'pnpm next start -p 3030',
11-
port: 3030,
12-
},
13-
{
14-
// This comes with the risk of tests leaking into each other but the tests run quite slow so we should parallelize
15-
workers: '100%',
16-
},
17-
);
8+
const config = getPlaywrightConfig({
9+
startCommand: testEnv === 'development' ? 'pnpm next dev -p 3030' : 'pnpm next start -p 3030',
10+
port: 3030,
11+
});
1812

1913
export default config;

dev-packages/e2e-tests/test-applications/nextjs-orpc/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,8 @@
4141
},
4242
"volta": {
4343
"extends": "../../package.json"
44+
},
45+
"sentryTest": {
46+
"optional": true
4447
}
4548
}

dev-packages/e2e-tests/test-applications/nextjs-orpc/playwright.config.mjs

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,9 @@ if (!testEnv) {
55
throw new Error('No test env defined');
66
}
77

8-
const config = getPlaywrightConfig(
9-
{
10-
startCommand: testEnv === 'development' ? 'pnpm next dev -p 3030' : 'pnpm next start -p 3030',
11-
port: 3030,
12-
},
13-
{
14-
// This comes with the risk of tests leaking into each other but the tests run quite slow so we should parallelize
15-
workers: '100%',
16-
},
17-
);
8+
const config = getPlaywrightConfig({
9+
startCommand: testEnv === 'development' ? 'pnpm next dev -p 3030' : 'pnpm next start -p 3030',
10+
port: 3030,
11+
});
1812

1913
export default config;

dev-packages/external-contributor-gh-action/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@sentry-internal/external-contributor-gh-action",
33
"description": "An internal Github Action to add external contributors to the CHANGELOG.md file.",
4-
"version": "9.25.0",
4+
"version": "9.25.1",
55
"license": "MIT",
66
"engines": {
77
"node": ">=18"

0 commit comments

Comments
 (0)