Merge remote-tracking branch 'upstream/master' into feat/separate-source-reading

Author: timfish

.prettierrc.json

@@ -1,4 +1,5 @@
 {
+  "arrowParens": "avoid",
   "printWidth": 120,
   "proseWrap": "always",
   "singleQuote": true,

CHANGELOG.md

@@ -4,26 +4,77 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 6.17.6
+
+- fix(angular): Add check for global.location in angular universal (#4513)
+- fix(nextjs): Stop injecting sentry into API middleware (#4517)
+- fix(nextjs): Revert #4139 - remove manipulation of res.finished value (#4516)
+
+Work in this release contributed by @mobilestar1. Thank you for your contribution!
+
+## 6.17.5
+
+This release deprecates the `Severity` enum, the `SeverityLevel` type, and the internal `SeverityLevels` array, all from `@sentry/types`. In v7, `Severity` will disappear (in favor of `SeverityLevel`) and `SeverityLevel` and `SeverityLevels` will live in `@sentry/utils`. If you are using any of the three, we encourage you to migrate your usage now, using our [migration guide](./MIGRATION.md#upgrading-from-6.x-to-6.17.x).
+
+- ref: Export Session class from core/browser/node (#4508)
+- chore(nextjs): Bump`@sentry/webpack-plugin` to 1.18.5 (#4501)
+- ref(types): Move SeverityLevel and SeverityLevels to `@sentry/utils` (#4492)
+- fix(vue): Cast name parameter to string (#4483)
+
+Work in this release contributed by @Bobakanoosh and @ssnielsen. Thank you for your contributions!
+
+## 6.17.4
+
+- chore(deps): Bump `@sentry/webpack-plugin` from 1.18.3 to 1.18.4 (#4464)
+- fix(browser): Set severity level for events captured by the global error handler (#4460)
+- fix(integrations): Add default for `ExtraErrorData`'s `depth` option (#4487)
+- fix(nextjs): Export `BrowserTracing` integration directly (#4480)
+- fix(tracing): Export `SpanStatus` enum (#4478)
+- fix(vue): Property `_isVue` not defined in Vue3 (#4461)
+
+Work in this release contributed by @7inspire, @jaeseokk, and @rchl. Thank you for your contributions!
+
+## 6.17.3
+
+- fix(nextjs): Unwrap `req` and `res` if necessary when instrumenting server (#4467)
+
+## 6.17.2
+
+This patch contains a breaking change for anyone setting the undocumented `rethrowAfterCapture` option for `@sentry/serverless`'s AWS wrapper to `false`, as its functionality has been removed. For backwards compatibility with anyone setting it to `true` (which is also the default), the option remains in the `WrapperOptions` type for now. It will be removed in the next major release, though, so we recommend removing it from your code.
+
+- ref(serverless): Remove `rethrowAfterCapture` use in AWS lambda wrapper (#4448)
+- fix(utils): Remove dom is casting (#4451)
+
+## 6.17.1
+
+- ref(core): Renormalize event only after stringification errors (#4425)
+- feat(nextjs): Add option to use `hidden-source-map` as webpack devtool value (#4436)
+- fix(tracing): ignore the xhr/fetch response if its request is not being tracked (#4428)
+- fix(vue): prevent after hook from starting new span (#4438)
+
+Work in this release contributed by @datbth. Thank you for your contribution!
+
 ## 6.17.0
 
-This release contains several internal refactors that help reduce the bundle size of the SDK and help prep for our [upcoming major release](https://github.com/getsentry/sentry-javascript/issues/4240). There are no breaking changes in this patch unless you are using our internal `Dsn` class, which has been removed. We also deprecated a few of our typescript enums and our internal `API` class. We've detailed in our [migration documentation](./MIGRATION.md#upgrading-from-6.x-to-6.17.0) how to update your sdk usage if you are using any of these in your code.
+This release contains several internal refactors that help reduce the bundle size of the SDK and help prep for our [upcoming major release](https://github.com/getsentry/sentry-javascript/issues/4240). There are no breaking changes in this patch unless you are using our internal `Dsn` class, which has been removed. We also deprecated a few of our typescript enums and our internal `API` class. We've detailed in our [migration documentation](./MIGRATION.md#upgrading-from-6.x-to-6.17.x) how to update your sdk usage if you are using any of these in your code.
 
-- feat: Undeprecate Severity Enum (#4412)
 - feat: Remove Dsn class (#4325)
 - feat(core): Add processing metadata to scope and event (#4252)
 - feat(core): Deprecate API class (#4281)
 - feat(ember): Update ember dependencies (#4253)
 - fix(nextjs): Inject sentry.x.config.js into pages/_error (#4397)
 - fix(nextjs): Add sentry-cli existence check for enabling webpack plugin #4311
 - ref(tracing): deprecate span status enum (#4299)
+- ref(tracing): Remove script evaluation span (#4433)
 - ref(types): drop unused logLevel (#4317)
 - ref(types): deprecate request status enum (#4316)
 - ref(types): deprecate outcome enum (#4315)
 - ref(types): deprecate transactionmethod enum (#4314)
 - ref(types): deprecate status enum (#4298)
-- ref(types): deprecate severity enum (#4280)
+- ref(utils): improve invalid dsn error message (#4430)
+- fix(vue): Prioritize app variable to avoid duplicate name pollution (#4437)
 
-Work in this release contributed by @yordis. Thank you for your contribution!
+Work in this release contributed by @yordis, @Badisi, and @lh1me. Thank you for your contribution!
 
 ## 6.16.1
 
@@ -935,7 +986,7 @@ removed in the future. If you are only using the `Tracing` integration there is
 
 ## 5.6.3
 
-- [browser] fix: Don't capture our own XHR events that somehow bubbled-up to global handler
+- [browser] fix: Don't capture our own XHR events that somehow bubbled-up to global handler (#2221)
 
 ## 5.6.2
 

CONTRIBUTING.md

@@ -79,7 +79,19 @@ When contributing to the codebase, please note:
 _These steps are only relevant to Sentry employees when preparing and publishing a new SDK release._
 
 1. Determine what version will be released (we use [semver](https://semver.org)).
-2. Update [`CHANGELOG.md`](https://github.com/getsentry/sentry-javascript/edit/master/CHANGELOG.md) to add an entry for the next release number and a list of changes since the last release.
+2. Update [`CHANGELOG.md`](https://github.com/getsentry/sentry-javascript/edit/master/CHANGELOG.md) to add an entry for the next release number and a list of changes since the last release. (See details below.)
 3. Run the [Prepare Release](https://github.com/getsentry/sentry-javascript/actions/workflows/release.yml) workflow.
 4. A new issue should appear in https://github.com/getsentry/publish/issues.
 5. Ask a member of the [@getsentry/releases team](https://github.com/orgs/getsentry/teams/releases/members) to approve the release.
+
+### Updating the Changelog
+
+1. Create a new branch.
+2. Run `git log --format="- %s"` and copy everything since the last release.
+3. Create a new section in the changelog, deciding based on the changes whether it should be a minor bump or a patch release.
+4. Paste in the logs you copied earlier.
+5. Delete any which aren't user-facing changes.
+6. Alphabetize the rest.
+7. Run a regex find and replace, searching for `\(#(\d+)\)` and replacing it with `([#$1](https://github.com/getsentry/sentry-javascript/pull/$1))`. (This will linkify all of the PR references.)
+8. If any of the PRs are from external contributors, include underneath the commits `Work in this release contributed by <list of external contributors' GitHub usernames>. Thank you for your contributions!`. If there's only one external PR, don't forget to remove the final `s`. If there are three or more, use an Oxford comma. (It's in the Sentry styleguide!)
+9. Commit, push, and open a PR with the title `meta: Update changelog for <fill in relevant version here>`.

MIGRATION.md

@@ -1,6 +1,6 @@
-# Upgrading from 6.x to 6.17.0
+# Upgrading from 6.x to 6.17.x
 
-You only need to make changes when migrating to `6.17.0` if you are using our internal `Dsn` class. Our internal API class and typescript enums were deprecated, so we recommend you migrate them as well.
+You only need to make changes when migrating to `6.17.x` if you are using our internal `Dsn` class. Our internal API class and typescript enums were deprecated, so we recommend you migrate them as well.
 
 The internal `Dsn` class was removed in `6.17.0`. For additional details, you can look at the [PR where this change happened](https://github.com/getsentry/sentry-javascript/pull/4325). To migrate, see the following example.
 
@@ -44,7 +44,7 @@ const envelopeEndpoint = api.getEnvelopeEndpointWithUrlEncodedAuth();
 
 ## Enum changes
 
-The enums `Status` and `SpanStatus` were deprecated, and we've detailed how to migrate away from them below. We also deprecated the `TransactionMethod`, `Outcome` and `RequestSessionStatus` enums, but those are internal-only APIs. If you are using them, we encourage you to take a look at the corresponding PRs to see how we've changed our code as a result.
+The enums `Status`, `SpanStatus`, and `Severity` were deprecated, and we've detailed how to migrate away from them below. We also deprecated the `TransactionMethod`, `Outcome` and `RequestSessionStatus` enums, but those are internal-only APIs. If you are using them, we encourage you to take a look at the corresponding PRs to see how we've changed our code as a result.
 
 - `TransactionMethod`: https://github.com/getsentry/sentry-javascript/pull/4314
 - `Outcome`: https://github.com/getsentry/sentry-javascript/pull/4315
@@ -82,6 +82,28 @@ import { SpanStatus } from '@sentry/tracing';
 const status = SpanStatus.fromHttpCode(403);
 ```
 
+#### Severity, SeverityLevel, and SeverityLevels
+
+We deprecated the `Severity` enum in `@sentry/types` and it will be removed in the next major release. We recommend using string literals (typed as `SeverityLevel`) to save on bundle size.
+
+`SeverityLevel` and `SeverityLevels` will continue to exist in v7, but they will live in `@sentry/utils` rather than `@sentry/types`. Currently, they live in both, for ease of migration. (`SeverityLevels` isn't included in the examples below because it is only useful internally.)
+
+```js
+// New in 6.17.5:
+import { SeverityLevel } from '@sentry/utils';
+
+const levelA = "error" as SeverityLevel;
+
+const levelB: SeverityLevel = "error"
+
+// Before:
+import { Severity, SeverityLevel } from '@sentry/types';
+
+const levelA = Severity.error;
+
+const levelB: SeverityLevel = "error"
+```
+
 # 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.17.0-beta.0",
+  "version": "6.17.5",
   "packages": "packages/*",
   "npmClient": "yarn",
   "useWorkspaces": true

package.json

@@ -68,7 +68,7 @@
     "madge": "4.0.2",
     "mocha": "^6.1.4",
     "npm-run-all": "^4.1.5",
-    "prettier": "1.19.1",
+    "prettier": "2.5.1",
     "replace-in-file": "^4.0.0",
     "rimraf": "^3.0.2",
     "sinon": "^7.3.2",

packages/angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/angular",
-  "version": "6.17.0-beta.0",
+  "version": "6.17.5",
   "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,9 +21,9 @@
     "@angular/router": "10.x || 11.x || 12.x || 13.x"
   },
   "dependencies": {
-    "@sentry/browser": "6.17.0-beta.0",
-    "@sentry/types": "6.17.0-beta.0",
-    "@sentry/utils": "6.17.0-beta.0",
+    "@sentry/browser": "6.17.5",
+    "@sentry/types": "6.17.5",
+    "@sentry/utils": "6.17.5",
     "rxjs": "^6.6.0",
     "tslib": "^1.9.3"
   },
@@ -39,10 +39,10 @@
     "build:es5": "yarn build:cjs # *** backwards compatibility - remove in v7 ***",
     "build:esm": "tsc -p tsconfig.esm.json",
     "build:watch": "run-p build:cjs:watch build:esm:watch",
-    "build:cjs:watch": "tsc -p tsconfig.cjs.json -w --preserveWatchOutput",
+    "build:cjs:watch": "tsc -p tsconfig.cjs.json --watch",
     "build:dev:watch": "run-s build:watch",
     "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***",
-    "build:esm:watch": "tsc -p tsconfig.esm.json -w --preserveWatchOutput",
+    "build:esm:watch": "tsc -p tsconfig.esm.json --watch",
     "circularDepCheck": "madge --circular src/index.ts",
     "clean": "rimraf dist esm build coverage",
     "fix": "run-s fix:eslint fix:prettier",

packages/angular/src/tracing.ts

@@ -27,7 +27,7 @@ export function routingInstrumentation(
   stashedStartTransaction = customStartTransaction;
   stashedStartTransactionOnLocationChange = startTransactionOnLocationChange;
 
-  if (startTransactionOnPageLoad) {
+  if (startTransactionOnPageLoad && global && global.location) {
     customStartTransaction({
       name: global.location.pathname,
       op: 'pageload',
@@ -183,7 +183,7 @@ export function TraceClassDecorator(): ClassDecorator {
   return target => {
     const originalOnInit = target.prototype.ngOnInit;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    target.prototype.ngOnInit = function(...args: any[]): ReturnType<typeof originalOnInit> {
+    target.prototype.ngOnInit = function (...args: any[]): ReturnType<typeof originalOnInit> {
       const activeTransaction = getActiveTransaction();
       if (activeTransaction) {
         tracingSpan = activeTransaction.startChild({
@@ -198,7 +198,7 @@ export function TraceClassDecorator(): ClassDecorator {
 
     const originalAfterViewInit = target.prototype.ngAfterViewInit;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    target.prototype.ngAfterViewInit = function(...args: any[]): ReturnType<typeof originalAfterViewInit> {
+    target.prototype.ngAfterViewInit = function (...args: any[]): ReturnType<typeof originalAfterViewInit> {
       if (tracingSpan) {
         tracingSpan.finish();
       }
@@ -218,7 +218,7 @@ export function TraceMethodDecorator(): MethodDecorator {
   return (target: Object, propertyKey: string | symbol, descriptor: PropertyDescriptor) => {
     const originalMethod = descriptor.value;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    descriptor.value = function(...args: any[]): ReturnType<typeof originalMethod> {
+    descriptor.value = function (...args: any[]): ReturnType<typeof originalMethod> {
       const now = timestampWithMs();
       const activeTransaction = getActiveTransaction();
       if (activeTransaction) {

packages/browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/browser",
-  "version": "6.17.0-beta.0",
+  "version": "6.17.5",
   "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,9 +16,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "6.17.0-beta.0",
-    "@sentry/types": "6.17.0-beta.0",
-    "@sentry/utils": "6.17.0-beta.0",
+    "@sentry/core": "6.17.5",
+    "@sentry/types": "6.17.5",
+    "@sentry/utils": "6.17.5",
     "tslib": "^1.9.3"
   },
   "devDependencies": {
@@ -58,10 +58,10 @@
     "build:esm": "tsc -p tsconfig.esm.json",
     "build:watch": "run-p build:cjs:watch build:esm:watch build:bundle:watch",
     "build:bundle:watch": "rollup --config --watch",
-    "build:cjs:watch": "tsc -p tsconfig.cjs.json -w --preserveWatchOutput",
+    "build:cjs:watch": "tsc -p tsconfig.cjs.json --watch",
     "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***",
     "build:dev:watch": "run-p build:cjs:watch build:esm:watch",
-    "build:esm:watch": "tsc -p tsconfig.esm.json -w --preserveWatchOutput",
+    "build:esm:watch": "tsc -p tsconfig.esm.json --watch",
     "circularDepCheck": "madge --circular src/index.ts",
     "clean": "rimraf dist esm build coverage .rpt2_cache",
     "fix": "run-s fix:eslint fix:prettier",

packages/browser/src/exports.ts

@@ -9,13 +9,14 @@ export {
   Exception,
   Response,
   Severity,
-  SeverityLevel,
   StackFrame,
   Stacktrace,
   Thread,
   User,
 } from '@sentry/types';
 
+export { SeverityLevel } from '@sentry/utils';
+
 export {
   addGlobalEventProcessor,
   addBreadcrumb,
@@ -28,6 +29,7 @@ export {
   Hub,
   makeMain,
   Scope,
+  Session,
   startTransaction,
   SDK_VERSION,
   setContext,

packages/browser/src/helpers.ts

@@ -80,7 +80,7 @@ export function wrap(
 
   /* eslint-disable prefer-rest-params */
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const sentryWrapped: WrappedFunction = function(this: any): void {
+  const sentryWrapped: WrappedFunction = function (this: any): void {
     const args = Array.prototype.slice.call(arguments);
 
     try {

packages/browser/src/integrations/breadcrumbs.ts

@@ -121,7 +121,7 @@ function _domBreadcrumb(dom: BreadcrumbsOptions['dom']): (handlerData: { [key: s
     try {
       target = handlerData.event.target
         ? htmlTreeAsString(handlerData.event.target as Node, keyAttrs)
-        : htmlTreeAsString((handlerData.event as unknown) as Node, keyAttrs);
+        : htmlTreeAsString(handlerData.event as unknown as Node, keyAttrs);
     } catch (e) {
       target = '<unknown>';
     }

packages/browser/src/integrations/globalhandlers.ts

@@ -101,6 +101,8 @@ function _installGlobalOnErrorHandler(): void {
               column,
             );
 
+      event.level = Severity.Error;
+
       addMechanismAndCapture(hub, error, event, 'onerror');
     },
   );
@@ -181,7 +183,8 @@ function _eventFromRejectionWithPrimitive(reason: Primitive): Event {
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function _eventFromIncompleteOnError(msg: any, url: any, line: any, column: any): Event {
-  const ERROR_TYPES_RE = /^(?:[Uu]ncaught (?:exception: )?)?(?:((?:Eval|Internal|Range|Reference|Syntax|Type|URI|)Error): )?(.*)$/i;
+  const ERROR_TYPES_RE =
+    /^(?:[Uu]ncaught (?:exception: )?)?(?:((?:Eval|Internal|Range|Reference|Syntax|Type|URI|)Error): )?(.*)$/i;
 
   // If 'message' is ErrorEvent, get real message from inside
   let message = isErrorEvent(msg) ? msg.message : msg;