feat(core): split exports by browser/server for bundle size

dev-packages/e2e-tests/test-applications/react-router-6/tsconfig.json

@@ -10,7 +10,7 @@
  "forceConsistentCasingInFileNames": true,
  "noFallthroughCasesInSwitch": true,
  "module": "esnext",
- "moduleResolution": "node",
+ "moduleResolution": "bundler",
  "resolveJsonModule": true,
  "isolatedModules": true,
  "noEmit": true,

dev-packages/e2e-tests/test-applications/react-send-to-sentry/tsconfig.json

@@ -10,7 +10,7 @@
  "forceConsistentCasingInFileNames": true,
  "noFallthroughCasesInSwitch": true,
  "module": "esnext",
- "moduleResolution": "node",
+ "moduleResolution": "bundler",
  "resolveJsonModule": true,
  "isolatedModules": true,
  "noEmit": true,

dev-packages/rollup-utils/npmHelpers.mjs

@@ -21,7 +21,7 @@ import {
  makeSucrasePlugin,
 } from './plugins/index.mjs';
 import { makePackageNodeEsm } from './plugins/make-esm-plugin.mjs';
-import { mergePlugins } from './utils.mjs';
+import { mergeExternals, mergePlugins } from './utils.mjs';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
@@ -47,6 +47,13 @@ export function makeBaseNPMConfig(options = {}) {
  excludeIframe: undefined,
  });
 
+ const deps = [
+ ...builtinModules.filter(m => !bundledBuiltins.includes(m)),
+ ...Object.keys(packageDotJSON.dependencies || {}),
+ ...Object.keys(packageDotJSON.peerDependencies || {}),
+ ...Object.keys(packageDotJSON.optionalDependencies || {}),
+ ];
+
  const defaultBaseConfig = {
  input: entrypoints,
 
@@ -100,17 +107,20 @@ export function makeBaseNPMConfig(options = {}) {
  plugins: [nodeResolvePlugin, sucrasePlugin, debugBuildStatementReplacePlugin, rrwebBuildPlugin, cleanupPlugin],
 
  // don't include imported modules from outside the package in the final output
- external: [
- ...builtinModules.filter(m => !bundledBuiltins.includes(m)),
- ...Object.keys(packageDotJSON.dependencies || {}),
- ...Object.keys(packageDotJSON.peerDependencies || {}),
- ...Object.keys(packageDotJSON.optionalDependencies || {}),
- ],
+ // also treat subpath exports (e.g. `@sentry/core/browser`) as external
+ external: id => {
+ // treat subpath exports as external if the package is external
+ return deps.some(dep => id === dep || id.startsWith(`${dep}/`));
+ },
  };
 
  return deepMerge(defaultBaseConfig, packageSpecificConfig, {
  // Plugins have to be in the correct order or everything breaks, so when merging we have to manually re-order them
- customMerge: key => (key === 'plugins' ? mergePlugins : undefined),
+ customMerge: key => {
+ if (key === 'plugins') return mergePlugins;
+ if (key === 'external') return mergeExternals;
+ return undefined;
+ },
  });
 }
 

dev-packages/rollup-utils/utils.mjs

@@ -10,6 +10,25 @@ export const insertAt = (arr, index, ...insertees) => {
  return newArr;
 };
 
+/**
+ * Turn a list of module IDs into a test function
+ * Includes submodule exports by checking that it starts with the name
+ * plus a / character. The list would contain something like `'@sentry/core'`
+ * and we might test it against a module id like `'@sentry/core/browser'`
+ */
+const toFilterFunction = list => (Array.isArray(list) ? id => list.some(test => filterTest(test, id)) : list);
+
+const filterTest = (test, id) => (test instanceof RegExp ? test.test(id) : id === test || id.startsWith(`${test}/`));
+
+/**
+ * Merge two external configs (function or array), returning a function that handles both.
+ */
+export function mergeExternals(base, specific) {
+ const baseFn = toFilterFunction(base);
+ const specificFn = toFilterFunction(specific);
+ return id => baseFn(id) || specificFn(id);
+}
+
 /**
  * Merge two arrays of plugins, making sure they're sorted in the correct order.
  */

packages/astro/tsconfig.json

@@ -4,6 +4,7 @@
  "include": ["src/**/*"],
 
  "compilerOptions": {
+ "moduleResolution": "bundler"
  // package-specific options
  }
 }

packages/browser/src/client.ts

@@ -8,15 +8,15 @@ import type {
  ParameterizedString,
  Scope,
  SeverityLevel,
-} from '@sentry/core';
+} from '@sentry/core/browser';
 import {
  _INTERNAL_flushLogsBuffer,
  _INTERNAL_flushMetricsBuffer,
  addAutoIpAddressToSession,
  applySdkMetadata,
  Client,
  getSDKSource,
-} from '@sentry/core';
+} from '@sentry/core/browser';
 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';
+import { getClient, suppressTracing } from '@sentry/core/browser';
 
 /**
  * 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';
+} from '@sentry/core/browser';
 import {
  _INTERNAL_enhanceErrorWithSentryInfo,
  addExceptionMechanism,
@@ -22,7 +22,7 @@ import {
  isPlainObject,
  normalizeToSize,
  resolvedSyncPromise,
-} from '@sentry/core';
+} from '@sentry/core/browser';
 
 type Prototype = { constructor: (...args: unknown[]) => unknown };
 

packages/browser/src/exports.ts

@@ -20,7 +20,7 @@ export type {
  ExclusiveEventHintOrCaptureContext,
  Log,
  LogSeverityLevel,
-} from '@sentry/core';
+} from '@sentry/core/browser';
 
 export type { BrowserOptions } from './client';
 
@@ -72,14 +72,14 @@ export {
  updateSpanName,
  withStreamedSpan,
  metrics,
-} from '@sentry/core';
+} from '@sentry/core/browser';
 
 export {
  SEMANTIC_ATTRIBUTE_SENTRY_OP,
  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
  SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
-} from '@sentry/core';
+} from '@sentry/core/browser';
 
 export { WINDOW } from './helpers';
 export { BrowserClient } from './client';

packages/browser/src/feedbackAsync.ts

@@ -5,6 +5,6 @@ import { lazyLoadIntegration } from './utils/lazyLoadIntegration';
  * An integration to add user feedback to your application,
  * while loading most of the code lazily only when it's needed.
  */
-export const feedbackAsyncIntegration = buildFeedbackIntegration({
+export const feedbackAsyncIntegration: ReturnType<typeof buildFeedbackIntegration> = buildFeedbackIntegration({
  lazyLoadIntegration,
 });

packages/browser/src/feedbackSync.ts

@@ -5,7 +5,7 @@ import {
 } from '@sentry-internal/feedback';
 
 /** Add a widget to capture user feedback to your application. */
-export const feedbackSyncIntegration = buildFeedbackIntegration({
+export const feedbackSyncIntegration: ReturnType<typeof buildFeedbackIntegration> = buildFeedbackIntegration({
  getModalIntegration: () => feedbackModalIntegration,
  getScreenshotIntegration: () => feedbackScreenshotIntegration,
 });

packages/browser/src/helpers.ts

@@ -1,4 +1,4 @@
-import type { Mechanism, WrappedFunction } from '@sentry/core';
+import type { Mechanism, WrappedFunction } from '@sentry/core/browser';
 import {
  addExceptionMechanism,
  addExceptionTypeValue,
@@ -9,7 +9,7 @@ import {
  GLOBAL_OBJ,
  markFunctionWrapped,
  withScope,
-} from '@sentry/core';
+} from '@sentry/core/browser';
 
 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';
 
 // TODO(v11): Export metrics here once we remove it from the base bundle.
-export { logger, consoleLoggingIntegration } from '@sentry/core';
+export { logger, consoleLoggingIntegration } from '@sentry/core/browser';
 
 export { elementTimingIntegration } from '@sentry-internal/browser-utils';
 

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

@@ -7,7 +7,7 @@ import {
 export * from './index.bundle.base';
 
 // TODO(v11): Export metrics here once we remove it from the base bundle.
-export { logger, consoleLoggingIntegration } from '@sentry/core';
+export { logger, consoleLoggingIntegration } from '@sentry/core/browser';
 
 export { replayIntegration, getReplay } from '@sentry-internal/replay';
 

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

@@ -1,12 +1,12 @@
-import { registerSpanErrorInstrumentation } from '@sentry/core';
+import { registerSpanErrorInstrumentation } from '@sentry/core/browser';
 import { feedbackIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims';
 
 registerSpanErrorInstrumentation();
 
 export * from './index.bundle.base';
 
 // TODO(v11): Export metrics here once we remove it from the base bundle.
-export { logger, consoleLoggingIntegration } from '@sentry/core';
+export { logger, consoleLoggingIntegration } from '@sentry/core/browser';
 
 export {
  getActiveSpan,
@@ -18,7 +18,7 @@ export {
  startSpan,
  startSpanManual,
  withActiveSpan,
-} from '@sentry/core';
+} from '@sentry/core/browser';
 
 export {
  browserTracingIntegration,

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

@@ -1,4 +1,4 @@
-import { registerSpanErrorInstrumentation } from '@sentry/core';
+import { registerSpanErrorInstrumentation } from '@sentry/core/browser';
 import { feedbackAsyncIntegration } from './feedbackAsync';
 
 registerSpanErrorInstrumentation();
@@ -18,7 +18,7 @@ export {
  withActiveSpan,
  logger,
  consoleLoggingIntegration,
-} from '@sentry/core';
+} from '@sentry/core/browser';
 
 export {
  browserTracingIntegration,

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

@@ -1,4 +1,4 @@
-import { registerSpanErrorInstrumentation } from '@sentry/core';
+import { registerSpanErrorInstrumentation } from '@sentry/core/browser';
 import {
  consoleLoggingIntegrationShim,
  elementTimingIntegrationShim,
@@ -23,7 +23,7 @@ export {
  withActiveSpan,
  getSpanDescendants,
  setMeasurement,
-} from '@sentry/core';
+} from '@sentry/core/browser';
 
 export {
  browserTracingIntegration,

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

@@ -1,12 +1,12 @@
-import { registerSpanErrorInstrumentation } from '@sentry/core';
+import { registerSpanErrorInstrumentation } from '@sentry/core/browser';
 import { feedbackIntegrationShim } from '@sentry-internal/integration-shims';
 
 registerSpanErrorInstrumentation();
 
 export * from './index.bundle.base';
 
 // TODO(v11): Export metrics here once we remove it from the base bundle.
-export { logger, consoleLoggingIntegration } from '@sentry/core';
+export { logger, consoleLoggingIntegration } from '@sentry/core/browser';
 
 export {
  getActiveSpan,
@@ -18,7 +18,7 @@ export {
  startSpan,
  startSpanManual,
  withActiveSpan,
-} from '@sentry/core';
+} from '@sentry/core/browser';
 
 export {
  browserTracingIntegration,

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

@@ -1,4 +1,4 @@
-import { registerSpanErrorInstrumentation } from '@sentry/core';
+import { registerSpanErrorInstrumentation } from '@sentry/core/browser';
 import {
  consoleLoggingIntegrationShim,
  elementTimingIntegrationShim,
@@ -23,7 +23,7 @@ export {
  withActiveSpan,
  getSpanDescendants,
  setMeasurement,
-} from '@sentry/core';
+} from '@sentry/core/browser';
 
 export {
  browserTracingIntegration,

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

@@ -1,4 +1,4 @@
-import { registerSpanErrorInstrumentation } from '@sentry/core';
+import { registerSpanErrorInstrumentation } from '@sentry/core/browser';
 import {
  consoleLoggingIntegrationShim,
  elementTimingIntegrationShim,
@@ -24,7 +24,7 @@ export {
  withActiveSpan,
  getSpanDescendants,
  setMeasurement,
-} from '@sentry/core';
+} from '@sentry/core/browser';
 
 export {
  browserTracingIntegration,

packages/browser/src/index.ts

@@ -15,7 +15,7 @@ export {
  rewriteFramesIntegration,
  consoleLoggingIntegration,
  createConsolaReporter,
-} from '@sentry/core';
+} from '@sentry/core/browser';
 
 export { replayIntegration, getReplay } from '@sentry-internal/replay';
 export type {
@@ -76,8 +76,8 @@ export {
  createLangChainCallbackHandler,
  instrumentLangChainEmbeddings,
  logger,
-} from '@sentry/core';
-export type { Span, FeatureFlagsIntegration } from '@sentry/core';
+} from '@sentry/core/browser';
+export type { Span, FeatureFlagsIntegration } from '@sentry/core/browser';
 export { makeBrowserOfflineTransport } from './transports/offline';
 export { browserProfilingIntegration } from './profiling/integration';
 export { spotlightBrowserIntegration } from './integrations/spotlight';

packages/browser/src/integrations-bundle/index.captureconsole.ts

@@ -1 +1 @@
-export { captureConsoleIntegration } from '@sentry/core';
+export { captureConsoleIntegration } from '@sentry/core/browser';

packages/browser/src/integrations-bundle/index.createlangchaincallbackhandler.ts

@@ -1 +1 @@
-export { createLangChainCallbackHandler } from '@sentry/core';
+export { createLangChainCallbackHandler } from '@sentry/core/browser';

packages/browser/src/integrations-bundle/index.dedupe.ts

@@ -1 +1 @@
-export { dedupeIntegration } from '@sentry/core';
+export { dedupeIntegration } from '@sentry/core/browser';

packages/browser/src/integrations-bundle/index.extraerrordata.ts

@@ -1 +1 @@
-export { extraErrorDataIntegration } from '@sentry/core';
+export { extraErrorDataIntegration } from '@sentry/core/browser';

packages/browser/src/integrations-bundle/index.feedback.ts

@@ -4,4 +4,4 @@ export { getFeedback } from '@sentry-internal/feedback';
 
 export { feedbackAsyncIntegration, feedbackAsyncIntegration as feedbackIntegration };
 
-export { captureFeedback } from '@sentry/core';
+export { captureFeedback } from '@sentry/core/browser';

packages/browser/src/integrations-bundle/index.instrumentanthropicaiclient.ts

@@ -1 +1 @@
-export { instrumentAnthropicAiClient } from '@sentry/core';
+export { instrumentAnthropicAiClient } from '@sentry/core/browser';

packages/browser/src/integrations-bundle/index.instrumentgooglegenaiclient.ts

@@ -1 +1 @@
-export { instrumentGoogleGenAIClient } from '@sentry/core';
+export { instrumentGoogleGenAIClient } from '@sentry/core/browser';

packages/browser/src/integrations-bundle/index.instrumentlangchainembeddings.ts

@@ -1 +1 @@
-export { instrumentLangChainEmbeddings } from '@sentry/core';
+export { instrumentLangChainEmbeddings } from '@sentry/core/browser';

packages/browser/src/integrations-bundle/index.instrumentlanggraph.ts

@@ -1 +1 @@
-export { instrumentLangGraph } from '@sentry/core';
+export { instrumentLangGraph } from '@sentry/core/browser';

packages/browser/src/integrations-bundle/index.instrumentopenaiclient.ts

@@ -1 +1 @@
-export { instrumentOpenAiClient } from '@sentry/core';
+export { instrumentOpenAiClient } from '@sentry/core/browser';

packages/browser/src/integrations-bundle/index.modulemetadata.ts

@@ -1 +1 @@
-export { moduleMetadataIntegration } from '@sentry/core';
+export { moduleMetadataIntegration } from '@sentry/core/browser';

packages/browser/src/integrations-bundle/index.rewriteframes.ts

@@ -1 +1 @@
-export { rewriteFramesIntegration } from '@sentry/core';
+export { rewriteFramesIntegration } from '@sentry/core/browser';