Merge branch 'master' into kmclb-next-js-performance

Author: lobsterkatie

.github/workflows/build.yml

@@ -193,9 +193,17 @@ jobs:
         with:
           path: ${{ env.CACHED_BUILD_PATHS }}
           key: ${{ env.BUILD_CACHE_KEY }}
+      - name: Check changed files
+        id: changed-files-specific
+        uses: tj-actions/[email protected]
+        with:
+          files: .*packages\/(ember|browser|core|tracing|hub|minimal|types|utils)($|/.*)
+      # Only run ember tests if the files above have changed
       - name: Run Ember tests
+        if: steps.changed-files-specific.outputs.any_changed == 'true'
         run: yarn test --scope=@sentry/ember
       - name: Compute test coverage
+        if: steps.changed-files-specific.outputs.any_changed == 'true'
         uses: codecov/codecov-action@v1
 
   job_artifacts:

CHANGELOG.md

@@ -4,6 +4,17 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 6.4.1
+
+- [ember] ref: Fix merging of runtime config with environment config. (#3563)
+- [angular] ref: Allow angular v12 as a peer dependency. (#3569)
+- [tracing] fix: Avoid browser tracing initialization on node environment (#3548)
+- [react] ref: Make RouteProps typing more generic (#3570)
+- [tracing] fix: Correctly handle pg.Cursor in pg query method (#3567)
+- [types] fix: Add attachment to SentryRequestType (#3561)
+- [nextjs] ref: Disable node session for next.js (#3558)
+- [eslint] feat: Add new eslint rules (#3545)
+
 ## 6.4.0
 
 - [core] feat: initalScope in SDK Options (#3544)

lerna.json

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

packages/angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/angular",
-  "version": "6.4.0",
+  "version": "6.4.1",
   "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,22 +16,22 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@angular/common": "10.x || 11.x",
-    "@angular/core": "10.x || 11.x",
-    "@angular/router": "10.x || 11.x"
+    "@angular/common": "10.x || 11.x || 12.x",
+    "@angular/core": "10.x || 11.x || 12.x",
+    "@angular/router": "10.x || 11.x || 12.x"
   },
   "dependencies": {
-    "@sentry/browser": "6.4.0",
-    "@sentry/types": "6.4.0",
-    "@sentry/utils": "6.4.0",
+    "@sentry/browser": "6.4.1",
+    "@sentry/types": "6.4.1",
+    "@sentry/utils": "6.4.1",
     "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.4.0",
+    "@sentry-internal/eslint-config-sdk": "6.4.1",
     "eslint": "7.6.0",
     "npm-run-all": "^4.1.2",
     "prettier": "1.19.0",

packages/browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/browser",
-  "version": "6.4.0",
+  "version": "6.4.1",
   "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.4.0",
-    "@sentry/types": "6.4.0",
-    "@sentry/utils": "6.4.0",
+    "@sentry/core": "6.4.1",
+    "@sentry/types": "6.4.1",
+    "@sentry/utils": "6.4.1",
     "tslib": "^1.9.3"
   },
   "devDependencies": {
-    "@sentry-internal/eslint-config-sdk": "6.4.0",
+    "@sentry-internal/eslint-config-sdk": "6.4.1",
     "@types/eslint": "^7.2.0",
     "@types/md5": "2.1.33",
     "btoa": "^1.2.1",

packages/browser/src/transports/base.ts

@@ -15,6 +15,7 @@ const CATEGORY_MAPPING: {
   event: 'error',
   transaction: 'transaction',
   session: 'session',
+  attachment: 'attachment',
 };
 
 /** Base Transport class implementation */

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/core",
-  "version": "6.4.0",
+  "version": "6.4.1",
   "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.4.0",
-    "@sentry/minimal": "6.4.0",
-    "@sentry/types": "6.4.0",
-    "@sentry/utils": "6.4.0",
+    "@sentry/hub": "6.4.1",
+    "@sentry/minimal": "6.4.1",
+    "@sentry/types": "6.4.1",
+    "@sentry/utils": "6.4.1",
     "tslib": "^1.9.3"
   },
   "devDependencies": {
-    "@sentry-internal/eslint-config-sdk": "6.4.0",
+    "@sentry-internal/eslint-config-sdk": "6.4.1",
     "eslint": "7.6.0",
     "jest": "^24.7.1",
     "npm-run-all": "^4.1.2",

packages/core/src/version.ts

@@ -1 +1 @@
-export const SDK_VERSION = '6.4.0';
+export const SDK_VERSION = '6.4.1';

packages/ember/addon/index.ts

@@ -17,7 +17,9 @@ export function InitSentryForEmber(_runtimeConfig: BrowserOptions | undefined) {
   assert('Missing configuration.', config);
   assert('Missing configuration for Sentry.', config.sentry || _runtimeConfig);
 
-  const initConfig = Object.assign({}, config.sentry, _runtimeConfig || {});
+  // Permanently merge options into config, preferring runtime config
+  Object.assign(config.sentry, _runtimeConfig || {});
+  const initConfig = Object.assign({}, config.sentry);
 
   initConfig._metadata = initConfig._metadata || {};
   initConfig._metadata.sdk = {

packages/ember/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/ember",
-  "version": "6.4.0",
+  "version": "6.4.1",
   "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.4.0",
-    "@sentry/tracing": "6.4.0",
-    "@sentry/types": "6.4.0",
-    "@sentry/utils": "6.4.0",
+    "@sentry/browser": "6.4.1",
+    "@sentry/tracing": "6.4.1",
+    "@sentry/types": "6.4.1",
+    "@sentry/utils": "6.4.1",
     "ember-auto-import": "^1.6.0",
     "ember-cli-babel": "^7.20.5",
     "ember-cli-htmlbars": "^5.1.2",
@@ -46,7 +46,7 @@
     "@embroider/test-setup": "~0.37.0",
     "@glimmer/component": "^1.0.0",
     "@glimmer/tracking": "^1.0.0",
-    "@sentry-internal/eslint-config-sdk": "6.4.0",
+    "@sentry-internal/eslint-config-sdk": "6.4.1",
     "@types/ember": "^3.16.3",
     "@types/ember-qunit": "^3.4.9",
     "@types/ember__test-helpers": "^1.7.0",