Skip to content

Commit 64e6880

Browse files
authored
Merge branch 'develop' into develop
2 parents 916519f + f2a777a commit 64e6880

File tree

60 files changed

+2526
-2438
lines changed

Some content is hidden

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

60 files changed

+2526
-2438
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@
1212

1313
Work in this release was contributed by @tjhiggins, @chris-basebone, @GrizliK1988, @davidturissini, @nwalters512, @aloisklink, @arturovt, @benjick, @maximepvrt, @mstrokin, @kunal-511, @jahands, @jrandolf, @tannerlinsley, @Zen-cronic, @maxmaxme and @nathankleyn. Thank you for your contributions!
1414

15+
## 9.0.0-alpha.2
16+
17+
This is an alpha release of the upcoming major release of version 9.
18+
This release does not yet entail a comprehensive changelog as version 9 is not yet stable.
19+
20+
For this release's iteration of the migration guide, see the [Migration Guide as per `9.0.0-alpha.2`](https://github.com/getsentry/sentry-javascript/blob/fbedd59954d378264d11b879b6eb2a482fbc0d1b/MIGRATION.md).
21+
Please note that the migration guide is work in progress and subject to change.
22+
1523
## 9.0.0-alpha.1
1624

1725
This is an alpha release of the upcoming major release of version 9.

MIGRATION.md

Lines changed: 351 additions & 1774 deletions
Large diffs are not rendered by default.

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.0.0-alpha.1",
3+
"version": "9.0.0-alpha.2",
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.31.0",
45-
"@sentry/browser": "9.0.0-alpha.1",
45+
"@sentry/browser": "9.0.0-alpha.2",
4646
"axios": "1.7.7",
4747
"babel-loader": "^8.2.2",
4848
"fflate": "0.8.2",

dev-packages/browser-integration-tests/suites/manual-client/skip-init-browser-extension/test.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { expect } from '@playwright/test';
22
import { sentryTest } from '../../../utils/fixtures';
3+
import { hasDebugLogs } from '../../../utils/helpers';
34

45
sentryTest(
56
'should not initialize when inside a Firefox/Safari browser extension',
@@ -18,9 +19,14 @@ sentryTest(
1819
});
1920

2021
expect(isInitialized).toEqual(false);
21-
expect(errorLogs.length).toEqual(1);
22-
expect(errorLogs[0]).toEqual(
23-
'[Sentry] You cannot run Sentry this way in a browser extension, check: https://docs.sentry.io/platforms/javascript/best-practices/browser-extensions/',
24-
);
22+
23+
if (hasDebugLogs()) {
24+
expect(errorLogs.length).toEqual(1);
25+
expect(errorLogs[0]).toEqual(
26+
'[Sentry] You cannot run Sentry this way in a browser extension, check: https://docs.sentry.io/platforms/javascript/best-practices/browser-extensions/',
27+
);
28+
} else {
29+
expect(errorLogs.length).toEqual(0);
30+
}
2531
},
2632
);

dev-packages/browser-integration-tests/suites/manual-client/skip-init-chrome-extension/test.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { expect } from '@playwright/test';
22
import { sentryTest } from '../../../utils/fixtures';
3+
import { hasDebugLogs } from '../../../utils/helpers';
34

45
sentryTest('should not initialize when inside a Chrome browser extension', async ({ getLocalTestUrl, page }) => {
56
const errorLogs: string[] = [];
@@ -16,8 +17,13 @@ sentryTest('should not initialize when inside a Chrome browser extension', async
1617
});
1718

1819
expect(isInitialized).toEqual(false);
19-
expect(errorLogs.length).toEqual(1);
20-
expect(errorLogs[0]).toEqual(
21-
'[Sentry] You cannot run Sentry this way in a browser extension, check: https://docs.sentry.io/platforms/javascript/best-practices/browser-extensions/',
22-
);
20+
21+
if (hasDebugLogs()) {
22+
expect(errorLogs.length).toEqual(1);
23+
expect(errorLogs[0]).toEqual(
24+
'[Sentry] You cannot run Sentry this way in a browser extension, check: https://docs.sentry.io/platforms/javascript/best-practices/browser-extensions/',
25+
);
26+
} else {
27+
expect(errorLogs.length).toEqual(0);
28+
}
2329
});

dev-packages/browser-integration-tests/utils/helpers.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,14 @@ export function shouldSkipFeatureFlagsTest(): boolean {
302302
return bundle != null && !bundle.includes('esm') && !bundle.includes('cjs');
303303
}
304304

305+
/**
306+
* Returns true if the current bundle has debug logs.
307+
*/
308+
export function hasDebugLogs(): boolean {
309+
const bundle = process.env.PW_BUNDLE;
310+
return !bundle?.includes('min');
311+
}
312+
305313
/**
306314
* Waits until a number of requests matching urlRgx at the given URL arrive.
307315
* If the timeout option is configured, this function will abort waiting, even if it hasn't received the configured

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.0.0-alpha.1",
3+
"version": "9.0.0-alpha.2",
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.0.0-alpha.1",
4+
"version": "9.0.0-alpha.2",
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.0.0-alpha.1",
3+
"version": "9.0.0-alpha.2",
44
"license": "MIT",
55
"private": true,
66
"scripts": {

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.0.0-alpha.1",
4+
"version": "9.0.0-alpha.2",
55
"license": "MIT",
66
"engines": {
77
"node": ">=18"

0 commit comments

Comments
 (0)