Merge branch 'getsentry:master' into fix/nextjs-basepath

CHANGELOG.md

@@ -4,9 +4,17 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
-## 6.11.1
-
-- fix(nextjs): Differentiate between webpack 4 and 5 in server builds  (#3878)
+## 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
 

lerna.json

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

packages/angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/angular",
-  "version": "6.11.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.11.0",
-    "@sentry/types": "6.11.0",
-    "@sentry/utils": "6.11.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.11.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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/browser",
-  "version": "6.11.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.11.0",
-    "@sentry/types": "6.11.0",
-    "@sentry/utils": "6.11.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.11.0",
+    "@sentry-internal/eslint-config-sdk": "6.12.0",
     "@types/eslint": "^7.2.0",
     "@types/md5": "2.1.33",
     "btoa": "^1.2.1",

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/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/core",
-  "version": "6.11.0",
+  "version": "6.12.0",
   "description": "Base implementation for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/core",
@@ -16,14 +16,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/hub": "6.11.0",
-    "@sentry/minimal": "6.11.0",
-    "@sentry/types": "6.11.0",
-    "@sentry/utils": "6.11.0",
+    "@sentry/hub": "6.12.0",
+    "@sentry/minimal": "6.12.0",
+    "@sentry/types": "6.12.0",
+    "@sentry/utils": "6.12.0",
     "tslib": "^1.9.3"
   },
   "devDependencies": {
-    "@sentry-internal/eslint-config-sdk": "6.11.0",
+    "@sentry-internal/eslint-config-sdk": "6.12.0",
     "jest": "^24.7.1",
     "npm-run-all": "^4.1.2",
     "prettier": "1.19.0",

packages/core/src/version.ts

@@ -1 +1 @@
-export const SDK_VERSION = '6.11.0';
+export const SDK_VERSION = '6.12.0';

packages/ember/config/ember-try.js

@@ -30,6 +30,7 @@ module.exports = async function() {
             'ember-source': await getChannelURL('beta'),
           },
         },
+        allowedToFail: true,
       },
       embroiderSafe(),
       {

packages/ember/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/ember",
-  "version": "6.11.0",
+  "version": "6.12.0",
   "description": "Official Sentry SDK for Ember.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/ember",
@@ -32,10 +32,10 @@
   },
   "dependencies": {
     "@embroider/macros": "~0.37.0",
-    "@sentry/browser": "6.11.0",
-    "@sentry/tracing": "6.11.0",
-    "@sentry/types": "6.11.0",
-    "@sentry/utils": "6.11.0",
+    "@sentry/browser": "6.12.0",
+    "@sentry/tracing": "6.12.0",
+    "@sentry/types": "6.12.0",
+    "@sentry/utils": "6.12.0",
     "ember-auto-import": "^1.6.0",
     "ember-cli-babel": "^7.26.6",
     "ember-cli-htmlbars": "^5.1.2",
@@ -47,7 +47,7 @@
     "@embroider/test-setup": "~0.37.0",
     "@glimmer/component": "^1.0.0",
     "@glimmer/tracking": "^1.0.0",
-    "@sentry-internal/eslint-config-sdk": "6.11.0",
+    "@sentry-internal/eslint-config-sdk": "6.12.0",
     "@types/ember": "^3.16.5",
     "@types/ember-qunit": "^3.4.9",
     "@types/ember__test-helpers": "^1.7.0",

packages/eslint-config-sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/eslint-config-sdk",
-  "version": "6.11.0",
+  "version": "6.12.0",
   "description": "Official Sentry SDK eslint config",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-config-sdk",
@@ -19,8 +19,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry-internal/eslint-plugin-sdk": "6.11.0",
-    "@sentry-internal/typescript": "6.11.0",
+    "@sentry-internal/eslint-plugin-sdk": "6.12.0",
+    "@sentry-internal/typescript": "6.12.0",
     "@typescript-eslint/eslint-plugin": "^3.9.0",
     "@typescript-eslint/parser": "^3.9.0",
     "eslint-config-prettier": "^6.11.0",

packages/eslint-plugin-sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/eslint-plugin-sdk",
-  "version": "6.11.0",
+  "version": "6.12.0",
   "description": "Official Sentry SDK eslint plugin",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-plugin-sdk",

packages/gatsby/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/gatsby",
-  "version": "6.11.0",
+  "version": "6.12.0",
   "description": "Official Sentry SDK for Gatsby.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/gatsby",
@@ -26,14 +26,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/react": "6.11.0",
-    "@sentry/tracing": "6.11.0"
+    "@sentry/react": "6.12.0",
+    "@sentry/tracing": "6.12.0"
   },
   "peerDependencies": {
     "gatsby": "^2.0.0 || ^3.0.0"
   },
   "devDependencies": {
-    "@sentry-internal/eslint-config-sdk": "6.11.0",
+    "@sentry-internal/eslint-config-sdk": "6.12.0",
     "@testing-library/react": "^10.4.9",
     "jest": "^24.7.1",
     "npm-run-all": "^4.1.2",

packages/hub/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/hub",
-  "version": "6.11.0",
+  "version": "6.12.0",
   "description": "Sentry hub which handles global state managment.",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/hub",
@@ -16,12 +16,12 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/types": "6.11.0",
-    "@sentry/utils": "6.11.0",
+    "@sentry/types": "6.12.0",
+    "@sentry/utils": "6.12.0",
     "tslib": "^1.9.3"
   },
   "devDependencies": {
-    "@sentry-internal/eslint-config-sdk": "6.11.0",
+    "@sentry-internal/eslint-config-sdk": "6.12.0",
     "jest": "^24.7.1",
     "npm-run-all": "^4.1.2",
     "prettier": "1.19.0",

packages/integrations/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/integrations",
-  "version": "6.11.0",
+  "version": "6.12.0",
   "description": "Pluggable integrations that can be used to enhance JS SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/integrations",
@@ -16,13 +16,13 @@
   "module": "esm/index.js",
   "types": "dist/index.d.ts",
   "dependencies": {
-    "@sentry/types": "6.11.0",
-    "@sentry/utils": "6.11.0",
+    "@sentry/types": "6.12.0",
+    "@sentry/utils": "6.12.0",
     "localforage": "^1.8.1",
     "tslib": "^1.9.3"
   },
   "devDependencies": {
-    "@sentry-internal/eslint-config-sdk": "6.11.0",
+    "@sentry-internal/eslint-config-sdk": "6.12.0",
     "chai": "^4.1.2",
     "jest": "^24.7.1",
     "npm-run-all": "^4.1.2",

packages/integrations/src/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/minimal/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/minimal",
-  "version": "6.11.0",
+  "version": "6.12.0",
   "description": "Sentry minimal library that can be used in other packages",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/minimal",
@@ -16,12 +16,12 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/hub": "6.11.0",
-    "@sentry/types": "6.11.0",
+    "@sentry/hub": "6.12.0",
+    "@sentry/types": "6.12.0",
     "tslib": "^1.9.3"
   },
   "devDependencies": {
-    "@sentry-internal/eslint-config-sdk": "6.11.0",
+    "@sentry-internal/eslint-config-sdk": "6.12.0",
     "jest": "^24.7.1",
     "npm-run-all": "^4.1.2",
     "prettier": "1.19.0",

packages/nextjs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nextjs",
-  "version": "6.11.0",
+  "version": "6.12.0",
   "description": "Official Sentry SDK for Next.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nextjs",
@@ -17,17 +17,17 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "6.11.0",
-    "@sentry/integrations": "6.11.0",
-    "@sentry/node": "6.11.0",
-    "@sentry/react": "6.11.0",
-    "@sentry/tracing": "6.11.0",
-    "@sentry/utils": "6.11.0",
+    "@sentry/core": "6.12.0",
+    "@sentry/integrations": "6.12.0",
+    "@sentry/node": "6.12.0",
+    "@sentry/react": "6.12.0",
+    "@sentry/tracing": "6.12.0",
+    "@sentry/utils": "6.12.0",
     "@sentry/webpack-plugin": "1.17.1",
     "tslib": "^1.9.3"
   },
   "devDependencies": {
-    "@sentry/types": "6.11.0",
+    "@sentry/types": "6.12.0",
     "@types/webpack": "^5.28.0",
     "eslint": "7.20.0",
     "next": "10.1.3",

packages/nextjs/src/config/index.ts

@@ -15,7 +15,7 @@ export function withSentryConfig(
   // If the user has passed us a function, we need to return a function, so that we have access to `phase` and
   // `defaults` in order to pass them along to the user's function
   if (typeof userNextConfig === 'function') {
-    return function(phase: string, defaults: { defaultConfig: { [key: string]: unknown } }): NextConfigObject {
+    return function(phase: string, defaults: { defaultConfig: NextConfigObject }): NextConfigObject {
       const materializedUserNextConfig = userNextConfig(phase, defaults);
       return {
         ...materializedUserNextConfig,