export browser integrations from core

Author: s1gr1d

packages/browser/rollup.bundle.config.mjs

@@ -8,6 +8,10 @@ if (targets.some(target => target !== 'es5' && target !== 'es6')) {
   throw new Error('JS_VERSION must be either "es5" or "es6"');
 }
 
+const addonIntegrationFiles = ['contextlines', 'httpclient', 'reportingobserver'];
+
+const coreIntegrationFiles = ['captureconsole', 'debug', 'dedupe', 'extraerrordata', 'rewriteframes', 'sessiontiming'];
+
 targets.forEach(jsVersion => {
   const baseBundleConfig = makeBaseBundleConfig({
     bundleType: 'standalone',
@@ -25,6 +29,30 @@ targets.forEach(jsVersion => {
     outputFileBase: () => `bundles/bundle.tracing${jsVersion === 'es5' ? '.es5' : ''}`,
   });
 
+  addonIntegrationFiles.forEach(integrationName => {
+    const integrationsBundleConfig = makeBaseBundleConfig({
+      bundleType: 'addon',
+      entrypoints: [`src/integrations/${integrationName}.ts`],
+      jsVersion,
+      licenseTitle: `@sentry/browser - ${integrationName}`,
+      outputFileBase: () => `bundles/${integrationName}${jsVersion === 'es5' ? '.es5' : ''}`,
+    });
+
+    builds.push(...makeBundleConfigVariants(integrationsBundleConfig));
+  });
+
+  coreIntegrationFiles.forEach(integrationName => {
+    const integrationsBundleConfig = makeBaseBundleConfig({
+      bundleType: 'addon',
+      entrypoints: [`src/integrations-bundle/index.${integrationName}.ts`],
+      jsVersion,
+      licenseTitle: `@sentry/browser - ${integrationName}`,
+      outputFileBase: () => `bundles/${integrationName}${jsVersion === 'es5' ? '.es5' : ''}`,
+    });
+
+    builds.push(...makeBundleConfigVariants(integrationsBundleConfig));
+  });
+
   builds.push(...makeBundleConfigVariants(baseBundleConfig), ...makeBundleConfigVariants(tracingBaseBundleConfig));
 });
 

packages/browser/src/exports.ts

@@ -108,11 +108,10 @@ export {
 } from './sdk';
 
 export { breadcrumbsIntegration } from './integrations/breadcrumbs';
-export { dedupeIntegration } from './integrations/dedupe';
 export { globalHandlersIntegration } from './integrations/globalhandlers';
 export { httpContextIntegration } from './integrations/httpcontext';
 export { linkedErrorsIntegration } from './integrations/linkederrors';
 export { browserApiErrorsIntegration } from './integrations/browserapierrors';
 
 // eslint-disable-next-line deprecation/deprecation
-export { Breadcrumbs, LinkedErrors, HttpContext, Dedupe } from './integrations';
+export { Breadcrumbs, LinkedErrors, HttpContext } from './integrations';

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

@@ -1,3 +1,5 @@
+import type { IntegrationFn } from '@sentry/types/src';
+
 export * from './exports';
 
 import { Integrations as CoreIntegrations } from '@sentry/core';
@@ -14,7 +16,7 @@ if (WINDOW.Sentry && WINDOW.Sentry.Integrations) {
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const INTEGRATIONS: Record<string, new (...args: any[]) => Integration> = {
+const INTEGRATIONS: Record<string, (new (...args: any[]) => Integration) | IntegrationFn> = {
   ...windowIntegrations,
   // eslint-disable-next-line deprecation/deprecation
   ...CoreIntegrations,

packages/browser/src/index.ts

@@ -23,6 +23,19 @@ const INTEGRATIONS = {
 // eslint-disable-next-line deprecation/deprecation
 export { INTEGRATIONS as Integrations };
 
+export { reportingObserverIntegration } from './integrations/reportingobserver';
+export { httpClientIntegration } from './integrations/httpclient';
+export { contextLinesIntegration } from './integrations/contextlines';
+
+export {
+  captureConsoleIntegration,
+  debugIntegration,
+  dedupeIntegration,
+  extraErrorDataIntegration,
+  rewriteFramesIntegration,
+  sessionTimingIntegration,
+} from '@sentry/core';
+
 export {
   // eslint-disable-next-line deprecation/deprecation
   Replay,

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

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

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

@@ -0,0 +1 @@
+export { debugIntegration } from '@sentry/core';

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

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

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

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

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

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

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

@@ -0,0 +1 @@
+export { sessionTimingIntegration } from '@sentry/core';

packages/integrations/src/contextlines.ts renamed to packages/browser/src/integrations/contextlines.ts

@@ -10,7 +10,7 @@ import {
   supportsNativeFetch,
 } from '@sentry/utils';
 
-import { DEBUG_BUILD } from './debug-build';
+import { DEBUG_BUILD } from '../debug-build';
 
 export type HttpStatusCodeRange = [number, number] | number;
 export type HttpRequestTarget = string | RegExp;

packages/browser/src/integrations/dedupe.ts

@@ -2,4 +2,3 @@
 export { Breadcrumbs } from './breadcrumbs';
 export { LinkedErrors } from './linkederrors';
 export { HttpContext } from './httpcontext';
-export { Dedupe } from './dedupe';

packages/integrations/src/httpclient.ts renamed to packages/browser/src/integrations/httpclient.ts

@@ -16,13 +16,13 @@ import {
   supportsFetch,
 } from '@sentry/utils';
 
+import { dedupeIntegration } from '@sentry/core';
 import type { BrowserClientOptions, BrowserOptions } from './client';
 import { BrowserClient } from './client';
 import { DEBUG_BUILD } from './debug-build';
 import { WINDOW, wrap as internalWrap } from './helpers';
 import { breadcrumbsIntegration } from './integrations/breadcrumbs';
 import { browserApiErrorsIntegration } from './integrations/browserapierrors';
-import { dedupeIntegration } from './integrations/dedupe';
 import { globalHandlersIntegration } from './integrations/globalhandlers';
 import { httpContextIntegration } from './integrations/httpcontext';
 import { linkedErrorsIntegration } from './integrations/linkederrors';

packages/browser/src/integrations/index.ts

@@ -11,7 +11,7 @@ import * as TracingBundle from '../../src/index.bundle';
 describe('index.bundle', () => {
   it('has correct exports', () => {
     Object.keys(TracingBundle.Integrations).forEach(key => {
-      expect((TracingBundle.Integrations[key] as any).id).toStrictEqual(expect.any(String));
+      expect((TracingBundle.Integrations[key] as any).name).toStrictEqual(expect.any(String));
     });
 
     expect(TracingBundle.Integrations.Replay).toBe(ReplayShim);

packages/integrations/src/reportingobserver.ts renamed to packages/browser/src/integrations/reportingobserver.ts

@@ -1,6 +1,6 @@
 import type { StackFrame } from '@sentry/types';
 
-import { applySourceContextToFrame } from '../src/contextlines';
+import { applySourceContextToFrame } from '../../../src/integrations/contextlines';
 
 const lines = ['line1', 'line2', 'line3', 'line4', 'line5', 'line6', 'line7', 'line8', 'line9'];
 describe('ContextLines', () => {

packages/browser/src/sdk.ts

@@ -1,7 +1,7 @@
 import * as SentryCore from '@sentry/core';
 import type { Client } from '@sentry/types';
 
-import { reportingObserverIntegration } from '../src/reportingobserver';
+import { reportingObserverIntegration } from '../../../src/integrations/reportingobserver';
 
 const mockScope = {
   setExtra: jest.fn(),