Merge branch 'master' into abhi-browser-scenarios

Author: AbhiPrasad

.craft.yml

@@ -2,16 +2,26 @@ minVersion: '0.23.1'
 changelogPolicy: simple
 preReleaseCommand: bash scripts/craft-pre-release.sh
 targets:
-  - name: npm
-  - name: github
-    includeNames: /^sentry-.*$/
+  - name: aws-lambda-layer
+    includeNames: /^sentry-node-serverless-\d+(\.\d+)*\.zip$/
+    layerName: SentryNodeServerlessSDK
+    compatibleRuntimes:
+      - name: node
+        versions:
+          - nodejs10.x
+          - nodejs12.x
+          - nodejs14.x
+    license: MIT
   - name: gcs
     includeNames: /.*\.js.*$/
     bucket: sentry-js-sdk
     paths:
       - path: /{{version}}/
         metadata:
           cacheControl: 'public, max-age=31536000'
+  - name: github
+    includeNames: /^sentry-.*$/
+  - name: npm
   - name: registry
     sdks:
       'npm:@sentry/browser':
@@ -34,13 +44,3 @@ targets:
         onlyIfPresent: /^sentry-wasm-.*\.tgz$/
       'npm:@sentry/nextjs':
         onlyIfPresent: /^sentry-nextjs-.*\.tgz$/
-  - name: aws-lambda-layer
-    includeNames: /^sentry-node-serverless-\d+(\.\d+)*\.zip$/
-    layerName: SentryNodeServerlessSDK
-    compatibleRuntimes:
-      - name: node
-        versions:
-          - nodejs10.x
-          - nodejs12.x
-          - nodejs14.x
-    license: MIT

.github/workflows/build.yml

@@ -46,7 +46,7 @@ jobs:
           key: ${{ steps.compute_lockfile_hash.outputs.hash }}
       - name: Install dependencies
         if: steps.cache_dependencies.outputs.cache-hit == ''
-        run: yarn install
+        run: yarn install --ignore-engines
     outputs:
       dependency_cache_key: ${{ steps.compute_lockfile_hash.outputs.hash }}
 
@@ -102,6 +102,8 @@ jobs:
         uses: actions/checkout@v2
       - name: Set up Node
         uses: actions/setup-node@v1
+        with:
+          node-version: '12'
       - name: Check dependency cache
         uses: actions/cache@v2
         with:

.vscode/launch.json

@@ -51,28 +51,47 @@
 
 
     // @sentry/nextjs - Run a specific integration test file
-    // Must have file in currently active tab when hitting the play button
+    // Must have test file in currently active tab when hitting the play button, and must already have run `yarn` in test app directory
     {
       "name": "Debug @sentry/nextjs integration tests - just open file",
       "type": "node",
       "cwd": "${workspaceFolder}/packages/nextjs",
       "request": "launch",
-      // TODO create a build task
-      // "preLaunchTask": "yarn build",
-
-      // this is going straight to `server.js` (rather than running the tests through yarn) in order to be able to skip
-      // having to reinstall dependencies on every new test run
+      // since we're not using the normal test runner, we need to make sure we're using the current version of all local
+      // SDK packages and then manually rebuild the test app
+      "preLaunchTask": "Prepare nextjs integration test app for debugging",
+      // running `server.js` directly (rather than running the tests through yarn) allows us to skip having to reinstall
+      // dependencies on every new test run
       "program": "${workspaceFolder}/packages/nextjs/test/integration/test/server.js",
       "args": [
         "--debug",
         // remove these two lines to run all integration tests
         "--filter",
         "${fileBasename}"
       ],
-      "sourceMaps": true,
+
       "skipFiles": [
-        "<node_internals>/**", "**/tslib/**"
+        "<node_internals>/**",
+        // this prevents us from landing in a neverending cycle of TS async-polyfill functions as we're stepping through
+        // our code
+        "${workspaceFolder}/node_modules/tslib/**/*"
       ],
+      "sourceMaps": true,
+      // this controls which files are sourcemapped
+      "outFiles": [
+        // our SDK code
+        "${workspaceFolder}/**/dist/**/*.js",
+        // the built test app
+        "${workspaceFolder}/packages/nextjs/test/integration/.next/**/*.js",
+        "!**/node_modules/**"
+      ],
+      "resolveSourceMapLocations": [
+        "${workspaceFolder}/**/dist/**",
+        "${workspaceFolder}/packages/nextjs/test/integration/.next/**",
+        "!**/node_modules/**"
+      ],
+      "internalConsoleOptions": "openOnSessionStart"
+
     },
   ]
 }

.vscode/tasks.json

@@ -0,0 +1,13 @@
+{
+  // See https://go.microsoft.com/fwlink/?LinkId=733558 for documentation about `tasks.json` syntax
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"label": "Prepare nextjs integration test app for VSCode debugger",
+			"type": "npm",
+			"script": "predebug",
+			"path": "packages/nextjs/test/integration/",
+			"detail": "Link the SDK (if not already linked) and build test app"
+		}
+	]
+}

CHANGELOG.md

@@ -4,6 +4,27 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 6.15.0
+
+- fix(browser): Capture stacktrace on `DOMExceptions`, if possible (#4160)
+- fix(nextjs): Delay error propagation until `withSentry` is done (#4027)
+
+Work in this release contributed by @nowylie. Thank you for your contribution!
+
+## 6.14.3
+
+- Revert: ref(utils): Use type predicates in `is` utility functions (#4124)
+
+## 6.14.2
+
+- feat(awslambda) : Capture errors individually on sqs partial batch failure (#4130)
+- feat(gatsby): Upload source maps automatically when sentry-cli is configured (#4109)
+- fix(nextjs): Prevent `false API resolved without sending a response` warning (#4139)
+- fix(vue): Merge default and manual hooks while creating mixins. (#4132)
+- ref(utils): Use type predicates in `is` utility functions (#4124)
+
+Work in this release contributed by @J4YF7O. Thank you for your contribution!
+
 ## 6.14.1
 
 - feat(gatsby): Support Gatsby v4 (#4120)
@@ -32,7 +53,7 @@
 - fix(tracing): Update paths for DB drivers auto-instrumentation (#4083)
 - fix(vue): Move ROOT_SPAN_TIMER into Vue context. (#4081)
 
-Features, fixes, and improvements in this release have been contributed by: @tmilar, @deammer, @freekii. Thank you for your contributions!
+Work in this release contributed by @tmilar, @deammer, and @freekii. Thank you for your contributions!
 
 ## 6.13.3
 
@@ -602,7 +623,7 @@ during SDK initialization.
 
 - [react] feat: Expose eventId on ErrorBoundary component (#2704)
 - [node] fix: Extract transaction from nested express paths correctly (#2714)
-- [tracing] feat: Pick up sentry-trace in JS <meta/> tag (#2703)
+- [tracing] feat: Pick up sentry-trace in JS `<meta/>` tag (#2703)
 - [tracing] fix: Respect fetch headers (#2712) (#2713)
 - [tracing] fix: Check if performance.getEntries() exists (#2710)
 - [tracing] fix: Add manual Location typing (#2700)
@@ -908,7 +929,7 @@ removed in the future. If you are only using the `Tracing` integration there is
 
 ## 5.4.2
 
-- [core] fix: Allow Integration<T> constructor to have arguments
+- [core] fix: Allow `Integration<T>` constructor to have arguments
 - [browser] fix: Vue breadcrumb recording missing in payload
 - [node] fix: Force agent-base to be at version 4.3.0 to fix various issues. Fix #1762, fix #2085
 - [integrations] fix: Tracing integration fetch headers bug where trace header is not attached if there are no options.
@@ -1017,7 +1038,7 @@ This major bump brings a lot of internal improvements. Also, we extracted some i
 in their own package called `@sentry/integrations`. For a detailed guide how to upgrade from `4.x` to `5.x` refer to our
 [migration guide](https://github.com/getsentry/sentry-javascript/blob/master/MIGRATION.md).
 
-**Migration from v4**
+### Migration from v4
 
 If you were using the SDKs high level API, the way we describe it in the docs, you should be fine without any code
 changes. This is a **breaking** release since we removed some methods from the public API and removed some classes from
@@ -1099,7 +1120,7 @@ the default export.
 
 ## 5.0.0-beta1
 
-**Migration from v4**
+### Migration from v4
 
 This major bump brings a lot of internal improvements. This is a **breaking** release since we removed some methods from
 the public API and removed some classes from the default export.
@@ -1195,7 +1216,7 @@ the public API and removed some classes from the default export.
 ## 4.5.2
 
 - [utils] fix: Decycling for objects to no produce an endless loop
-- [browser] fix: <unlabeled> event for unhandledRejection
+- [browser] fix: `<unlabeled>` event for unhandledRejection
 - [loader] fix: Handle unhandledRejection the same way as it would be thrown
 
 ## 4.5.1

lerna.json

@@ -1,6 +1,6 @@
 {
   "lerna": "3.4.0",
-  "version": "6.14.1",
+  "version": "6.15.0",
   "packages": "packages/*",
   "npmClient": "yarn",
   "useWorkspaces": true

package.json

@@ -57,7 +57,7 @@
     "@types/sinon": "^7.0.11",
     "chai": "^4.1.2",
     "codecov": "^3.6.5",
-    "eslint": "7.27.0",
+    "eslint": "7.32.0",
     "jest": "^24.7.1",
     "karma-browserstack-launcher": "^1.5.1",
     "karma-firefox-launcher": "^1.1.0",

packages/angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/angular",
-  "version": "6.14.1",
+  "version": "6.15.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",
@@ -16,14 +16,14 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@angular/common": "10.x || 11.x || 12.x",
-    "@angular/core": "10.x || 11.x || 12.x",
-    "@angular/router": "10.x || 11.x || 12.x"
+    "@angular/common": "10.x || 11.x || 12.x || 13.x",
+    "@angular/core": "10.x || 11.x || 12.x || 13.x",
+    "@angular/router": "10.x || 11.x || 12.x || 13.x"
   },
   "dependencies": {
-    "@sentry/browser": "6.14.1",
-    "@sentry/types": "6.14.1",
-    "@sentry/utils": "6.14.1",
+    "@sentry/browser": "6.15.0",
+    "@sentry/types": "6.15.0",
+    "@sentry/utils": "6.15.0",
     "rxjs": "^6.6.0",
     "tslib": "^1.9.3"
   },

packages/browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/browser",
-  "version": "6.14.1",
+  "version": "6.15.0",
   "description": "Official Sentry SDK for browsers",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser",
@@ -16,13 +16,13 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "6.14.1",
-    "@sentry/types": "6.14.1",
-    "@sentry/utils": "6.14.1",
+    "@sentry/core": "6.15.0",
+    "@sentry/types": "6.15.0",
+    "@sentry/utils": "6.15.0",
     "tslib": "^1.9.3"
   },
   "devDependencies": {
-    "@sentry-internal/eslint-config-sdk": "6.14.1",
+    "@sentry-internal/eslint-config-sdk": "6.15.0",
     "@types/eslint": "^7.2.0",
     "@types/md5": "2.1.33",
     "btoa": "^1.2.1",

packages/browser/src/eventbuilder.ts

@@ -65,33 +65,42 @@ export function eventFromUnknownInput(
 ): Event {
   let event: Event;
 
-  if (isErrorEvent(exception)) {
+  if (isErrorEvent(exception as ErrorEvent) && (exception as ErrorEvent).error) {
     // If it is an ErrorEvent with `error` property, extract it to get actual Error
+    const errorEvent = exception as ErrorEvent;
     // eslint-disable-next-line no-param-reassign
-    exception = exception.error;
-    event = eventFromStacktrace(computeStackTrace(exception));
+    exception = errorEvent.error;
+    event = eventFromStacktrace(computeStackTrace(exception as Error));
     return event;
   }
-  if (isDOMError(exception) || isDOMException(exception)) {
-    // If it is a DOMError or DOMException (which are legacy APIs, but still supported in some browsers)
-    // then we just extract the name, code, and message, as they don't provide anything else
-    // https://developer.mozilla.org/en-US/docs/Web/API/DOMError
-    // https://developer.mozilla.org/en-US/docs/Web/API/DOMException
+
+  // If it is a `DOMError` (which is a legacy API, but still supported in some browsers) then we just extract the name
+  // and message, as it doesn't provide anything else. According to the spec, all `DOMExceptions` should also be
+  // `Error`s, but that's not the case in IE11, so in that case we treat it the same as we do a `DOMError`.
+  //
+  // https://developer.mozilla.org/en-US/docs/Web/API/DOMError
+  // https://developer.mozilla.org/en-US/docs/Web/API/DOMException
+  // https://webidl.spec.whatwg.org/#es-DOMException-specialness
+  if (isDOMError(exception as DOMError) || isDOMException(exception as DOMException)) {
     const domException = exception as DOMException;
-    const name = domException.name || (isDOMError(domException) ? 'DOMError' : 'DOMException');
-    const message = domException.message ? `${name}: ${domException.message}` : name;
 
-    event = eventFromString(message, syntheticException, options);
-    addExceptionTypeValue(event, message);
+    if ('stack' in (exception as Error)) {
+      event = eventFromStacktrace(computeStackTrace(exception as Error));
+    } else {
+      const name = domException.name || (isDOMError(domException) ? 'DOMError' : 'DOMException');
+      const message = domException.message ? `${name}: ${domException.message}` : name;
+      event = eventFromString(message, syntheticException, options);
+      addExceptionTypeValue(event, message);
+    }
     if ('code' in domException) {
       event.tags = { ...event.tags, 'DOMException.code': `${domException.code}` };
     }
 
     return event;
   }
-  if (isError(exception)) {
+  if (isError(exception as Error)) {
     // we have a real Error object, do nothing
-    event = eventFromStacktrace(computeStackTrace(exception));
+    event = eventFromStacktrace(computeStackTrace(exception as Error));
     return event;
   }
   if (isPlainObject(exception) || isEvent(exception)) {