Merge branch 'develop' into priscila/feat/add-remix-e2e-test

Author: priscilawebdev

.github/workflows/build.yml

@@ -179,7 +179,7 @@ jobs:
           key: ${{ steps.compute_lockfile_hash.outputs.hash }}
 
       - name: Install dependencies
-        if: steps.cache_dependencies.outputs.cache_hit != 'true'
+        if: steps.cache_dependencies.outputs.cache-hit != 'true'
         run: yarn install --ignore-engines --frozen-lockfile
     outputs:
       dependency_cache_key: ${{ steps.compute_lockfile_hash.outputs.hash }}
@@ -655,7 +655,9 @@ jobs:
           yarn test:package
 
   job_node_integration_tests:
-    name: Node (${{ matrix.node }}) Integration Tests
+    name:
+      Node (${{ matrix.node }})${{ (matrix.typescript && format(' (TS {0})', matrix.typescript)) || '' }} Integration
+      Tests
     needs: [job_get_metadata, job_build]
     if: needs.job_get_metadata.outputs.changed_node == 'true' || github.event_name != 'pull_request'
     runs-on: ubuntu-20.04
@@ -664,6 +666,12 @@ jobs:
       fail-fast: false
       matrix:
         node: [10, 12, 14, 16, 18, 20]
+        typescript:
+          - false
+        include:
+          # Only check typescript for latest version (to streamline CI)
+          - node: 20
+            typescript: '3.8'
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
         uses: actions/checkout@v3
@@ -677,6 +685,11 @@ jobs:
         uses: ./.github/actions/restore-cache
         env:
           DEPENDENCY_CACHE_KEY: ${{ needs.job_build.outputs.dependency_cache_key }}
+
+      - name: Overwrite typescript version
+        if: matrix.typescript
+        run: yarn add --dev --ignore-workspace-root-check typescript@${{ matrix.typescript }}
+
       - name: Run integration tests
         env:
           NODE_VERSION: ${{ matrix.node }}
@@ -717,7 +730,7 @@ jobs:
           yarn test:integration:ci
 
   job_e2e_tests:
-    name: E2E Tests (Shard ${{ matrix.shard }})
+    name: E2E (Shard ${{ matrix.shard }}) Tests
     # We only run E2E tests for non-fork PRs because the E2E tests require secrets to work and they can't be accessed from forks
     # Dependabot PRs sadly also don't have access to secrets, so we skip them as well
     if:
@@ -730,6 +743,7 @@ jobs:
       fail-fast: false
       matrix:
         shard: [1, 2, 3]
+
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
         uses: actions/checkout@v3
@@ -746,6 +760,7 @@ jobs:
         uses: ./.github/actions/restore-cache
         env:
           DEPENDENCY_CACHE_KEY: ${{ needs.job_build.outputs.dependency_cache_key }}
+
       - name: Get node version
         id: versions
         run: |

CHANGELOG.md

@@ -4,6 +4,61 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 7.57.0
+
+### Important Changes
+
+- **build: Update typescript from 3.8.3 to 4.9.5 (#8255)**
+
+This release version [bumps the internally used typescript version from 3.8.x to 4.9.x](https://github.com/getsentry/sentry-javascript/pull/8255).
+We use ds-downlevel to generate two versions of our types, one for >=3.8, one for >=4.9.
+This means that this change should be fully backwards compatible and not have any noticable user impact,
+but if you still encounter issues please let us know.
+
+- **feat(types): Add tracePropagationTargets to top level options (#8395)**
+
+Instead of passing `tracePropagationTargets` to the `BrowserTracing` integration, you can now define them on the top level:
+
+```js
+Sentry.init({
+  tracePropagationTargets: ['api.site.com'],
+});
+```
+
+- **fix(angular): Filter out `TryCatch` integration by default (#8367)**
+
+The Angular and Angular-ivy SDKs will not install the TryCatch integration anymore by default.
+This integration conflicted with the `SentryErrorHander`, sometimes leading to duplicated errors and/or missing data on events.
+
+- **feat(browser): Better event name handling for non-Error objects (#8374)**
+
+When capturing non-errors via `Sentry.captureException()`, e.g. `Sentry.captureException({ prop: "custom object" })`,
+we now generate a more helpful value for the synthetic exception. Instead of e.g. `Non-Error exception captured with keys: currentTarget, isTrusted, target, type`, you'll now get messages like:
+
+```
+Object captured as exception with keys: prop1, prop2
+Event `MouseEvent` (type=click) captured as exception
+Event `ErrorEvent` captured as exception with message `Script error.`
+```
+
+### Other Changes
+
+- feat(browser): Send profiles in same envelope as transactions (#8375)
+- feat(profiling): Collect timings on profiler stop calls (#8409)
+- feat(replay): Do not capture replays < 5 seconds (GA) (#8277)
+- feat(tracing): Add experiment to capture http timings (#8371)
+- feat(tracing): Add `http.response.status_code` to `span.data` (#8366)
+- fix(angular): Stop routing spans on navigation cancel and error events (#8369)
+- fix(core): Only start spans in `trace` if tracing is enabled (#8357)
+- fix(nextjs): Inject init calls via loader instead of via entrypoints (#8368)
+- fix(replay): Mark ui.slowClickDetected `clickCount` as optional (#8376)
+- fix(serverless): Export `autoDiscoverNodePerformanceMonitoringIntegrations` from SDK (#8382)
+- fix(sveltekit): Check for cached requests in client-side fetch instrumentation (#8391)
+- fix(sveltekit): Only instrument SvelteKit `fetch` if the SDK client is valid (#8381)
+- fix(tracing): Instrument Prisma client in constructor of integration (#8383)
+- ref(replay): More graceful `sessionStorage` check (#8394)
+- ref(replay): Remove circular dep in replay eventBuffer (#8389)
+
 ## 7.56.0
 
 - feat(replay): Rework slow click & multi click detection (#8322)

lerna.json

@@ -1,6 +1,5 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "7.56.0",
-  "npmClient": "yarn",
-  "useWorkspaces": true
+  "version": "7.57.0",
+  "npmClient": "yarn"
 }

nx.json

@@ -3,68 +3,40 @@
     "default": {
       "runner": "nx/tasks-runners/default",
       "options": {
-        "cacheableOperations": [
-          "build:bundle",
-          "build:transpile",
-          "build:types",
-          "lint:eslint",
-          "test:unit"
-        ],
+        "cacheableOperations": ["build:bundle", "build:transpile", "build:types", "lint:eslint", "test:unit"],
         "cacheDirectory": ".nxcache"
       }
     }
   },
   "namedInputs": {
     "default": ["{projectRoot}/**/*", "sharedGlobals"],
-    "sharedGlobals": [
-      "{workspaceRoot}/*.js",
-      "{workspaceRoot}/*.json"
-    ],
-    "production": [
-      "default",
-      "!{projectRoot}/test/**/*",
-      "!{projectRoot}/**/*.md"
-    ]
+    "sharedGlobals": ["{workspaceRoot}/*.js", "{workspaceRoot}/*.json"],
+    "production": ["default", "!{projectRoot}/test/**/*", "!{projectRoot}/**/*.md"]
   },
   "targetDefaults": {
     "build:bundle": {
       "inputs": ["production", "^production"],
-      "dependsOn": [
-        "build:transpile"
-      ],
-      "outputs": [
-        "{projectRoot}/build/bundles"
-      ]
+      "dependsOn": ["build:transpile"],
+      "outputs": ["{projectRoot}/build/bundles"]
     },
     "build:tarball": {
       "inputs": ["production", "^production"],
-      "dependsOn": [
-        "build:transpile",
-        "build:types"
-      ],
+      "dependsOn": ["build:transpile", "build:types"],
       "outputs": []
     },
     "build:transpile": {
       "inputs": ["production", "^production"],
-      "dependsOn": [
-        "^build:transpile:uncached",
-        "^build:transpile",
-        "build:transpile:uncached"
-      ],
-      "outputs": [
-        "{projectRoot}/build/npm",
-        "{projectRoot}/build/esm",
-        "{projectRoot}/build/cjs"
-      ]
+      "dependsOn": ["^build:transpile:uncached", "^build:transpile", "build:transpile:uncached"],
+      "outputs": ["{projectRoot}/build/npm", "{projectRoot}/build/esm", "{projectRoot}/build/cjs"]
     },
     "build:types": {
       "inputs": ["production", "^production"],
-      "dependsOn": [
-        "^build:types"
-      ],
+      "dependsOn": ["^build:types"],
       "outputs": [
         "{projectRoot}/build/types",
-        "{projectRoot}/build/npm/types"
+        "{projectRoot}/build/types-ts3.8",
+        "{projectRoot}/build/npm/types",
+        "{projectRoot}/build/npm/types-ts3.8"
       ]
     },
     "lint:eslint": {
@@ -76,5 +48,6 @@
       "inputs": ["default"],
       "outputs": ["{projectRoot}/coverage"]
     }
-  }
+  },
+  "$schema": "./node_modules/nx/schemas/nx-schema.json"
 }

package.json

@@ -25,9 +25,9 @@
     "lint:eslint": "lerna run lint:eslint",
     "validate:es5": "lerna run validate:es5",
     "postpublish": "lerna run --stream --concurrency 1 postpublish",
-    "test": "lerna run --ignore @sentry-internal/* test",
-    "test:unit": "lerna run --ignore @sentry-internal/* test:unit",
-    "test-ci-browser": "lerna run test --ignore \"@sentry/{node,opentelemetry-node,serverless,nextjs,remix,gatsby,sveltekit}\" --ignore @sentry-internal/*",
+    "test": "lerna run --ignore \"@sentry-internal/{browser-integration-tests,e2e-tests,integration-shims,node-integration-tests,overhead-metrics}\" test",
+    "test:unit": "lerna run --ignore \"@sentry-internal/{browser-integration-tests,e2e-tests,integration-shims,node-integration-tests,overhead-metrics}\" test:unit",
+    "test-ci-browser": "lerna run test --ignore \"@sentry/{node,opentelemetry-node,serverless,nextjs,remix,gatsby,sveltekit}\" --ignore \"@sentry-internal/{browser-integration-tests,e2e-tests,integration-shims,node-integration-tests,overhead-metrics}\"",
     "test-ci-node": "ts-node ./scripts/node-unit-tests.ts",
     "test:update-snapshots": "lerna run test:update-snapshots",
     "yalc:publish": "lerna run yalc:publish"
@@ -90,14 +90,15 @@
     "chai": "^4.1.2",
     "codecov": "^3.6.5",
     "deepmerge": "^4.2.2",
+    "downlevel-dts": "~0.11.0",
     "es-check": "7.1.0",
     "eslint": "7.32.0",
     "jest": "^27.5.1",
     "jest-environment-node": "^27.5.1",
     "jsdom": "^19.0.0",
     "karma-browserstack-launcher": "^1.5.1",
     "karma-firefox-launcher": "^1.1.0",
-    "lerna": "6.5.0-alpha.2",
+    "lerna": "7.1.1",
     "madge": "4.0.2",
     "mocha": "^6.1.4",
     "nodemon": "^2.0.16",
@@ -114,9 +115,9 @@
     "size-limit": "^4.5.5",
     "ts-jest": "^27.1.4",
     "ts-node": "10.9.1",
-    "tslib": "^2.3.1",
+    "tslib": "2.4.1",
     "typedoc": "^0.18.0",
-    "typescript": "3.8.3",
+    "typescript": "4.9.5",
     "vitest": "^0.29.2",
     "yalc": "^1.0.0-pre.53"
   },

packages/angular-ivy/README.md

@@ -175,7 +175,7 @@ import { TraceModule } from '@sentry/angular-ivy';
 export class AppModule {}
 ```
 
-Then inside your components template (keep in mind that directive name attribute is required):
+Then, inside your component's template (keep in mind that the directive's name attribute is required):
 
 ```html
 <app-header trace="header"></app-header>

packages/angular-ivy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/angular-ivy",
-  "version": "7.56.0",
+  "version": "7.57.0",
   "description": "Official Sentry SDK for Angular with full Ivy Support",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular-ivy",
@@ -21,10 +21,10 @@
     "rxjs": "^6.5.5 || ^7.x"
   },
   "dependencies": {
-    "@sentry/browser": "7.56.0",
-    "@sentry/types": "7.56.0",
-    "@sentry/utils": "7.56.0",
-    "tslib": "^2.3.0"
+    "@sentry/browser": "7.57.0",
+    "@sentry/types": "7.57.0",
+    "@sentry/utils": "7.57.0",
+    "tslib": "^2.4.1"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "~12.2.18",
@@ -37,7 +37,6 @@
     "@angular/platform-browser-dynamic": "~12.2.0",
     "@angular/router": "~12.2.0",
     "ng-packagr": "^12.1.1",
-    "typescript": "~4.3.5",
     "zone.js": "~0.11.4"
   },
   "scripts": {

packages/angular/README.md

@@ -21,7 +21,7 @@
 
 If you're using Angular 12 or newer, we recommend using `@sentry/angular-ivy` for native support with Angular's rendering engine Ivy.
 
-This SDK stilll officially supports Angular 10-15. If you are using an older version of Angular and experience problems with the Angular SDK, we recommend downgrading the SDK to version 6.x.
+This SDK still officially supports Angular 10-15. If you are using an older version of Angular and experience problems with the Angular SDK, we recommend downgrading the SDK to version 6.x.
 
 ## General
 
@@ -175,7 +175,7 @@ import { TraceModule } from '@sentry/angular';
 export class AppModule {}
 ```
 
-Then inside your components template (keep in mind that directive name attribute is required):
+Then, inside your component's template (keep in mind that the directive's name attribute is required):
 
 ```html
 <app-header trace="header"></app-header>

packages/angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/angular",
-  "version": "7.56.0",
+  "version": "7.57.0",
   "description": "Official Sentry SDK for Angular",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular",
@@ -21,10 +21,10 @@
     "rxjs": "^6.5.5 || ^7.x"
   },
   "dependencies": {
-    "@sentry/browser": "7.56.0",
-    "@sentry/types": "7.56.0",
-    "@sentry/utils": "7.56.0",
-    "tslib": "^2.0.0"
+    "@sentry/browser": "7.57.0",
+    "@sentry/types": "7.57.0",
+    "@sentry/utils": "7.57.0",
+    "tslib": "^2.4.1"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "~0.1002.4",
@@ -38,7 +38,7 @@
     "@angular/router": "~10.2.5",
     "ng-packagr": "^10.1.0",
     "rxjs": "6.5.5",
-    "typescript": "~4.0.2",
+    "typescript": "4.0.2",
     "zone.js": "^0.11.8"
   },
   "scripts": {

packages/angular/src/errorhandler.ts

@@ -2,7 +2,7 @@ import { HttpErrorResponse } from '@angular/common/http';
 import type { ErrorHandler as AngularErrorHandler } from '@angular/core';
 import { Inject, Injectable } from '@angular/core';
 import * as Sentry from '@sentry/browser';
-import { captureException } from '@sentry/browser';
+import type { Event, Scope } from '@sentry/types';
 import { addExceptionMechanism, isString } from '@sentry/utils';
 
 import { runOutsideAngular } from './zone';
@@ -69,7 +69,6 @@ function isErrorOrErrorLikeObject(value: unknown): value is Error {
   const candidate = value as ErrorCandidate;
 
   return (
-    isString(candidate.name) &&
     isString(candidate.name) &&
     isString(candidate.message) &&
     (undefined === candidate.stack || isString(candidate.stack))
@@ -101,7 +100,7 @@ class SentryErrorHandler implements AngularErrorHandler {
 
     // Capture handled exception and send it to Sentry.
     const eventId = runOutsideAngular(() =>
-      captureException(extractedError, scope => {
+      Sentry.captureException(extractedError, (scope: Scope) => {
         scope.addEventProcessor(event => {
           addExceptionMechanism(event, {
             type: 'angular',
@@ -126,7 +125,7 @@ class SentryErrorHandler implements AngularErrorHandler {
       const client = Sentry.getCurrentHub().getClient();
 
       if (client && client.on && !this._registeredAfterSendEventHandler) {
-        client.on('afterSendEvent', event => {
+        client.on('afterSendEvent', (event: Event) => {
           if (!event.type) {
             Sentry.showReportDialog({ ...this._options.dialogOptions, eventId: event.event_id });
           }