8000 Merge branch 'master' into parse-framesonly-safari-extensions · getsentry/sentry-javascript@d4ea2a7 · GitHub
[go: up one dir, main page]

Skip to content

Commit d4ea2a7

Browse files
authored
Merge branch 'master' into parse-framesonly-safari-extensions
2 parents b935acd + 295d263 commit d4ea2a7

File tree

41 files changed

+210
-158
lines changed

Some content is hidden

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

41 files changed

+210
-158
lines changed

CHANGELOG.md

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,17 @@
44

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

7-
## 6.11.1
8-
9-
- fix(nextjs): Differentiate between webpack 4 and 5 in server builds (#3878)
7+
## 6.12.0
8+
9+
- fix(nextjs): Differentiate between webpack 4 and 5 in server builds (#3878)
10+
- fix(core): Skip native frames while searching frame URLs. (#3897)
11+
- fix(vue): Attach props only if VM is available (#3902)
12+
- feat(tracing): Add pg-native support to Postgres integration. (#3894)
13+
- ref(ember): Update addon to support Ember 4.0.0 (beta) (#3915)
14+
- feat(react): Make Profiler _mountSpan attribute protected (#3904)
15+
- fix(ember): allow ember-beta to fail (#3910)
16+
- fix(tracing): Prevent metrics erroring module load in web workers (#3941)
17+
- misc(browser): Log when event is dropped by Dedupe integration (#3943)
1018

1119
## 6.11.0
1220

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"lerna": "3.4.0",
3-
"version": "6.11.0",
3+
"version": "6.12.0",
44
"packages": "packages/*",
55
"npmClient": "yarn",
66
"useWorkspaces": true

packages/angular/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/angular",
3-
"version": "6.11.0",
3+
"version": "6.12.0",
44
"description": "Official Sentry SDK for Angular",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular",
@@ -21,17 +21,17 @@
2121
"@angular/router": "10.x || 11.x || 12.x"
2222
},
2323
"dependencies": {
24-
"@sentry/browser": "6.11.0",
25 F987 -
"@sentry/types": "6.11.0",
26-
"@sentry/utils": "6.11.0",
24+
"@sentry/browser": "6.12.0",
25+
"@sentry/types": "6.12.0",
26+
"@sentry/utils": "6.12.0",
2727
"rxjs": "^6.6.0",
2828
"tslib": "^1.9.3"
2929
},
3030
"devDependencies": {
3131
"@angular/common": "^10.0.3",
3232
"@angular/core": "^10.0.3",
3333
"@angular/router": "^10.0.3",
34-
"@sentry-internal/eslint-config-sdk": "6.11.0",
34+
"@sentry-internal/eslint-config-sdk": "6.12.0",
3535
"npm-run-all": "^4.1.2",
3636
"prettier": "1.19.0",
3737
"rimraf": "^2.6.3",

packages/browser/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/browser",
3-
"version": "6.11.0",
3+
"version": "6.12.0",
44
"description": "Official Sentry SDK for browsers",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser",
@@ -16,13 +16,13 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@sentry/core": "6.11.0",
20-
"@sentry/types": "6.11.0",
21-
"@sentry/utils": "6.11.0",
19+
"@sentry/core": "6.12.0",
20+
"@sentry/types": "6.12.0",
21+
"@sentry/utils": "6.12.0",
2222
"tslib": "^1.9.3"
2323
},
2424
"devDependencies": {
25-
"@sentry-internal/eslint-config-sdk": "6.11.0",
25+
"@sentry-internal/eslint-config-sdk": "6.12.0",
2626
"@types/eslint": "^7.2.0",
2727
"@types/md5": "2.1.33",
2828
"btoa": "^1.2.1",

packages/browser/src/integrations/dedupe.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Event, EventProcessor, Exception, Hub, Integration, StackFrame } from '@sentry/types';
2+
import { logger } from '@sentry/utils';
23

34
/** Deduplication filter */
45
export class Dedupe implements Integration {
@@ -27,6 +28,7 @@ export class Dedupe implements Integration {
2728
// Juuust in case something goes wrong
2829
try {
2930
if (self._shouldDropEvent(currentEvent, self._previousEvent)) {
31+
logger.warn(`Event dropped due to being a duplicate of previously captured event.`);
3032
return null;
3133
}
3234
} catch (_oO) {

packages/core/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/core",
3-
"version": "6.11.0",
3+
"version": "6.12.0",
44
"description": "Base implementation for all Sentry JavaScript SDKs",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/core",
@@ -16,14 +16,14 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@sentry/hub": "6.11.0",
20-
"@sentry/minimal": "6.11.0",
21-
"@sentry/types": "6.11.0",
22-
"@sentry/utils": "6.11.0",
19+
"@sentry/hub": "6.12.0",
20+
"@sentry/minimal": "6.12.0",
21+
"@sentry/types": "6.12.0",
22+
"@sentry/utils": "6.12.0",
2323
"tslib": "^1.9.3"
2424
},
2525
"devDependencies": {
26-
"@sentry-internal/eslint-config-sdk": "6.11.0",
26+
"@sentry-internal/eslint-config-sdk": "6.12.0",
2727
"jest": "^24.7.1",
2828
"npm-run-all": "^4.1.2",
2929
"prettier": "1.19.0",

packages/core/src/version.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export const SDK_VERSION = '6.11.0';
1+
export const SDK_VERSION = '6.12.0';

packages/ember/config/ember-try.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ module.exports = async function() {
3030
'ember-source': await getChannelURL('beta'),
3131
},
3232
},
33+
allowedToFail: true,
3334
},
3435
embroiderSafe(),
3536
{

packages/ember/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/ember",
3-
"version": "6.11.0",
3+
"version": "6.12.0",
44
"description": "Official Sentry SDK for Ember.js",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/ember",
@@ -32,10 +32,10 @@
3232
},
3333
"dependencies": {
3434
"@embroider/macros": "~0.37.0",
35-
"@sentry/browser": "6.11.0",
36-
"@sentry/tracing": "6.11.0",
37-
"@sentry/types": "6.11.0",
38-
"@sentry/utils": "6.11.0",
35+
"@sentry/browser": "6.12.0",
36+
"@sentry/tracing": "6.12.0",
37+
"@sentry/types": "6.12.0",
38+
"@sentry/utils": "6.12.0",
3939
"ember-auto-import": "^1.6.0",
4040
"ember-cli-babel": "^7.26.6",
4141
"ember-cli-htmlbars": "^5.1.2",
@@ -47,7 +47,7 @@
4747
"@embroider/test-setup": "~0.37.0",
4848
"@glimmer/component": "^1.0.0",
4949
"@glimmer/tracking": "^1.0.0",
50-
"@sentry-internal/eslint-config-sdk": "6.11.0",
50+
"@sentry-internal/eslint-config-sdk": "6.12.0",
5151
"@types/ember": "^3.16.5",
5252
"@types/ember-qunit": "^3.4.9",
5353
"@types/ember__test-helpers": "^1.7.0",

packages/eslint-config-sdk/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/eslint-config-sdk",
3-
"version": "6.11.0",
3+
"version": "6.12.0",
44
"description": "Official Sentry SDK eslint config",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-config-sdk",
@@ -19,8 +19,8 @@
1919
"access": "public"
2020
},
2121
"dependencies": {
22-
"@sentry-internal/eslint-plugin-sdk": "6.11.0",
23-
"@sentry-internal/typescript": "6.11.0",
22+
"@sentry-internal/eslint-plugin-sdk": "6.12.0",
23+
"@sentry-internal/typescript": "6.12.0",
2424
"@typescript-eslint/eslint-plugin": "^3.9.0",
2525
"@typescript-eslint/parser": "^3.9.0",
2626
"eslint-config-prettier": "^6.11.0",

0 commit comments

Comments
 (0)
0