Merge branch 'master' of https://github.com/getsentry/sentry-javascript into onur/playwright-browser-tests

Author: onurtemizkan

packages/ember/package.json

@@ -23,8 +23,8 @@
     "lint:hbs": "ember-template-lint .",
     "lint:js": "eslint . --cache --cache-location '../../eslintcache/'",
     "pack": "npm pack",
-    "prepublishOnly": "ember ts:precompile",
-    "postpublish": "ember ts:clean",
+    "prepack": "ember ts:precompile",
+    "postpack": "ember ts:clean",
     "start": "ember serve",
     "test": "ember try:each",
     "test:all": "node ./scripts/run-CI-tests.js"
@@ -35,10 +35,10 @@
     "@sentry/tracing": "6.16.1",
     "@sentry/types": "6.16.1",
     "@sentry/utils": "6.16.1",
-    "ember-auto-import": "^1.12.0",
+    "ember-auto-import": "^1.12.0 || ^2.2.0",
     "ember-cli-babel": "~7.26.6",
-    "ember-cli-htmlbars": "^5.7.1",
-    "ember-cli-typescript": "~3.1.4"
+    "ember-cli-htmlbars": "^6.0.1",
+    "ember-cli-typescript": "^4.2.1"
   },
   "devDependencies": {
     "@ember/optional-features": "~1.3.0",
@@ -75,7 +75,8 @@
     "eslint-plugin-ember": "~8.6.0",
     "eslint-plugin-node": "^11.1.0",
     "loader.js": "~4.7.0",
-    "qunit-dom": "~1.2.0"
+    "qunit-dom": "~1.2.0",
+    "webpack": "^5.65.0"
   },
   "engines": {
     "node": "10.* || >= 12"

packages/react/src/errorboundary.tsx

@@ -1,9 +1,12 @@
 import { captureException, ReportDialogOptions, Scope, showReportDialog, withScope } from '@sentry/browser';
-import { logger, parseSemver } from '@sentry/utils';
+import { logger } from '@sentry/utils';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import * as React from 'react';
 
-const reactVersion = parseSemver(React.version);
+export function isAtLeastReact17(version: string): boolean {
+  const major = version.match(/^([^.]+)/);
+  return major !== null && parseInt(major[0]) >= 17;
+}
 
 export const UNKNOWN_COMPONENT = 'unknown';
 
@@ -71,7 +74,7 @@ class ErrorBoundary extends React.Component<ErrorBoundaryProps, ErrorBoundarySta
       // If on React version >= 17, create stack trace from componentStack param and links
       // to to the original error using `error.cause` otherwise relies on error param for stacktrace.
       // Linking errors requires the `LinkedErrors` integration be enabled.
-      if (reactVersion.major && reactVersion.major >= 17) {
+      if (isAtLeastReact17(React.version)) {
         const errorBoundaryError = new Error(error.message);
         errorBoundaryError.name = `React ErrorBoundary ${errorBoundaryError.name}`;
         errorBoundaryError.stack = componentStack;

packages/react/test/errorboundary.test.tsx

@@ -3,7 +3,13 @@ import { fireEvent, render, screen } from '@testing-library/react';
 import * as React from 'react';
 import { useState } from 'react';
 
-import { ErrorBoundary, ErrorBoundaryProps, UNKNOWN_COMPONENT, withErrorBoundary } from '../src/errorboundary';
+import {
+  ErrorBoundary,
+  ErrorBoundaryProps,
+  isAtLeastReact17,
+  UNKNOWN_COMPONENT,
+  withErrorBoundary,
+} from '../src/errorboundary';
 
 const mockCaptureException = jest.fn();
 const mockShowReportDialog = jest.fn();
@@ -326,3 +332,17 @@ describe('ErrorBoundary', () => {
     });
   });
 });
+
+describe('isAtLeastReact17', () => {
+  test.each([
+    ['React 15 with no patch', '15.0', false],
+    ['React 15 with no patch and no minor', '15.5', false],
+    ['React 16', '16.0.4', false],
+    ['React 17', '17.0.0', true],
+    ['React 17 with no patch', '17.4', true],
+    ['React 17 with no patch and no minor', '17', true],
+    ['React 18', '18.0.0', true],
+  ])('%s', (_: string, input: string, output: ReturnType<typeof isAtLeastReact17>) => {
+    expect(isAtLeastReact17(input)).toBe(output);
+  });
+});