diff --git a/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts b/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts index 8c3f3ee0242d..ae31ee00a6dc 100644 --- a/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts +++ b/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts @@ -58,8 +58,6 @@ const DEPENDENTS: Dependent[] = [ ignoreExports: [ // not supported in bun: 'NodeClient', - // legacy, to be removed... - 'makeMain', ], }, { @@ -79,8 +77,6 @@ const DEPENDENTS: Dependent[] = [ compareWith: nodeExports, exports: Object.keys(SentryAWS), ignoreExports: [ - // legacy, to be removed... - 'makeMain', // Not needed for Serverless 'setupFastifyErrorHandler', ], @@ -90,8 +86,6 @@ const DEPENDENTS: Dependent[] = [ compareWith: nodeExports, exports: Object.keys(SentryGoogleCloud), ignoreExports: [ - // legacy, to be removed... - 'makeMain', // Not needed for Serverless 'setupFastifyErrorHandler', ], diff --git a/packages/astro/src/index.types.ts b/packages/astro/src/index.types.ts index dad62a288d53..e5fe8fd965b4 100644 --- a/packages/astro/src/index.types.ts +++ b/packages/astro/src/index.types.ts @@ -22,8 +22,6 @@ export declare const defaultStackParser: StackParser; export declare function close(timeout?: number | undefined): PromiseLike; export declare function flush(timeout?: number | undefined): PromiseLike; -// eslint-disable-next-line deprecation/deprecation -export declare const makeMain: typeof clientSdk.makeMain; // eslint-disable-next-line deprecation/deprecation export declare const getCurrentHub: typeof clientSdk.getCurrentHub; export declare const getClient: typeof clientSdk.getClient; diff --git a/packages/browser/src/exports.ts b/packages/browser/src/exports.ts index 07fe2eda1c8c..8d581eaeda21 100644 --- a/packages/browser/src/exports.ts +++ b/packages/browser/src/exports.ts @@ -37,8 +37,6 @@ export { getIsolationScope, getGlobalScope, Hub, - // eslint-disable-next-line deprecation/deprecation - makeMain, setCurrentClient, Scope, continueTrace, diff --git a/packages/core/src/hub.ts b/packages/core/src/hub.ts index 39e9f7de1ec1..4c6cecf6858b 100644 --- a/packages/core/src/hub.ts +++ b/packages/core/src/hub.ts @@ -529,18 +529,6 @@ export class Hub implements HubInterface { } } -/** - * Replaces the current main hub with the passed one on the global object - * - * @returns The old replaced hub - * - * @deprecated Use `setCurrentClient()` instead. - */ -export function makeMain(hub: HubInterface): HubInterface { - // noop! - return hub; -} - /** * Returns the default hub instance. * diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index c384701319ef..3a5cab6986b3 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -33,8 +33,6 @@ export { // eslint-disable-next-line deprecation/deprecation getCurrentHub, Hub, - // eslint-disable-next-line deprecation/deprecation - makeMain, getGlobalHub, getDefaultCurrentScope, getDefaultIsolationScope, diff --git a/packages/node/src/index.ts b/packages/node/src/index.ts index 0184c14e730e..66772bd034e1 100644 --- a/packages/node/src/index.ts +++ b/packages/node/src/index.ts @@ -40,8 +40,6 @@ export { getGlobalScope, getIsolationScope, Hub, - // eslint-disable-next-line deprecation/deprecation - makeMain, setCurrentClient, Scope, SDK_VERSION, diff --git a/packages/node/test/integrations/http.test.ts b/packages/node/test/integrations/http.test.ts index 3b1fa4904f04..e4ce93934ed4 100644 --- a/packages/node/test/integrations/http.test.ts +++ b/packages/node/test/integrations/http.test.ts @@ -1,6 +1,6 @@ import * as http from 'http'; import * as https from 'https'; -import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, getSpanDescendants, makeMain, startSpan } from '@sentry/core'; +import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, getSpanDescendants, startSpan } from '@sentry/core'; import { getCurrentHub, getIsolationScope, setCurrentClient } from '@sentry/core'; import { Transaction } from '@sentry/core'; import { getCurrentScope, setUser, spanToJSON, startInactiveSpan } from '@sentry/core'; @@ -346,8 +346,6 @@ describe('tracing', () => { client.init(); // eslint-disable-next-line deprecation/deprecation const hub = getCurrentHub(); - // eslint-disable-next-line deprecation/deprecation - makeMain(hub); return hub; } diff --git a/packages/remix/src/index.types.ts b/packages/remix/src/index.types.ts index a4c619401d9d..cbbf17998188 100644 --- a/packages/remix/src/index.types.ts +++ b/packages/remix/src/index.types.ts @@ -27,8 +27,6 @@ export declare const defaultStackParser: StackParser; // methods from `@sentry/core`. declare const runtime: 'client' | 'server'; -// eslint-disable-next-line deprecation/deprecation -export declare const makeMain: typeof clientSdk.makeMain; // eslint-disable-next-line deprecation/deprecation export declare const getCurrentHub: typeof clientSdk.getCurrentHub; export declare const getClient: typeof clientSdk.getClient;