Merge branch 'master' into sentry-nextjs-without-webpack-plugin

Author: kamilogorek

.github/workflows/build.yml

@@ -233,7 +233,7 @@ jobs:
         id: changed-files-specific
         uses: tj-actions/[email protected]
         with:
-          files: .*packages\/(ember|browser|core|tracing|hub|minimal|types|utils)($|/.*)
+          files: .*packages\/ember($|/.*)
       # Only run ember tests if the files above have changed
       - name: Run Ember tests
         if: steps.changed-files-specific.outputs.any_changed == 'true' || github.event_name == 'push'

CHANGELOG.md

@@ -4,6 +4,32 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 6.12.0
+
+- fix(nextjs): Differentiate between webpack 4 and 5 in server builds (#3878)
+- fix(core): Skip native frames while searching frame URLs. (#3897)
+- fix(vue): Attach props only if VM is available (#3902)
+- feat(tracing): Add pg-native support to Postgres integration. (#3894)
+- ref(ember): Update addon to support Ember 4.0.0 (beta) (#3915)
+- feat(react): Make Profiler _mountSpan attribute protected (#3904)
+- fix(ember): allow ember-beta to fail (#3910)
+- fix(tracing): Prevent metrics erroring module load in web workers (#3941)
+- misc(browser): Log when event is dropped by Dedupe integration (#3943)
+
+## 6.11.0
+
+- feat(nextjs): Allow for TypeScript user config files (#3847)
+- fix(browser): Make sure handler exists for LinkedErrors Integration (#3861)
+- fix(core): Skip anonymous callbacks while searching frame URLs. (#3842)
+- fix(core): Stop rejecting in `flush` and `close` when client undefined (#3846)
+- fix(nextjs): Stop `SentryWebpackPlugin` from uploading unnecessary files (#3845)
+- fix(react): Require ReactElement in ErrorBoundary props and render (#3857)
+- fix(tests): Allow tests to run on Windows without WSL (#3813)
+- fix(utils): Fix false-positive circular references when normalizing `Event` objects (#3864)
+- fix(vue): Make Router.name type optional to match VueRouter (#3843)
+- ref(core): Prevent redundant setup work (#3862)
+- ref(nextjs): Stop reinitializing the server SDK unnecessarily (#3860)
+
 ## 6.10.0
 
 - feat(vue): Rework tracing and add support for `Vue 3` (#3804)

MIGRATION.md

@@ -1,4 +1,4 @@
-# Upgrading from 4.x to 5.x
+# Upgrading from 4.x to 5.x/6.x
 
 In this version upgrade, there are a few breaking changes. This guide should help you update your code accordingly.
 

lerna.json

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

packages/angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/angular",
-  "version": "6.10.0",
+  "version": "6.12.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,17 +21,17 @@
     "@angular/router": "10.x || 11.x || 12.x"
   },
   "dependencies": {
-    "@sentry/browser": "6.10.0",
-    "@sentry/types": "6.10.0",
-    "@sentry/utils": "6.10.0",
+    "@sentry/browser": "6.12.0",
+    "@sentry/types": "6.12.0",
+    "@sentry/utils": "6.12.0",
     "rxjs": "^6.6.0",
     "tslib": "^1.9.3"
   },
   "devDependencies": {
     "@angular/common": "^10.0.3",
     "@angular/core": "^10.0.3",
     "@angular/router": "^10.0.3",
-    "@sentry-internal/eslint-config-sdk": "6.10.0",
+    "@sentry-internal/eslint-config-sdk": "6.12.0",
     "npm-run-all": "^4.1.2",
     "prettier": "1.19.0",
     "rimraf": "^2.6.3",

packages/browser/.eslintrc.js

@@ -25,6 +25,8 @@ module.exports = {
         'prefer-template': 'off',
         'no-unused-expressions': 'off',
         'guard-for-in': 'off',
+        '@typescript-eslint/no-explicit-any': 'off',
+        '@typescript-eslint/no-non-null-assertion': 'off',
       },
     },
     {

packages/browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/browser",
-  "version": "6.10.0",
+  "version": "6.12.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.10.0",
-    "@sentry/types": "6.10.0",
-    "@sentry/utils": "6.10.0",
+    "@sentry/core": "6.12.0",
+    "@sentry/types": "6.12.0",
+    "@sentry/utils": "6.12.0",
     "tslib": "^1.9.3"
   },
   "devDependencies": {
-    "@sentry-internal/eslint-config-sdk": "6.10.0",
+    "@sentry-internal/eslint-config-sdk": "6.12.0",
     "@types/eslint": "^7.2.0",
     "@types/md5": "2.1.33",
     "btoa": "^1.2.1",
@@ -73,8 +73,8 @@
     "fix:prettier": "prettier --write \"{src,test}/**/*.ts\"",
     "fix:eslint": "eslint . --format stylish --fix",
     "test": "run-s test:unit",
-    "test:unit": "karma start test/unit/karma.conf.js",
-    "test:unit:watch": "karma start test/unit/karma.conf.js --auto-watch --no-single-run",
+    "test:unit": "jest --config test/unit/jest.config.js",
+    "test:unit:watch": "jest --config test/unit/jest.config.js --watch",
     "test:integration": "test/integration/run.js",
     "test:integration:watch": "test/integration/run.js --watch",
     "test:integration:checkbrowsers": "node scripts/checkbrowsers.js",

packages/browser/src/helpers.ts

@@ -211,5 +211,9 @@ export function injectReportDialog(options: ReportDialogOptions = {}): void {
     script.onload = options.onLoad;
   }
 
-  (document.head || document.body).appendChild(script);
+  const injectionPoint = document.head || document.body;
+
+  if (injectionPoint) {
+    injectionPoint.appendChild(script);
+  }
 }

packages/browser/src/integrations/dedupe.ts

@@ -1,4 +1,5 @@
 import { Event, EventProcessor, Exception, Hub, Integration, StackFrame } from '@sentry/types';
+import { logger } from '@sentry/utils';
 
 /** Deduplication filter */
 export class Dedupe implements Integration {
@@ -27,6 +28,7 @@ export class Dedupe implements Integration {
         // Juuust in case something goes wrong
         try {
           if (self._shouldDropEvent(currentEvent, self._previousEvent)) {
+            logger.warn(`Event dropped due to being a duplicate of previously captured event.`);
             return null;
           }
         } catch (_oO) {

packages/browser/src/tracekit.ts

@@ -3,7 +3,7 @@
  * largely modified and is now maintained as part of Sentry JS SDK.
  */
 
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access, max-lines */
 
 /**
  * An object representing a single stack frame.
@@ -124,16 +124,10 @@ function computeStackTraceFromStackProp(ex: any): StackTrace | null {
       // Arpad: Working with the regexp above is super painful. it is quite a hack, but just stripping the `address at `
       // prefix here seems like the quickest solution for now.
       let url = parts[2] && parts[2].indexOf('address at ') === 0 ? parts[2].substr('address at '.length) : parts[2];
-
       // Kamil: One more hack won't hurt us right? Understanding and adding more rules on top of these regexps right now
       // would be way too time consuming. (TODO: Rewrite whole RegExp to be more readable)
       let func = parts[1] || UNKNOWN_FUNCTION;
-      const isSafariExtension = func.indexOf('safari-extension') !== -1;
-      const isSafariWebExtension = func.indexOf('safari-web-extension') !== -1;
-      if (isSafariExtension || isSafariWebExtension) {
-        func = func.indexOf('@') !== -1 ? func.split('@')[0] : UNKNOWN_FUNCTION;
-        url = isSafariExtension ? `safari-extension:${url}` : `safari-web-extension:${url}`;
-      }
+      [func, url] = extractSafariExtensionDetails(func, url);
 
       element = {
         url,
@@ -165,9 +159,14 @@ function computeStackTraceFromStackProp(ex: any): StackTrace | null {
         // NOTE: this hack doesn't work if top-most frame is eval
         stack[0].column = (ex.columnNumber as number) + 1;
       }
+
+      let url = parts[3];
+      let func = parts[1] || UNKNOWN_FUNCTION;
+      [func, url] = extractSafariExtensionDetails(func, url);
+
       element = {
-        url: parts[3],
-        func: parts[1] || UNKNOWN_FUNCTION,
+        url,
+        func,
         args: parts[2] ? parts[2].split(',') : [],
         line: parts[4] ? +parts[4] : null,
         column: parts[5] ? +parts[5] : null,
@@ -249,6 +248,38 @@ function computeStackTraceFromStacktraceProp(ex: any): StackTrace | null {
   };
 }
 
+/**
+ * Safari web extensions, starting version unknown, can produce "frames-only" stacktraces.
+ * What it means, is that instead of format like:
+ *
+ * Error: wat
+ *   at function@url:row:col
+ *   at function@url:row:col
+ *   at function@url:row:col
+ *
+ * it produces something like:
+ *
+ *   function@url:row:col
+ *   function@url:row:col
+ *   function@url:row:col
+ *
+ * Because of that, it won't be captured by `chrome` RegExp and will fall into `Gecko` branch.
+ * This function is extracted so that we can use it in both places without duplicating the logic.
+ * Unfortunatelly "just" changing RegExp is too complicated now and making it pass all tests
+ * and fix this case seems like an impossible, or at least way too time-consuming task.
+ */
+const extractSafariExtensionDetails = (func: string, url: string): [string, string] => {
+  const isSafariExtension = func.indexOf('safari-extension') !== -1;
+  const isSafariWebExtension = func.indexOf('safari-web-extension') !== -1;
+
+  return isSafariExtension || isSafariWebExtension
+    ? [
+        func.indexOf('@') !== -1 ? func.split('@')[0] : UNKNOWN_FUNCTION,
+        isSafariExtension ? `safari-extension:${url}` : `safari-web-extension:${url}`,
+      ]
+    : [func, url];
+};
+
 /** Remove N number of frames from the stack */
 function popFrames(stacktrace: StackTrace, popSize: number): StackTrace {
   try {

packages/browser/test/unit/backend.test.ts

@@ -1,14 +1,12 @@
-import { expect } from 'chai';
-
 import { BrowserBackend } from '../../src/backend';
 
 let backend: BrowserBackend;
 
 describe('BrowserBackend', () => {
   describe('sendEvent()', () => {
-    it('should use NoopTransport', async () => {
+    it('should use NoopTransport', () => {
       backend = new BrowserBackend({});
-      expect(backend.getTransport().constructor.name).to.equal('NoopTransport');
+      expect(backend.getTransport().constructor.name).toBe('NoopTransport');
     });
   });
 });