ref(core)!: Split browser/server-only exports out of the default entrypoint

dev-packages/deno-integration-tests/suites/direct-client-acs/scenario.mjs

@@ -7,7 +7,8 @@
 // (it waits for the tracing-channel binding), so a nested db span here proves
 // `DenoClient.init()` installs that strategy on the direct-construction path.
 // Without it, the subscriber never binds and no span is produced.
-import { createStackParser, nodeStackLineParser } from '@sentry/core';
+import { createStackParser } from '@sentry/core';
+import { nodeStackLineParser } from '@sentry/core/server';
 import { DenoClient, getCurrentScope, getDefaultIntegrations, startSpan } from '@sentry/deno';
 import { tracingChannel } from 'node:diagnostics_channel';
 

dev-packages/e2e-tests/test-applications/nuxt-3/server/plugins/customNitroErrorHandler.ts

@@ -1,4 +1,5 @@
-import { Context, flushIfServerless } from '@sentry/core';
+import { Context } from '@sentry/core';
+import { flushIfServerless } from '@sentry/core/server';
 import * as SentryNode from '@sentry/node';
 import { H3Error } from 'h3';
 import type { CapturedErrorContext } from 'nitropack';

dev-packages/e2e-tests/test-applications/tsx-express/src/mcp.ts

@@ -4,7 +4,7 @@ import { McpServer, ResourceTemplate } from '@modelcontextprotocol/sdk/server/mc
 import { SSEServerTransport } from '@modelcontextprotocol/sdk/server/sse.js';
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import { z } from 'zod';
-import { wrapMcpServerWithSentry } from '@sentry/core';
+import { wrapMcpServerWithSentry } from '@sentry/node';
 
 // Helper to check if request is an initialize request (compatible with all MCP SDK versions)
 function isInitializeRequest(body: unknown): boolean {

dev-packages/node-integration-tests/suites/tracing/postgres-streamed/scenario-native.mjs

@@ -1,5 +1,5 @@
 import * as Sentry from '@sentry/node';
-import { uuid4 } from '@sentry/core/server';
+import { uuid4 } from '@sentry/core';
 import { waitForConnection } from '@sentry-internal/node-integration-tests';
 import pg from 'pg';
 

dev-packages/node-integration-tests/suites/tracing/postgres-streamed/scenario.mjs

@@ -1,5 +1,5 @@
 import * as Sentry from '@sentry/node';
-import { uuid4 } from '@sentry/core/server';
+import { uuid4 } from '@sentry/core';
 import { waitForConnection } from '@sentry-internal/node-integration-tests';
 import { Client } from 'pg';
 

dev-packages/node-integration-tests/suites/tracing/postgres/scenario-native.mjs

@@ -1,5 +1,5 @@
 import * as Sentry from '@sentry/node';
-import { uuid4 } from '@sentry/core/server';
+import { uuid4 } from '@sentry/core';
 import { waitForConnection } from '@sentry-internal/node-integration-tests';
 import pg from 'pg';
 

dev-packages/node-integration-tests/suites/tracing/postgres/scenario.mjs

@@ -1,5 +1,5 @@
 import * as Sentry from '@sentry/node';
-import { uuid4 } from '@sentry/core/server';
+import { uuid4 } from '@sentry/core';
 import { waitForConnection } from '@sentry-internal/node-integration-tests';
 import { Client } from 'pg';
 

dev-packages/node-integration-tests/suites/tracing/postgresjs-streamed/scenario-requestHook.mjs

@@ -1,5 +1,5 @@
 import * as Sentry from '@sentry/node';
-import { uuid4 } from '@sentry/core/server';
+import { uuid4 } from '@sentry/core';
 import postgres from 'postgres';
 import { waitForConnection } from '@sentry-internal/node-integration-tests';
 

dev-packages/node-integration-tests/suites/tracing/postgresjs-streamed/scenario-unsafe.mjs

@@ -1,5 +1,5 @@
 import * as Sentry from '@sentry/node';
-import { uuid4 } from '@sentry/core/server';
+import { uuid4 } from '@sentry/core';
 import postgres from 'postgres';
 import { waitForConnection } from '@sentry-internal/node-integration-tests';
 

dev-packages/node-integration-tests/suites/tracing/postgresjs-streamed/scenario-url.mjs

@@ -1,5 +1,5 @@
 import * as Sentry from '@sentry/node';
-import { uuid4 } from '@sentry/core/server';
+import { uuid4 } from '@sentry/core';
 import postgres from 'postgres';
 import { waitForConnection } from '@sentry-internal/node-integration-tests';
 

dev-packages/node-integration-tests/suites/tracing/postgresjs-streamed/scenario.mjs

@@ -1,5 +1,5 @@
 import * as Sentry from '@sentry/node';
-import { uuid4 } from '@sentry/core/server';
+import { uuid4 } from '@sentry/core';
 import postgres from 'postgres';
 import { waitForConnection } from '@sentry-internal/node-integration-tests';
 

dev-packages/node-integration-tests/suites/tracing/postgresjs/scenario-requestHook.mjs

@@ -1,5 +1,5 @@
 import * as Sentry from '@sentry/node';
-import { uuid4 } from '@sentry/core/server';
+import { uuid4 } from '@sentry/core';
 import postgres from 'postgres';
 import { waitForConnection } from '@sentry-internal/node-integration-tests';
 

dev-packages/node-integration-tests/suites/tracing/postgresjs/scenario-unsafe.mjs

@@ -1,5 +1,5 @@
 import * as Sentry from '@sentry/node';
-import { uuid4 } from '@sentry/core/server';
+import { uuid4 } from '@sentry/core';
 import postgres from 'postgres';
 import { waitForConnection } from '@sentry-internal/node-integration-tests';
 

dev-packages/node-integration-tests/suites/tracing/postgresjs/scenario-url.mjs

@@ -1,5 +1,5 @@
 import * as Sentry from '@sentry/node';
-import { uuid4 } from '@sentry/core/server';
+import { uuid4 } from '@sentry/core';
 import postgres from 'postgres';
 import { waitForConnection } from '@sentry-internal/node-integration-tests';
 

dev-packages/node-integration-tests/suites/tracing/postgresjs/scenario.mjs

@@ -1,5 +1,5 @@
 import * as Sentry from '@sentry/node';
-import { uuid4 } from '@sentry/core/server';
+import { uuid4 } from '@sentry/core';
 import postgres from 'postgres';
 import { waitForConnection } from '@sentry-internal/node-integration-tests';
 

packages/astro/src/server/middleware.ts

@@ -12,7 +12,6 @@ import { HTTP_SERVER } from '@sentry/conventions/op';
 import type { Span, SpanAttributes } from '@sentry/core';
 import {
   addNonEnumerableProperty,
-  flushIfServerless,
   getIsolationScope,
   getRootSpan,
   getUrlFragment,
@@ -26,6 +25,7 @@ import {
   filterCollectedUrl,
   filterCollectedUrlQuery,
 } from '@sentry/core';
+import { flushIfServerless } from '@sentry/core/server';
 import {
   captureException,
   continueTrace,

packages/browser-utils/src/performance/utils.ts

@@ -1,5 +1,6 @@
 import type { SentrySpan, Span, SpanTimeInput, StartSpanOptions } from '@sentry/core';
-import { spanToStaticSpanJSON, withActiveSpan, startInactiveSpan } from '@sentry/core/browser';
+import { spanToStaticSpanJSON, withActiveSpan } from '@sentry/core';
+import { startInactiveSpan } from '@sentry/core/browser';
 import { WINDOW } from '../types';
 
 /**

packages/browser-utils/src/types.ts

@@ -1,4 +1,5 @@
-import type { FetchBreadcrumbHint, HandlerDataFetch, XhrBreadcrumbHint } from '@sentry/core';
+import type { FetchBreadcrumbHint, HandlerDataFetch } from '@sentry/core';
+import type { XhrBreadcrumbHint } from '@sentry/core/browser';
 import { GLOBAL_OBJ } from '@sentry/core';
 
 export const WINDOW = GLOBAL_OBJ as typeof GLOBAL_OBJ &

packages/browser/src/client.ts

@@ -1,14 +1,14 @@
 import type {
-  BrowserClientReplayOptions,
   ClientOptions,
   Event,
   EventHint,
   Options as CoreOptions,
   ParameterizedString,
   Scope,
   SeverityLevel,
-} from '@sentry/core/browser';
-import { addAutoIpAddressToSession, applySdkMetadata, Client, getSDKSource } from '@sentry/core/browser';
+} from '@sentry/core';
+import type { BrowserClientReplayOptions } from '@sentry/core/browser';
+import { addAutoIpAddressToSession, applySdkMetadata, Client, getSDKSource } from '@sentry/core';
 import { eventFromException, eventFromMessage } from './eventbuilder';
 import { WINDOW } from './helpers';
 import type { BrowserTransportOptions } from './transports/types';

packages/browser/src/diagnose-sdk.ts

@@ -1,4 +1,4 @@
-import { getClient, suppressTracing } from '@sentry/core/browser';
+import { getClient, suppressTracing } from '@sentry/core';
 
 /**
  * A function to diagnose why the SDK might not be successfully sending data.

packages/browser/src/eventbuilder.ts

@@ -6,7 +6,7 @@ import type {
   SeverityLevel,
   StackFrame,
   StackParser,
-} from '@sentry/core/browser';
+} from '@sentry/core';
 import {
   _INTERNAL_enhanceErrorWithSentryInfo,
   addExceptionMechanism,
@@ -22,7 +22,7 @@ import {
   isPlainObject,
   normalizeToSize,
   resolvedSyncPromise,
-} from '@sentry/core/browser';
+} from '@sentry/core';
 
 type Prototype = { constructor: (...args: unknown[]) => unknown };
 

packages/browser/src/exports.ts

@@ -20,7 +20,7 @@ export type {
   ExclusiveEventHintOrCaptureContext,
   Log,
   LogSeverityLevel,
-} from '@sentry/core/browser';
+} from '@sentry/core';
 
 export type { BrowserOptions } from './client';
 
@@ -74,14 +74,14 @@ export {
   withStaticSpan,
   // oxlint-disable-next-line typescript/no-deprecated
   withStreamedSpan,
-} from '@sentry/core/browser';
+} from '@sentry/core';
 
 export {
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
   SENTRY_SEGMENT_NAME_SOURCE,
-} from '@sentry/core/browser';
+} from '@sentry/core';
 
 export { WINDOW } from './helpers';
 export { BrowserClient } from './client';

packages/browser/src/helpers.ts

@@ -1,4 +1,4 @@
-import type { Mechanism, WrappedFunction } from '@sentry/core/browser';
+import type { Mechanism, WrappedFunction } from '@sentry/core';
 import {
   addExceptionMechanism,
   addExceptionTypeValue,
@@ -8,7 +8,7 @@ import {
   GLOBAL_OBJ,
   markFunctionWrapped,
   withScope,
-} from '@sentry/core/browser';
+} from '@sentry/core';
 import { getLocationHref } from '@sentry/browser-utils';
 
 export const WINDOW = GLOBAL_OBJ as typeof GLOBAL_OBJ & Window;

packages/browser/src/index.bundle.logs.metrics.ts

@@ -8,7 +8,7 @@ import {
 
 export * from './index.bundle.base';
 
-export { logger, consoleLoggingIntegration, metrics } from '@sentry/core/browser';
+export { logger, consoleLoggingIntegration, metrics } from '@sentry/core';
 
 export { elementTimingIntegration } from '@sentry/browser-utils';
 

packages/browser/src/index.bundle.replay.logs.metrics.ts

@@ -7,7 +7,7 @@ import {
 
 export * from './index.bundle.base';
 
-export { logger, consoleLoggingIntegration, metrics } from '@sentry/core/browser';
+export { logger, consoleLoggingIntegration, metrics } from '@sentry/core';
 
 export { replayIntegration, getReplay } from '@sentry/replay';
 

packages/browser/src/index.bundle.tracing.logs.metrics.ts

@@ -1,25 +1,23 @@
-import { registerSpanErrorInstrumentation } from '@sentry/core/browser';
+import { registerSpanErrorInstrumentation } from '@sentry/core';
 import { feedbackIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims';
 
 registerSpanErrorInstrumentation();
 
 export * from './index.bundle.base';
 
-export { logger, consoleLoggingIntegration, metrics } from '@sentry/core/browser';
+export { logger, consoleLoggingIntegration, metrics } from '@sentry/core';
 
 export {
   getActiveSpan,
   getRootSpan,
   getSpanDescendants,
   setMeasurement,
-  startInactiveSpan,
   startNewTrace,
-  startSpan,
-  startSpanManual,
   withActiveSpan,
   spanStreamingIntegration,
-} from '@sentry/core/browser';
+} from '@sentry/core';
 
+export { startSpan, startInactiveSpan, startSpanManual } from '@sentry/core/browser';
 export {
   browserTracingIntegration,
   startBrowserTracingNavigationSpan,

packages/browser/src/index.bundle.tracing.replay.feedback.logs.metrics.ts

@@ -1,4 +1,4 @@
-import { registerSpanErrorInstrumentation } from '@sentry/core/browser';
+import { registerSpanErrorInstrumentation } from '@sentry/core';
 import { feedbackAsyncIntegration } from './feedbackAsync';
 
 registerSpanErrorInstrumentation();
@@ -10,16 +10,14 @@ export {
   getRootSpan,
   getSpanDescendants,
   setMeasurement,
-  startInactiveSpan,
   startNewTrace,
-  startSpan,
-  startSpanManual,
   withActiveSpan,
   logger,
   consoleLoggingIntegration,
   metrics,
   spanStreamingIntegration,
-} from '@sentry/core/browser';
+} from '@sentry/core';
+export { startSpan, startInactiveSpan, startSpanManual } from '@sentry/core/browser';
 
 export {
   browserTracingIntegration,

packages/browser/src/index.bundle.tracing.replay.feedback.ts

@@ -1,4 +1,4 @@
-import { registerSpanErrorInstrumentation } from '@sentry/core/browser';
+import { registerSpanErrorInstrumentation } from '@sentry/core';
 import {
   consoleLoggingIntegrationShim,
   elementTimingIntegrationShim,
@@ -16,15 +16,13 @@ export { consoleLoggingIntegrationShim as consoleLoggingIntegration, loggerShim
 export {
   getActiveSpan,
   getRootSpan,
-  startSpan,
-  startInactiveSpan,
-  startSpanManual,
   startNewTrace,
   withActiveSpan,
   getSpanDescendants,
   setMeasurement,
   spanStreamingIntegration,
-} from '@sentry/core/browser';
+} from '@sentry/core';
+export { startSpan, startInactiveSpan, startSpanManual } from '@sentry/core/browser';
 
 export {
   browserTracingIntegration,

packages/browser/src/index.bundle.tracing.replay.logs.metrics.ts

@@ -1,24 +1,22 @@
-import { registerSpanErrorInstrumentation } from '@sentry/core/browser';
+import { registerSpanErrorInstrumentation } from '@sentry/core';
 import { feedbackIntegrationShim } from '@sentry-internal/integration-shims';
 
 registerSpanErrorInstrumentation();
 
 export * from './index.bundle.base';
 
-export { logger, consoleLoggingIntegration, metrics } from '@sentry/core/browser';
+export { logger, consoleLoggingIntegration, metrics } from '@sentry/core';
 
 export {
   getActiveSpan,
   getRootSpan,
   getSpanDescendants,
   setMeasurement,
-  startInactiveSpan,
   startNewTrace,
-  startSpan,
-  startSpanManual,
   withActiveSpan,
   spanStreamingIntegration,
-} from '@sentry/core/browser';
+} from '@sentry/core';
+export { startSpan, startInactiveSpan, startSpanManual } from '@sentry/core/browser';
 
 export {
   browserTracingIntegration,

packages/browser/src/index.bundle.tracing.replay.ts

@@ -1,4 +1,4 @@
-import { registerSpanErrorInstrumentation } from '@sentry/core/browser';
+import { registerSpanErrorInstrumentation } from '@sentry/core';
 import {
   consoleLoggingIntegrationShim,
   elementTimingIntegrationShim,
@@ -16,15 +16,13 @@ export { consoleLoggingIntegrationShim as consoleLoggingIntegration, loggerShim
 export {
   getActiveSpan,
   getRootSpan,
-  startSpan,
-  startInactiveSpan,
-  startSpanManual,
   startNewTrace,
   withActiveSpan,
   getSpanDescendants,
   setMeasurement,
   spanStreamingIntegration,
-} from '@sentry/core/browser';
+} from '@sentry/core';
+export { startSpan, startInactiveSpan, startSpanManual } from '@sentry/core/browser';
 
 export {
   browserTracingIntegration,

packages/browser/src/index.bundle.tracing.ts

@@ -1,4 +1,4 @@
-import { registerSpanErrorInstrumentation } from '@sentry/core/browser';
+import { registerSpanErrorInstrumentation } from '@sentry/core';
 import {
   consoleLoggingIntegrationShim,
   elementTimingIntegrationShim,
@@ -17,15 +17,13 @@ export { consoleLoggingIntegrationShim as consoleLoggingIntegration, loggerShim
 export {
   getActiveSpan,
   getRootSpan,
-  startSpan,
-  startInactiveSpan,
-  startSpanManual,
   startNewTrace,
   withActiveSpan,
   getSpanDescendants,
   setMeasurement,
   spanStreamingIntegration,
-} from '@sentry/core/browser';
+} from '@sentry/core';
+export { startSpan, startInactiveSpan, startSpanManual } from '@sentry/core/browser';
 
 export {
   browserTracingIntegration,