fix(react): Import default for hoistNonReactStatics (#15238)

getsentry · Jan 31, 2025 · 25e7071 · 25e7071
1 parent e3ee276
commit 25e7071
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/packages/react/src/errorboundary.tsx b/packages/react/src/errorboundary.tsx
@@ -2,8 +2,8 @@ import type { ReportDialogOptions } from '@sentry/browser';
 import { getClient, showReportDialog, withScope } from '@sentry/browser';
 import { logger } from '@sentry/core';
 import type { Scope } from '@sentry/core';
-import hoistNonReactStatics from 'hoist-non-react-statics';
 import * as React from 'react';
+import { hoistNonReactStatics } from './hoist-non-react-statics';
 
 import { DEBUG_BUILD } from './debug-build';
 import { captureReactException } from './error';

diff --git a/packages/react/src/hoist-non-react-statics.ts b/packages/react/src/hoist-non-react-statics.ts
@@ -0,0 +1,5 @@
+import * as hoistNonReactStaticsImport from 'hoist-non-react-statics';
+
+// Ensure we use the default export from hoist-non-react-statics if available,
+// falling back to the module itself. This handles both ESM and CJS usage.
+export const hoistNonReactStatics = hoistNonReactStaticsImport.default || hoistNonReactStaticsImport;
diff --git a/packages/react/src/profiler.tsx b/packages/react/src/profiler.tsx
@@ -1,10 +1,10 @@
 import { startInactiveSpan } from '@sentry/browser';
 import type { Span } from '@sentry/core';
 import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, spanToJSON, timestampInSeconds, withActiveSpan } from '@sentry/core';
-import hoistNonReactStatics from 'hoist-non-react-statics';
 import * as React from 'react';
 
 import { REACT_MOUNT_OP, REACT_RENDER_OP, REACT_UPDATE_OP } from './constants';
+import { hoistNonReactStatics } from './hoist-non-react-statics';
 
 export const UNKNOWN_COMPONENT = 'unknown';
 
@@ -236,4 +236,4 @@ function useProfiler(
   }, []);
 }
 
-export { withProfiler, Profiler, useProfiler };
+export { Profiler, useProfiler, withProfiler };
diff --git a/packages/react/src/reactrouter.tsx b/packages/react/src/reactrouter.tsx
@@ -14,9 +14,9 @@ import {
   spanToJSON,
 } from '@sentry/core';
 import type { Client, Integration, Span, TransactionSource } from '@sentry/core';
-import hoistNonReactStatics from 'hoist-non-react-statics';
 import * as React from 'react';
 import type { ReactElement } from 'react';
+import { hoistNonReactStatics } from './hoist-non-react-statics';
 
 import type { Action, Location } from './types';
 

diff --git a/packages/react/src/reactrouterv6-compat-utils.tsx b/packages/react/src/reactrouterv6-compat-utils.tsx
@@ -22,8 +22,8 @@ import {
 } from '@sentry/core';
 import * as React from 'react';
 
-import hoistNonReactStatics from 'hoist-non-react-statics';
 import { DEBUG_BUILD } from './debug-build';
+import { hoistNonReactStatics } from './hoist-non-react-statics';
 import type {
   Action,
   AgnosticDataRouteMatch,