Skip to content

Commit 06e658f

Browse files
committed
feat: Update all deps + tslint
1 parent 7a62d02 commit 06e658f

Some content is hidden

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

84 files changed

+1443
-1134
lines changed

package.json

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
"test": "lerna run --stream --concurrency 1 --sort test",
1414
"codecov": "codecov"
1515
},
16+
"toolchain": {
17+
"node": "10.15.3",
18+
"yarn": "1.13.0"
19+
},
1620
"workspaces": [
1721
"packages/browser",
1822
"packages/core",
@@ -28,30 +32,29 @@
2832
"devDependencies": {
2933
"@google-cloud/storage": "^2.3.1",
3034
"@types/chai": "^4.1.3",
31-
"@types/jest": "^24.0.6",
35+
"@types/jest": "^24.0.11",
3236
"@types/mocha": "^5.2.0",
33-
"@types/node": "^11.9.4",
37+
"@types/node": "^11.11.3",
3438
"@types/raven": "^2.5.1",
35-
"@types/sinon": "^7.0.6",
39+
"@types/sinon": "^7.0.10",
3640
"chai": "^4.1.2",
3741
"codecov": "^3.0.2",
38-
"danger": "^7.0.12",
42+
"danger": "^7.0.14",
3943
"danger-plugin-tslint": "^2.0.0",
40-
"jest": "^24.1.0",
41-
"karma-sinon": "^1.0.5",
42-
"lerna": "3.13.0",
43-
"mocha": "^5.2.0",
44+
"jest": "^24.5.0",
45+
"lerna": "3.13.1",
46+
"mocha": "^6.0.2",
4447
"npm-run-all": "^4.1.2",
4548
"prettier": "^1.14.0",
4649
"prettier-check": "^2.0.0",
47-
"replace-in-file": "^3.4.2",
50+
"replace-in-file": "^3.4.4",
4851
"rimraf": "^2.6.3",
49-
"sinon": "^7.1.1",
50-
"ts-jest": "^23.10.5",
51-
"tslint": "^5.11.0",
52+
"sinon": "^7.2.7",
53+
"ts-jest": "^24.0.0",
54+
"tslint": "^5.14.0",
5255
"typedoc": "^0.14.2",
5356
"typedoc-plugin-monorepo": "^0.1.0",
54-
"typescript": "^3.2.0",
57+
"typescript": "^3.3.3333",
5558
"typescript-tslint-plugin": "^0.3.1"
5659
}
5760
}

packages/browser/package.json

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
"devDependencies": {
2626
"@types/md5": "2.1.33",
2727
"chai": "^4.1.2",
28-
"jest": "^24.1.0",
29-
"jsdom": "^13.2.0",
30-
"karma": "^4.0.0",
28+
"jest": "^24.5.0",
29+
"jsdom": "^14.0.0",
30+
"karma": "^4.0.1",
3131
"karma-chai": "^0.1.0",
3232
"karma-chrome-launcher": "^2.2.0",
3333
"karma-failed-reporter": "0.0.3",
@@ -36,22 +36,23 @@
3636
"karma-mocha-reporter": "^2.2.5",
3737
"karma-rollup-preprocessor": "^7.0.0",
3838
"karma-sauce-launcher": "^2.0.2",
39+
"karma-sinon": "^1.0.5",
3940
"karma-typescript": "^4.0.0",
4041
"karma-typescript-es6-transform": "^4.0.0",
4142
"npm-run-all": "^4.1.2",
4243
"prettier": "^1.16.4",
4344
"prettier-check": "^2.0.0",
4445
"rimraf": "^2.6.3",
45-
"rollup": "^1.4.0",
46+
"rollup": "^1.6.0",
4647
"rollup-plugin-commonjs": "^9.2.1",
4748
"rollup-plugin-license": "^0.8.1",
4849
"rollup-plugin-node-resolve": "^4.0.1",
4950
"rollup-plugin-terser": "^4.0.4",
50-
"rollup-plugin-typescript2": "^0.19.2",
51-
"sinon": "^7.2.3",
52-
"tslint": "^5.12.1",
53-
"typescript": "^3.3.3",
54-
"webpack": "^4.29.5"
51+
"rollup-plugin-typescript2": "^0.20.1",
52+
"sinon": "^7.2.7",
53+
"tslint": "^5.14.0",
54+
"typescript": "^3.3.3333",
55+
"webpack": "^4.29.6"
5556
},
5657
"scripts": {
5758
"build": "run-s build:esm build:bundle",

packages/browser/src/backend.ts

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { isDOMError, isDOMException, isError, isErrorEvent, isPlainObject } from
44
import { addExceptionTypeValue } from '@sentry/utils/misc';
55
import { supportsBeacon, supportsFetch } from '@sentry/utils/supports';
66
import { SyncPromise } from '@sentry/utils/syncpromise';
7+
78
import { eventFromPlainObject, eventFromStacktrace, prepareFramesForEvent } from './parsers';
89
import { computeStackTrace } from './tracekit';
910
import { BeaconTransport, FetchTransport, XHRTransport } from './transports';
@@ -34,7 +35,7 @@ export interface BrowserOptions extends Options {
3435
*/
3536
export class BrowserBackend extends BaseBackend<BrowserOptions> {
3637
/**
37-
* @inheritdoc
38+
* @inheritDoc
3839
*/
3940
protected _setupTransport(): Transport {
4041
if (!this._options.dsn) {
@@ -48,9 +49,11 @@ export class BrowserBackend extends BaseBackend<BrowserOptions> {
4849

4950
if (this._options.transport) {
5051
return new this._options.transport(transportOptions);
51-
} else if (supportsBeacon()) {
52+
}
53+
if (supportsBeacon()) {
5254
return new BeaconTransport(transportOptions);
53-
} else if (supportsFetch()) {
55+
}
56+
if (supportsFetch()) {
5457
return new FetchTransport(transportOptions);
5558
}
5659
return new XHRTransport(transportOptions);
@@ -68,7 +71,8 @@ export class BrowserBackend extends BaseBackend<BrowserOptions> {
6871
exception = errorEvent.error; // tslint:disable-line:no-parameter-reassignment
6972
event = eventFromStacktrace(computeStackTrace(exception as Error));
7073
return SyncPromise.resolve(this._buildEvent(event, hint));
71-
} else if (isDOMError(exception as DOMError) || isDOMException(exception as DOMException)) {
74+
}
75+
if (isDOMError(exception as DOMError) || isDOMException(exception as DOMException)) {
7276
// If it is a DOMError or DOMException (which are legacy APIs, but still supported in some browsers)
7377
// then we just extract the name and message, as they don't provide anything else
7478
// https://developer.mozilla.org/en-US/docs/Web/API/DOMError
@@ -81,11 +85,13 @@ export class BrowserBackend extends BaseBackend<BrowserOptions> {
8185
addExceptionTypeValue(messageEvent, message);
8286
return SyncPromise.resolve(this._buildEvent(messageEvent, hint));
8387
});
84-
} else if (isError(exception as Error)) {
88+
}
89+
if (isError(exception as Error)) {
8590
// we have a real Error object, do nothing
8691
event = eventFromStacktrace(computeStackTrace(exception as Error));
8792
return SyncPromise.resolve(this._buildEvent(event, hint));
88-
} else if (isPlainObject(exception as {}) && hint && hint.syntheticException) {
93+
}
94+
if (isPlainObject(exception as {}) && hint && hint.syntheticException) {
8995
// If it is plain Object, serialize it manually and extract options
9096
// This will allow us to group events based on top-level keys
9197
// which is much better than creating new group when any key/value change

packages/browser/src/client.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { DsnLike, Event, EventHint } from '@sentry/types';
33
import { logger } from '@sentry/utils/logger';
44
import { getGlobalObject } from '@sentry/utils/misc';
55
import { SyncPromise } from '@sentry/utils/syncpromise';
6+
67
import { BrowserBackend, BrowserOptions } from './backend';
78
import { SDK_NAME, SDK_VERSION } from './version';
89

packages/browser/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ export { defaultIntegrations, forceLoad, init, lastEventId, onLoad, showReportDi
3333
export { SDK_NAME, SDK_VERSION } from './version';
3434

3535
import { Integrations as CoreIntegrations } from '@sentry/core';
36+
3637
import * as BrowserIntegrations from './integrations';
3738
import * as Transports from './transports';
3839

packages/browser/src/integrations/breadcrumbs.ts

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ import { getEventDescription, getGlobalObject, parseUrl } from '@sentry/utils/mi
66
import { fill, normalize } from '@sentry/utils/object';
77
import { safeJoin } from '@sentry/utils/string';
88
import { supportsBeacon, supportsHistory, supportsNativeFetch } from '@sentry/utils/supports';
9+
910
import { BrowserClient } from '../client';
11+
1012
import { breadcrumbEventHandler, keypressEventHandler, wrap } from './helpers';
1113

1214
const global = getGlobalObject() as Window;
@@ -66,13 +68,17 @@ export class Breadcrumbs implements Integration {
6668
};
6769
}
6870

69-
/** JSDoc */
71+
/**
72+
* @hidden
73+
*/
7074
private _instrumentBeacon(): void {
7175
if (!supportsBeacon()) {
7276
return;
7377
}
7478

75-
/** JSDoc */
79+
/**
80+
* @hidden
81+
*/
7682
function beaconReplacementFunction(originalBeaconFunction: () => void): () => void {
7783
return function(this: History, ...args: any[]): void {
7884
const url = args[0];
@@ -310,7 +316,9 @@ export class Breadcrumbs implements Integration {
310316
}
311317
};
312318

313-
/** JSDoc */
319+
/**
320+
* @hidden
321+
*/
314322
function historyReplacementFunction(originalHistoryFunction: () => void): () => void {
315323
// note history.pushState.length is 0; intentionally not declaring
316324
// params to preserve 0 arity
@@ -335,7 +343,9 @@ export class Breadcrumbs implements Integration {
335343
return;
336344
}
337345

338-
/** JSDoc */
346+
/**
347+
* @hidden
348+
*/
339349
function wrapProp(prop: string, xhr: XMLHttpRequest): void {
340350
// TODO: Fix XHR types
341351
if (prop in xhr && typeof (xhr as { [key: string]: any })[prop] === 'function') {
@@ -392,7 +402,9 @@ export class Breadcrumbs implements Integration {
392402
addSentryBreadcrumb(args[0]);
393403
}
394404

395-
/** JSDoc */
405+
/**
406+
* @hidden
407+
*/
396408
function onreadystatechangeHandler(): void {
397409
if (xhr.readyState === 4) {
398410
if (xhr.__sentry_own_request__) {

packages/browser/src/integrations/globalhandlers.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@ import { logger } from '@sentry/utils/logger';
44
import { addExceptionTypeValue } from '@sentry/utils/misc';
55
import { normalize } from '@sentry/utils/object';
66
import { truncate } from '@sentry/utils/string';
7+
78
import { eventFromStacktrace } from '../parsers';
89
import {
910
installGlobalHandler,
1011
installGlobalUnhandledRejectionHandler,
1112
StackTrace as TraceKitStackTrace,
1213
subscribe,
1314
} from '../tracekit';
15+
1416
import { shouldIgnoreOnError } from './helpers';
1517

1618
/** JSDoc */

packages/browser/src/integrations/helpers.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,8 @@ export function wrap(
8080

8181
if (fn.handleEvent) {
8282
return fn.handleEvent.apply(this, wrappedArguments);
83-
} else {
84-
return fn.apply(this, wrappedArguments);
8583
}
84+
return fn.apply(this, wrappedArguments);
8685
} catch (ex) {
8786
ignoreNextOnError();
8887

packages/browser/src/integrations/linkederrors.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { addGlobalEventProcessor, getCurrentHub } from '@sentry/core';
22
import { Event, EventHint, Exception, ExtendedError, Integration } from '@sentry/types';
3+
34
import { exceptionFromStacktrace } from '../parsers';
45
import { computeStackTrace } from '../tracekit';
56

packages/browser/src/integrations/trycatch.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { Integration, WrappedFunction } from '@sentry/types';
22
import { getGlobalObject } from '@sentry/utils/misc';
33
import { fill } from '@sentry/utils/object';
4+
45
import { breadcrumbEventHandler, keypressEventHandler, wrap } from './helpers';
56

67
/** Wrap timer functions and event targets to catch errors and provide better meta data */
@@ -114,7 +115,8 @@ export class TryCatch implements Integration {
114115
}
115116
if (eventType === 'click') {
116117
return clickHandler(event);
117-
} else if (eventType === 'keypress') {
118+
}
119+
if (eventType === 'keypress') {
118120
return keypressHandler(event);
119121
}
120122
};

packages/browser/src/parsers.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { Event, Exception, StackFrame } from '@sentry/types';
22
import { normalizeToSize } from '@sentry/utils/object';
33
import { keysToEventMessage } from '@sentry/utils/string';
4+
45
import { computeStackTrace, StackFrame as TraceKitStackFrame, StackTrace as TraceKitStackTrace } from './tracekit';
56

67
const STACKTRACE_LIMIT = 50;

packages/browser/src/sdk.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { getCurrentHub, initAndBind, Integrations as CoreIntegrations } from '@sentry/core';
2+
23
import { BrowserOptions } from './backend';
34
import { BrowserClient, ReportDialogOptions } from './client';
45
import { Breadcrumbs, GlobalHandlers, LinkedErrors, TryCatch, UserAgent } from './integrations';

packages/browser/src/transports/beacon.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { Event, Response, Status } from '@sentry/types';
22
import { getGlobalObject } from '@sentry/utils/misc';
3+
34
import { BaseTransport } from './base';
45

56
const global = getGlobalObject() as Window;

packages/browser/src/transports/fetch.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { Event, Response, Status } from '@sentry/types';
22
import { getGlobalObject } from '@sentry/utils/misc';
33
import { supportsReferrerPolicy } from '@sentry/utils/supports';
4+
45
import { BaseTransport } from './base';
56

67
const global = getGlobalObject() as Window;

packages/browser/src/transports/xhr.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Event, Response, Status } from '@sentry/types';
2+
23
import { BaseTransport } from './base';
34

45
/** `XHR` based transport */

packages/browser/test/backend.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { expect } from 'chai';
2+
23
import { BrowserBackend } from '../src/backend';
34

45
let backend: BrowserBackend;

packages/browser/test/index.test.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { expect } from 'chai';
22
import { SinonSpy, spy } from 'sinon';
3+
34
import {
45
addBreadcrumb,
56
BrowserClient,
@@ -14,14 +15,15 @@ import {
1415
Integrations,
1516
Scope,
1617
} from '../src';
18+
1719
import { SimpleTransport } from './mocks/simpletransport';
1820

1921
const dsn = 'https://53039209a22b4ec1bcc296a3c9fdecd6@sentry.io/4291';
2022

2123
declare var global: any;
2224

2325
describe('SentryBrowser', () => {
24-
const beforeSend: SinonSpy = spy((event: Event) => event);
26+
const beforeSend: SinonSpy<[Event], Event> = spy((event: Event) => event);
2527

2628
before(() => {
2729
init({
@@ -92,10 +94,10 @@ describe('SentryBrowser', () => {
9294

9395
const event = beforeSend.args[0][0];
9496
expect(event.exception).to.not.be.undefined;
95-
expect(event.exception.values[0]).to.not.be.undefined;
96-
expect(event.exception.values[0].type).to.equal('Error');
97-
expect(event.exception.values[0].value).to.equal('test');
98-
expect(event.exception.values[0].stacktrace).to.not.be.empty;
97+
expect(event.exception!.values![0]).to.not.be.undefined;
98+
expect(event.exception!.values![0].type).to.equal('Error');
99+
expect(event.exception!.values![0].value).to.equal('test');
100+
expect(event.exception!.values![0].stacktrace).to.not.be.empty;
99101
});
100102

101103
it('should capture a message', done => {

packages/browser/test/integrations/helpers.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { WrappedFunction } from '@sentry/types';
22
import { expect } from 'chai';
33
import { SinonSpy, spy } from 'sinon';
4+
45
import { wrap } from '../../src/integrations/helpers';
56

67
describe('wrap()', () => {

packages/browser/test/integrations/linkederrors.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { ExtendedError } from '@sentry/types';
22
import { expect } from 'chai';
33
import { stub } from 'sinon';
4+
45
import { BrowserBackend } from '../../src/backend';
56
import { LinkedErrors } from '../../src/integrations/linkederrors';
67

packages/browser/test/parsers.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { expect } from 'chai';
2+
23
import { prepareFramesForEvent } from '../src/parsers';
34

45
describe('Parsers', () => {

packages/browser/test/transports/base.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { expect } from 'chai';
2+
23
import { BaseTransport } from '../../src/transports/base';
34

45
const testDsn = 'https://123@sentry.io/42';

0 commit comments

Comments
 (0)