fix circular deps in core

Author: Lms24

packages/core/src/getCurrentHubShim.ts

@@ -70,6 +70,18 @@ export function getCurrentHubShim(): Hub {
   };
 }
 
+/**
+ * Returns the default hub instance.
+ *
+ * If a hub is already registered in the global carrier but this module
+ * contains a more recent version, it replaces the registered version.
+ * Otherwise, the currently registered hub will be returned.
+ *
+ * @deprecated Use the respective replacement method directly instead.
+ */
+// eslint-disable-next-line deprecation/deprecation
+export const getCurrentHub = getCurrentHubShim;
+
 /**
  * Sends the current Session on the scope
  */

packages/core/src/hub.ts

@@ -24,7 +24,6 @@ import type { AsyncContextStrategy, Carrier } from './asyncContext';
 import { getMainCarrier, getSentryCarrier } from './asyncContext';
 import { DEFAULT_ENVIRONMENT } from './constants';
 import { DEBUG_BUILD } from './debug-build';
-import { getCurrentHubShim } from './getCurrentHubShim';
 import { Scope } from './scope';
 import { closeSession, makeSession, updateSession } from './session';
 import { SDK_VERSION } from './version';
@@ -497,18 +496,6 @@ export class Hub implements HubInterface {
   }
 }
 
-/**
- * Returns the default hub instance.
- *
- * If a hub is already registered in the global carrier but this module
- * contains a more recent version, it replaces the registered version.
- * Otherwise, the currently registered hub will be returned.
- *
- * @deprecated Use the respective replacement method directly instead.
- */
-// eslint-disable-next-line deprecation/deprecation
-export const getCurrentHub = getCurrentHubShim;
-
 /** Get the default current scope. */
 export function getDefaultCurrentScope(): Scope {
   return getGlobalSingleton('defaultCurrentScope', () => new Scope());

packages/core/src/index.ts

@@ -30,8 +30,6 @@ export {
   addEventProcessor,
 } from './exports';
 export {
-  // eslint-disable-next-line deprecation/deprecation
-  getCurrentHub,
   getDefaultCurrentScope,
   getDefaultIsolationScope,
 } from './hub';
@@ -107,4 +105,4 @@ export { addTracingHeadersToFetchRequest, instrumentFetchRequest } from './fetch
 export { trpcMiddleware } from './trpc';
 
 // eslint-disable-next-line deprecation/deprecation
-export { getCurrentHubShim } from './getCurrentHubShim';
+export { getCurrentHubShim, getCurrentHub } from './getCurrentHubShim';

packages/core/src/trpc.ts

@@ -1,12 +1,9 @@
 import { isThenable, normalize } from '@sentry/utils';
-import {
-  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
-  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
-  captureException,
-  setContext,
-  startSpanManual,
-} from '.';
+
 import { getClient } from './currentScopes';
+import { captureException, setContext } from './exports';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from './semanticAttributes';
+import { startSpanManual } from './tracing';
 
 interface SentryTrpcMiddlewareOptions {
   /** Whether to include procedure inputs in reported events. Defaults to `false`. */