Merge branch 'master' into kmclb-add-traces-sampler-option

Author: rhcarvalho

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "scripts": {
-    "build": "lerna run --stream --concurrency 1 --sort build",
+    "build": "node ./scripts/verify-packages-versions.js && lerna run --stream --concurrency 1 --sort build",
     "build:es5": "lerna run --stream --concurrency 1 --sort build:es5",
     "build:esm": "lerna run --stream --concurrency 1 --sort build:esm",
     "build:watch": "lerna run build:watch --stream --no-sort --concurrency 9999",
@@ -61,7 +61,7 @@
     "size-limit": "^4.5.5",
     "ts-jest": "^24.0.2",
     "typedoc": "^0.18.0",
-    "typescript": "3.9.7"
+    "typescript": "3.7.5"
   },
   "resolutions": {
     "**/agent-base": "5"

packages/angular/README.md

@@ -64,7 +64,7 @@ import { createErrorHandler } from '@sentry/angular';
 export class AppModule {}
 ```
 
-Additionally, `createErrorHandler` accepts a set of options that allows you to configure its behaviour. For more details
+Additionally, `createErrorHandler` accepts a set of options that allows you to configure its behavior. For more details
 see `ErrorHandlerOptions` interface in `src/errorhandler.ts`.
 
 ### Tracing

packages/angular/package.json

@@ -31,7 +31,7 @@
     "npm-run-all": "^4.1.2",
     "prettier": "1.17.0",
     "rimraf": "^2.6.3",
-    "typescript": "3.9.7"
+    "typescript": "3.7.5"
   },
   "scripts": {
     "build": "run-p build:es5 build:esm",

packages/angular/src/errorhandler.ts

@@ -3,7 +3,7 @@ import { ErrorHandler as AngularErrorHandler, Injectable } from '@angular/core';
 import * as Sentry from '@sentry/browser';
 
 /**
- * Options used to configure the behaviour of the Angular ErrorHandler.
+ * Options used to configure the behavior of the Angular ErrorHandler.
  */
 export interface ErrorHandlerOptions {
   logErrors?: boolean;

packages/apm/package.json

@@ -37,7 +37,7 @@
     "rollup-plugin-node-resolve": "^4.2.3",
     "rollup-plugin-terser": "^4.0.4",
     "rollup-plugin-typescript2": "^0.21.0",
-    "typescript": "3.9.7"
+    "typescript": "3.7.5"
   },
   "scripts": {
     "build": "run-p build:es5 build:esm build:bundle",

packages/browser/package.json

@@ -51,7 +51,7 @@
     "rollup-plugin-terser": "^4.0.4",
     "rollup-plugin-typescript2": "^0.21.0",
     "sinon": "^7.3.2",
-    "typescript": "3.9.7",
+    "typescript": "3.7.5",
     "webpack": "^4.30.0"
   },
   "scripts": {

packages/browser/src/tracekit.ts

@@ -46,7 +46,7 @@ const chrome = /^\s*at (?:(.*?) ?\()?((?:file|https?|blob|chrome-extension|addre
 // gecko regex: `(?:bundle|\d+\.js)`: `bundle` is for react native, `\d+\.js` also but specifically for ram bundles because it
 // generates filenames without a prefix like `file://` the filenames in the stacktrace are just 42.js
 // We need this specific case for now because we want no other regex to match.
-const gecko = /^\s*(.*?)(?:\((.*?)\))?(?:^|@)?((?:file|https?|blob|chrome|webpack|resource|moz-extension).*?:\/.*?|\[native code\]|[^@]*(?:bundle|\d+\.js))(?::(\d+))?(?::(\d+))?\s*$/i;
+const gecko = /^\s*(.*?)(?:\((.*?)\))?(?:^|@)?((?:file|https?|blob|chrome|webpack|resource|moz-extension|capacitor).*?:\/.*?|\[native code\]|[^@]*(?:bundle|\d+\.js))(?::(\d+))?(?::(\d+))?\s*$/i;
 const winjs = /^\s*at (?:((?:\[object object\])?.+) )?\(?((?:file|ms-appx|https?|webpack|blob):.*?):(\d+)(?::(\d+))?\)?\s*$/i;
 const geckoEval = /(\S+) line (\d+)(?: > eval line \d+)* > eval/i;
 const chromeEval = /\((\S*)(?::(\d+))(?::(\d+))\)/;

packages/browser/test/unit/transports/fetch.test.ts

@@ -18,7 +18,7 @@ let transport: Transports.BaseTransport;
 
 describe('FetchTransport', () => {
   beforeEach(() => {
-    fetch = stub(window, 'fetch');
+    fetch = (stub(window, 'fetch') as unknown) as SinonStub;
     transport = new Transports.FetchTransport({ dsn: testDsn });
   });
 

packages/core/package.json

@@ -29,7 +29,7 @@
     "npm-run-all": "^4.1.2",
     "prettier": "1.17.0",
     "rimraf": "^2.6.3",
-    "typescript": "3.9.7"
+    "typescript": "3.7.5"
   },
   "scripts": {
     "build": "run-p build:es5 build:esm",

packages/ember/package.json

@@ -75,7 +75,7 @@
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
     "qunit-dom": "^1.2.0",
-    "typescript": "3.9.7"
+    "typescript": "3.7.5"
   },
   "engines": {
     "node": "10.* || >= 12"

packages/eslint-config-sdk/package.json

@@ -34,7 +34,7 @@
   },
   "devDependencies": {
     "eslint": "7.6.0",
-    "typescript": "3.9.7"
+    "typescript": "3.7.5"
   },
   "scripts": {
     "link:yarn": "yarn link",

packages/eslint-plugin-sdk/package.json

@@ -24,7 +24,7 @@
   "devDependencies": {
     "mocha": "^6.2.0",
     "prettier": "1.17.0",
-    "typescript": "3.9.7"
+    "typescript": "3.7.5"
   },
   "scripts": {
     "link:yarn": "yarn link",

packages/gatsby/package.json

@@ -42,7 +42,7 @@
     "prettier": "1.17.0",
     "react": "^16.13.1",
     "rimraf": "^2.6.3",
-    "typescript": "3.9.7"
+    "typescript": "3.7.5"
   },
   "scripts": {
     "build": "run-p build:es5 build:esm",

packages/hub/package.json

@@ -27,7 +27,7 @@
     "npm-run-all": "^4.1.2",
     "prettier": "1.17.0",
     "rimraf": "^2.6.3",
-    "typescript": "3.9.7"
+    "typescript": "3.7.5"
   },
   "scripts": {
     "build": "run-p build:es5 build:esm",

packages/hub/src/hub.ts

@@ -26,7 +26,7 @@ import { Scope } from './scope';
 /**
  * API compatibility version of this hub.
  *
- * WARNING: This number should only be incresed when the global interface
+ * WARNING: This number should only be increased when the global interface
  * changes and new methods are introduced.
  *
  * @hidden

packages/integrations/package.json

@@ -34,7 +34,7 @@
     "rollup-plugin-node-resolve": "^4.2.3",
     "rollup-plugin-terser": "^4.0.4",
     "rollup-plugin-typescript2": "^0.21.0",
-    "typescript": "3.9.7"
+    "typescript": "3.7.5"
   },
   "scripts": {
     "build": "run-p build:es5 build:esm build:bundle",

packages/minimal/package.json

@@ -27,7 +27,7 @@
     "npm-run-all": "^4.1.2",
     "prettier": "1.17.0",
     "rimraf": "^2.6.3",
-    "typescript": "3.9.7"
+    "typescript": "3.7.5"
   },
   "scripts": {
     "build": "run-p build:es5 build:esm",

packages/node/package.json

@@ -38,7 +38,7 @@
     "npm-run-all": "^4.1.2",
     "prettier": "1.17.0",
     "rimraf": "^2.6.3",
-    "typescript": "3.9.7"
+    "typescript": "3.7.5"
   },
   "scripts": {
     "build": "run-p build:es5 build:esm",

packages/node/src/backend.ts

@@ -74,6 +74,7 @@ export class NodeBackend extends BaseBackend<NodeOptions> {
         // This handles when someone does: `throw "something awesome";`
         // We use synthesized Error here so we can extract a (rough) stack trace.
         ex = (hint && hint.syntheticException) || new Error(exception as string);
+        (ex as Error).message = exception;
       }
       mechanism.synthetic = true;
     }

packages/node/test/index.test.ts

@@ -102,7 +102,7 @@ describe('SentryNode', () => {
     });
 
     test('capture an exception', done => {
-      expect.assertions(5);
+      expect.assertions(6);
       getCurrentHub().bindClient(
         new NodeClient({
           beforeSend: (event: Event) => {
@@ -111,6 +111,7 @@ describe('SentryNode', () => {
             expect(event.exception!.values![0]).not.toBeUndefined();
             expect(event.exception!.values![0].stacktrace!).not.toBeUndefined();
             expect(event.exception!.values![0].stacktrace!.frames![2]).not.toBeUndefined();
+            expect(event.exception!.values![0].value).toEqual('test');
             done();
             return null;
           },
@@ -127,6 +128,33 @@ describe('SentryNode', () => {
       }
     });
 
+    test('capture a string exception', done => {
+      expect.assertions(6);
+      getCurrentHub().bindClient(
+        new NodeClient({
+          beforeSend: (event: Event) => {
+            expect(event.tags).toEqual({ test: '1' });
+            expect(event.exception).not.toBeUndefined();
+            expect(event.exception!.values![0]).not.toBeUndefined();
+            expect(event.exception!.values![0].stacktrace!).not.toBeUndefined();
+            expect(event.exception!.values![0].stacktrace!.frames![2]).not.toBeUndefined();
+            expect(event.exception!.values![0].value).toEqual('test string exception');
+            done();
+            return null;
+          },
+          dsn,
+        }),
+      );
+      configureScope((scope: Scope) => {
+        scope.setTag('test', '1');
+      });
+      try {
+        throw 'test string exception';
+      } catch (e) {
+        captureException(e);
+      }
+    });
+
     test('capture an exception no pre/post context', done => {
       expect.assertions(10);
       getCurrentHub().bindClient(

packages/react/package.json

@@ -55,7 +55,7 @@
     "react-test-renderer": "^16.13.1",
     "redux": "^4.0.5",
     "rimraf": "^2.6.3",
-    "typescript": "3.9.7"
+    "typescript": "3.7.5"
   },
   "scripts": {
     "build": "run-p build:es5 build:esm",

packages/tracing/.npmignore

@@ -1,4 +1,5 @@
 *
 !/dist/**/*
+!/build/**/*
 !/esm/**/*
 *.tsbuildinfo

packages/tracing/package.json

@@ -39,7 +39,7 @@
     "rollup-plugin-node-resolve": "^4.2.3",
     "rollup-plugin-terser": "^4.0.4",
     "rollup-plugin-typescript2": "^0.21.0",
-    "typescript": "3.9.7"
+    "typescript": "3.7.5"
   },
   "scripts": {
     "build": "run-p build:es5 build:esm build:bundle",

packages/tracing/src/browser/browsertracing.ts

@@ -63,7 +63,7 @@ export interface BrowserTracingOptions extends RequestInstrumentationOptions {
 
   /**
    * beforeNavigate is called before a pageload/navigation transaction is created and allows for users
-   * to set custom transaction context. Default behaviour is to return `window.location.pathname`.
+   * to set custom transaction context. Default behavior is to return `window.location.pathname`.
    *
    * If undefined is returned, a pageload/navigation transaction will not be created.
    */
@@ -203,7 +203,7 @@ export class BrowserTracing implements Integration {
     logger.log(`[Tracing] starting ${ctx.op} idleTransaction on scope`);
     const idleTransaction = startIdleTransaction(hub, ctx, idleTimeout, true);
     idleTransaction.registerBeforeFinishCallback((transaction, endTimestamp) => {
-      this._metrics.addPerformanceEntires(transaction);
+      this._metrics.addPerformanceEntries(transaction);
       adjustTransactionDuration(secToMs(maxTransactionDuration), transaction, endTimestamp);
     });
 

packages/tracing/src/browser/metrics.ts

@@ -26,7 +26,7 @@ export class MetricsInstrumentation {
   }
 
   /** Add performance related spans to a transaction */
-  public addPerformanceEntires(transaction: Transaction): void {
+  public addPerformanceEntries(transaction: Transaction): void {
     if (!global || !global.performance || !global.performance.getEntries) {
       // Gatekeeper if performance API not available
       return;

packages/tracing/src/browser/router.ts

@@ -30,9 +30,9 @@ export function defaultRoutingInstrumentation<T extends TransactionType>(
         /**
          * This early return is there to account for some cases where navigation transaction
          * starts right after long running pageload. We make sure that if `from` is undefined
-         * and that a valid `startingURL` exists, we don't uncessarily create a navigation transaction.
+         * and that a valid `startingURL` exists, we don't unnecessarily create a navigation transaction.
          *
-         * This was hard to duplicate, but this behaviour stopped as soon as this fix
+         * This was hard to duplicate, but this behavior stopped as soon as this fix
          * was applied. This issue might also only be caused in certain development environments
          * where the usage of a hot module reloader is causing errors.
          */

packages/tracing/src/transaction.ts

@@ -73,7 +73,7 @@ export class Transaction extends SpanClass {
 
     if (this.sampled !== true) {
       // At this point if `sampled !== true` we want to discard the transaction.
-      logger.log('Discarding transaction because its trace was not chosen to be sampled.');
+      logger.log('[Tracing] Discarding transaction because its trace was not chosen to be sampled.');
       return undefined;
     }
 

packages/types/package.json

@@ -20,7 +20,7 @@
     "eslint": "7.6.0",
     "npm-run-all": "^4.1.2",
     "prettier": "1.17.0",
-    "typescript": "3.9.7"
+    "typescript": "3.7.5"
   },
   "scripts": {
     "build": "run-p build:es5 build:esm",

packages/typescript/package.json

@@ -16,7 +16,7 @@
   },
   "peerDependencies": {
     "tslint": "5.16.0",
-    "typescript": "3.9.7"
+    "typescript": "3.7.5"
   },
   "scripts": {
     "link:yarn": "yarn link",

packages/utils/package.json

@@ -27,7 +27,7 @@
     "npm-run-all": "^4.1.2",
     "prettier": "1.17.0",
     "rimraf": "^2.6.3",
-    "typescript": "3.9.7"
+    "typescript": "3.7.5"
   },
   "scripts": {
     "build": "run-p build:es5 build:esm",

scripts/verify-packages-versions.js

@@ -0,0 +1,27 @@
+const pkg = require('../package.json');
+
+const TYPESCRIPT_VERSION = '3.7.5';
+
+if (pkg.devDependencies.typescript !== TYPESCRIPT_VERSION) {
+  console.error(`
+[INCORRECT PACKAGE VERSION]: Expected TypeScript v${TYPESCRIPT_VERSION}, got v${pkg.devDependencies.typescript}
+
+Starting version 3.9, TypeScript emits module exports using \`Object.defineProperty\`,
+with \`configurable: false\`, instead of \`exports.thing = module.thing;\` as it always used to do.
+This means, that any object mutation after the initial compilation are impossible and makes
+the package slightly less open for modifications, and prevent users from experimenting with it,
+and from implementing some of their scenarios.
+
+If you REALLY know what you are doing, and you REALLY want to use a different version of TypeScript,
+modify \`TYPESCRIPT_VERSION\` constant at the top of this file.
+
+change: https://github.com/getsentry/sentry-javascript/pull/2848
+ref: https://github.com/getsentry/sentry-javascript/issues/2845
+ref: https://twitter.com/wesleytodd/status/1297974661574262784
+
+"Never upgrade a TypeScript version without a major package bump. Just don't." — Kamil
+`);
+  process.exit(1);
+}
+
+process.exit(0);

yarn.lock

@@ -17930,10 +17930,10 @@ typescript-memoize@^1.0.0-alpha.3:
   dependencies:
     core-js "2.4.1"
 
-typescript@3.9.7:
-  version "3.9.7"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa"
-  integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==
+typescript@3.7.5:
+  version "3.7.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae"
+  integrity sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==
 
 ua-parser-js@^0.7.18:
   version "0.7.21"