Skip to content

Commit 0207695

Browse files
authored
Merge branch 'master' into onur/gecko-stacktraces
2 parents 5652ba7 + 20d5fa7 commit 0207695

File tree

36 files changed

+139
-129
lines changed

36 files changed

+139
-129
lines changed

CHANGELOG.md

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

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

7+
## 6.14.3
8+
9+
- Revert: ref(utils): Use type predicates in `is` utility functions (#4124)
10+
11+
## 6.14.2
12+
13+
- feat(awslambda) : Capture errors individually on sqs partial batch failure (#4130)
14+
- feat(gatsby): Upload source maps automatically when sentry-cli is configured (#4109)
15+
- fix(nextjs): Prevent `false API resolved without sending a response` warning (#4139)
16+
- fix(vue): Merge default and manual hooks while creating mixins. (#4132)
17+
- ref(utils): Use type predicates in `is` utility functions (#4124)
18+
19+
Features, fixes, and improvements in this release have been contributed by: @J4YF7O. Thank you for your contributions!
20+
721
## 6.14.1
822

923
- feat(gatsby): Support Gatsby v4 (#4120)

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.14.1",
3+
"version": "6.14.3",
44
"packages": "packages/*",
55
"npmClient": "yarn",
66
"useWorkspaces": true

packages/angular/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/angular",
3-
"version": "6.14.1",
3+
"version": "6.14.3",
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,9 +21,9 @@
2121
"@angular/router": "10.x || 11.x || 12.x"
2222
},
2323
"dependencies": {
24-
"@sentry/browser": "6.14.1",
25-
"@sentry/types": "6.14.1",
26-
"@sentry/utils": "6.14.1",
24+
"@sentry/browser": "6.14.3",
25+
"@sentry/types": "6.14.3",
26+
"@sentry/utils": "6.14.3",
2727
"rxjs": "^6.6.0",
2828
"tslib": "^1.9.3"
2929
},

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.14.1",
3+
"version": "6.14.3",
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.14.1",
20-
"@sentry/types": "6.14.1",
21-
"@sentry/utils": "6.14.1",
19+
"@sentry/core": "6.14.3",
20+
"@sentry/types": "6.14.3",
21+
"@sentry/utils": "6.14.3",
2222
"tslib": "^1.9.3"
2323
},
2424
"devDependencies": {
25-
"@sentry-internal/eslint-config-sdk": "6.14.1",
25+
"@sentry-internal/eslint-config-sdk": "6.14.3",
2626
"@types/eslint": "^7.2.0",
2727
"@types/md5": "2.1.33",
2828
"btoa": "^1.2.1",

packages/browser/src/eventbuilder.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,15 @@ export function eventFromUnknownInput(
6565
): Event {
6666
let event: Event;
6767

68-
if (isErrorEvent(exception)) {
68+
if (isErrorEvent(exception as ErrorEvent) && (exception as ErrorEvent).error) {
6969
// If it is an ErrorEvent with `error` property, extract it to get actual Error
70+
const errorEvent = exception as ErrorEvent;
7071
// eslint-disable-next-line no-param-reassign
71-
exception = exception.error;
72-
event = eventFromStacktrace(computeStackTrace(exception));
72+
exception = errorEvent.error;
73+
event = eventFromStacktrace(computeStackTrace(exception as Error));
7374
return event;
7475
}
75-
if (isDOMError(exception) || isDOMException(exception)) {
76+
if (isDOMError(exception as DOMError) || isDOMException(exception as DOMException)) {
7677
// If it is a DOMError or DOMException (which are legacy APIs, but still supported in some browsers)
7778
// then we just extract the name, code, and message, as they don't provide anything else
7879
// https://developer.mozilla.org/en-US/docs/Web/API/DOMError
@@ -89,9 +90,9 @@ export function eventFromUnknownInput(
8990

9091
return event;
9192
}
92-
if (isError(exception)) {
93+
if (isError(exception as Error)) {
9394
// we have a real Error object, do nothing
94-
event = eventFromStacktrace(computeStackTrace(exception));
95+
event = eventFromStacktrace(computeStackTrace(exception as Error));
9596
return event;
9697
}
9798
if (isPlainObject(exception) || isEvent(exception)) {

packages/core/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/core",
3-
"version": "6.14.1",
3+
"version": "6.14.3",
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,10 +16,10 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@sentry/hub": "6.14.1",
20-
"@sentry/minimal": "6.14.1",
21-
"@sentry/types": "6.14.1",
22-
"@sentry/utils": "6.14.1",
19+
"@sentry/hub": "6.14.3",
20+
"@sentry/minimal": "6.14.3",
21+
"@sentry/types": "6.14.3",
22+
"@sentry/utils": "6.14.3",
2323
"tslib": "^1.9.3"
2424
},
2525
"devDependencies": {

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.14.1';
1+
export const SDK_VERSION = '6.14.3';

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.14.1",
3+
"version": "6.14.3",
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.14.1",
36-
"@sentry/tracing": "6.14.1",
37-
"@sentry/types": "6.14.1",
38-
"@sentry/utils": "6.14.1",
35+
"@sentry/browser": "6.14.3",
36+
"@sentry/tracing": "6.14.3",
37+
"@sentry/types": "6.14.3",
38+
"@sentry/utils": "6.14.3",
3939
"ember-auto-import": "~1.6.0",
4040
"ember-cli-babel": "~7.26.6",
4141
"ember-cli-htmlbars": "^5.7.1",
@@ -46,7 +46,7 @@
4646
"@embroider/test-setup": "~0.37.0",
4747
"@glimmer/component": "~1.0.0",
4848
"@glimmer/tracking": "~1.0.0",
49-
"@sentry-internal/eslint-config-sdk": "6.14.1",
49+
"@sentry-internal/eslint-config-sdk": "6.14.3",
5050
"@types/ember": "~3.16.5",
5151
"@types/ember-qunit": "~3.4.9",
5252
"@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.14.1",
3+
"version": "6.14.3",
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.14.1",
23-
"@sentry-internal/typescript": "6.14.1",
22+
"@sentry-internal/eslint-plugin-sdk": "6.14.3",
23+
"@sentry-internal/typescript": "6.14.3",
2424
"@typescript-eslint/eslint-plugin": "^3.9.0",
2525
"@typescript-eslint/parser": "^3.9.0",
2626
"eslint-config-prettier": "^6.11.0",

packages/eslint-plugin-sdk/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/eslint-plugin-sdk",
3-
"version": "6.14.1",
3+
"version": "6.14.3",
44
"description": "Official Sentry SDK eslint plugin",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-plugin-sdk",

0 commit comments

Comments
 (0)