merge integrations into core

s1gr1d · s1gr1d · commit d05c14ee2fe6 · 2024-02-23T14:29:58.000+01:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -424,6 +424,7 @@ jobs:
           name: ${{ github.sha }}
           path: |
             ${{ github.workspace }}/packages/browser/build/bundles/**
+            ${{ github.workspace }}/packages/core/build/bundles/**
             ${{ github.workspace }}/packages/integrations/build/bundles/**
             ${{ github.workspace }}/packages/replay/build/bundles/**
             ${{ github.workspace }}/packages/replay-canvas/build/bundles/**
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -15,13 +15,13 @@
     "types",
     "types-ts3.8"
   ],
-  "main": "build/cjs/index.js",
-  "module": "build/esm/index.js",
-  "types": "build/types/index.d.ts",
+  "main": "build/npm/cjs/index.js",
+  "module": "build/npm/esm/index.js",
+  "types": "build/npm/types/index.d.ts",
   "typesVersions": {
     "<4.9": {
-      "build/types/index.d.ts": [
-        "build/types-ts3.8/index.d.ts"
+      "build/npm/types/index.d.ts": [
+        "build/npm/types-ts3.8/index.d.ts"
       ]
     }
   },
@@ -33,25 +33,28 @@
     "@sentry/utils": "7.100.0"
   },
   "scripts": {
-    "build": "run-p build:transpile build:types",
+    "build": "run-p build:transpile build:types build:bundle",
+    "build:bundle": "run-p build:bundle:es5 build:bundle:es6",
+    "build:bundle:es5": "JS_VERSION=es5 rollup -c rollup.bundle.config.mjs",
+    "build:bundle:es6": "JS_VERSION=es6 rollup -c rollup.bundle.config.mjs",
     "build:dev": "yarn build",
     "build:transpile": "rollup -c rollup.npm.config.mjs",
     "build:types": "run-s build:types:core build:types:downlevel",
     "build:types:core": "tsc -p tsconfig.types.json",
-    "build:types:downlevel": "yarn downlevel-dts build/types build/types-ts3.8 --to ts3.8",
+    "build:types:downlevel": "yarn downlevel-dts build/npm/types build/npm/types-ts3.8 --to ts3.8",
     "build:watch": "run-p build:transpile:watch build:types:watch",
     "build:dev:watch": "yarn build:watch",
     "build:transpile:watch": "rollup -c rollup.npm.config.mjs --watch",
     "build:types:watch": "tsc -p tsconfig.types.json --watch",
-    "build:tarball": "ts-node ../../scripts/prepack.ts && npm pack ./build",
+    "build:tarball": "ts-node ../../scripts/prepack.ts --bundles && npm pack ./build/npm",
     "circularDepCheck": "madge --circular src/index.ts",
     "clean": "rimraf build coverage sentry-core-*.tgz",
     "fix": "eslint . --format stylish --fix",
     "lint": "eslint . --format stylish",
     "test": "jest",
     "test:watch": "jest --watch",
     "version": "node ../../scripts/versionbump.js src/version.ts",
-    "yalc:publish": "ts-node ../../scripts/prepack.ts && yalc publish build --push --sig"
+    "yalc:publish": "ts-node ../../scripts/prepack.ts --bundles && yalc publish build/npm --push --sig"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/packages/core/rollup.bundle.config.mjs b/packages/core/rollup.bundle.config.mjs
@@ -0,0 +1,29 @@
+import { makeBaseBundleConfig, makeBundleConfigVariants } from '@sentry-internal/rollup-utils';
+
+const builds = [];
+
+const targets = process.env.JS_VERSION ? [process.env.JS_VERSION] : ['es5', 'es6'];
+
+if (targets.some(target => target !== 'es5' && target !== 'es6')) {
+  throw new Error('JS_VERSION must be either "es5" or "es6"');
+}
+
+const addonIntegrationFiles = ['captureconsole.ts', 'debug.ts', 'dedupe.ts', 'extraerrordata.ts', 'rewriteframes.ts', 'sessiontiming.ts']
+
+targets.forEach(jsVersion => {
+  addonIntegrationFiles.forEach(integrationFile => {
+    const integrationName = integrationFile.split('.')[0]
+
+    const integrationsBundleConfig = makeBaseBundleConfig({
+      bundleType: 'addon',
+      entrypoints: [`src/integrations/${integrationFile}`],
+      jsVersion,
+      licenseTitle: `@sentry/browser - ${integrationName}`,
+      outputFileBase: () => `bundles/${integrationName}${jsVersion === 'es5' ? '.es5' : ''}`,
+    });
+
+    builds.push(...makeBundleConfigVariants(integrationsBundleConfig))
+  })
+});
+
+export default builds;
diff --git a/packages/core/rollup.npm.config.mjs b/packages/core/rollup.npm.config.mjs
@@ -1,3 +1,3 @@
 import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils';
 
-export default makeNPMConfigVariants(makeBaseNPMConfig());
+export default makeNPMConfigVariants(makeBaseNPMConfig({ hasBundles: true }));
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -108,6 +108,12 @@ export { inboundFiltersIntegration } from './integrations/inboundfilters';
 export { linkedErrorsIntegration } from './integrations/linkederrors';
 export { moduleMetadataIntegration } from './integrations/metadata';
 export { requestDataIntegration } from './integrations/requestdata';
+export { captureConsoleIntegration } from './integrations/captureconsole';
+export { debugIntegration } from './integrations/debug';
+export { dedupeIntegration } from './integrations/dedupe';
+export { extraErrorDataIntegration } from './integrations/extraerrordata';
+export { rewriteFramesIntegration } from './integrations/rewriteframes';
+export { sessionTimingIntegration } from './integrations/sessiontiming';
 export { metrics } from './metrics/exports';
 export type { MetricData } from './metrics/exports';
 export { metricsDefault } from './metrics/exports-default';
diff --git a/packages/core/src/integrations/captureconsole.ts b/packages/core/src/integrations/captureconsole.ts
@@ -1,4 +1,6 @@
-import { captureException, captureMessage, defineIntegration, getClient, withScope } from '@sentry/core';
+import { defineIntegration } from '../integration';
+import { captureException, captureMessage } from '../exports';
+import { getClient, withScope } from '../currentScopes';
 import type { CaptureContext, IntegrationFn } from '@sentry/types';
 import {
   CONSOLE_LEVELS,
diff --git a/packages/core/src/integrations/debug.ts b/packages/core/src/integrations/debug.ts
@@ -1,4 +1,4 @@
-import { defineIntegration } from '@sentry/core';
+import { defineIntegration } from '../integration';
 import type { Event, EventHint, IntegrationFn } from '@sentry/types';
 import { consoleSandbox } from '@sentry/utils';
 
diff --git a/packages/core/src/integrations/dedupe.ts b/packages/core/src/integrations/dedupe.ts
@@ -1,8 +1,8 @@
-import { defineIntegration } from '@sentry/core';
+import { defineIntegration } from '../integration';
 import type { Event, Exception, IntegrationFn, StackFrame } from '@sentry/types';
 import { logger } from '@sentry/utils';
 
-import { DEBUG_BUILD } from './debug-build';
+import { DEBUG_BUILD } from '../debug-build';
 
 const INTEGRATION_NAME = 'Dedupe';
 
diff --git a/packages/core/src/integrations/extraerrordata.ts b/packages/core/src/integrations/extraerrordata.ts
@@ -1,8 +1,8 @@
-import { defineIntegration } from '@sentry/core';
+import { defineIntegration } from '../integration';
 import type { Contexts, Event, EventHint, ExtendedError, IntegrationFn } from '@sentry/types';
 import { addNonEnumerableProperty, isError, isPlainObject, logger, normalize } from '@sentry/utils';
 
-import { DEBUG_BUILD } from './debug-build';
+import { DEBUG_BUILD } from '../debug-build';
 
 const INTEGRATION_NAME = 'ExtraErrorData';
 
diff --git a/packages/core/src/integrations/rewriteframes.ts b/packages/core/src/integrations/rewriteframes.ts
@@ -1,4 +1,4 @@
-import { defineIntegration } from '@sentry/core';
+import { defineIntegration } from '../integration';
 import type { Event, IntegrationFn, StackFrame, Stacktrace } from '@sentry/types';
 import { basename, relative } from '@sentry/utils';
 
diff --git a/packages/core/src/integrations/sessiontiming.ts b/packages/core/src/integrations/sessiontiming.ts
@@ -1,4 +1,4 @@
-import { defineIntegration } from '@sentry/core';
+import { defineIntegration } from '../integration';
 import type { IntegrationFn } from '@sentry/types';
 
 const INTEGRATION_NAME = 'SessionTiming';
diff --git a/packages/core/test/lib/integrations/captureconsole.test.ts b/packages/core/test/lib/integrations/captureconsole.test.ts
@@ -1,16 +1,11 @@
 /* eslint-disable @typescript-eslint/unbound-method */
 
-import * as SentryCore from '@sentry/core';
 import type { Client, ConsoleLevel, Event } from '@sentry/types';
-import {
-  CONSOLE_LEVELS,
-  GLOBAL_OBJ,
-  addConsoleInstrumentationHandler,
-  originalConsoleMethods,
-  resetInstrumentationHandlers,
-} from '@sentry/utils';
+import { CONSOLE_LEVELS, GLOBAL_OBJ, originalConsoleMethods, resetInstrumentationHandlers } from '@sentry/utils';
+import * as CurrentScopes from '../../../src/currentscopes';
+import * as SentryCore from '../../../src/exports';
 
-import { captureConsoleIntegration } from '../src/captureconsole';
+import { captureConsoleIntegration } from '../../../src/integrations/captureconsole';
 
 const mockConsole: { [key in ConsoleLevel]: jest.Mock<any> } = {
   debug: jest.fn(),
@@ -24,7 +19,7 @@ const mockConsole: { [key in ConsoleLevel]: jest.Mock<any> } = {
 
 describe('CaptureConsole setup', () => {
   // Ensure we've initialized the instrumentation so we can get the original one
-  addConsoleInstrumentationHandler(() => {});
+  // addConsoleInstrumentationHandler(() => {});
   const _originalConsoleMethods = Object.assign({}, originalConsoleMethods);
 
   let mockClient: Client;
@@ -45,8 +40,8 @@ describe('CaptureConsole setup', () => {
 
     jest.spyOn(SentryCore, 'captureMessage').mockImplementation(captureMessage);
     jest.spyOn(SentryCore, 'captureException').mockImplementation(captureException);
-    jest.spyOn(SentryCore, 'getClient').mockImplementation(() => mockClient);
-    jest.spyOn(SentryCore, 'withScope').mockImplementation(withScope);
+    jest.spyOn(CurrentScopes, 'getClient').mockImplementation(() => mockClient);
+    jest.spyOn(CurrentScopes, 'withScope').mockImplementation(withScope);
 
     CONSOLE_LEVELS.forEach(key => {
       originalConsoleMethods[key] = mockConsole[key];
diff --git a/packages/core/test/lib/integrations/debug.test.ts b/packages/core/test/lib/integrations/debug.test.ts
@@ -1,6 +1,6 @@
 import type { Client, Event, EventHint } from '@sentry/types';
 
-import { debugIntegration } from '../src/debug';
+import { debugIntegration } from '../../../src/integrations/debug';
 
 function testEventLogged(
   integration: ReturnType<typeof debugIntegration>,
diff --git a/packages/core/test/lib/integrations/dedupe.test.ts b/packages/core/test/lib/integrations/dedupe.test.ts
@@ -1,6 +1,6 @@
 import type { Event as SentryEvent, Exception, StackFrame, Stacktrace } from '@sentry/types';
 
-import { _shouldDropEvent, dedupeIntegration } from '../src/dedupe';
+import { _shouldDropEvent, dedupeIntegration } from '../../../src/integrations/dedupe';
 
 type EventWithException = SentryEvent & {
   exception: {
diff --git a/packages/core/test/lib/integrations/extraerrordata.test.ts b/packages/core/test/lib/integrations/extraerrordata.test.ts
@@ -1,6 +1,6 @@
 import type { Event as SentryEvent, ExtendedError } from '@sentry/types';
 
-import { extraErrorDataIntegration } from '../src/extraerrordata';
+import { extraErrorDataIntegration } from '../../../src/integrations/extraerrordata';
 
 const extraErrorData = extraErrorDataIntegration();
 let event: SentryEvent;
diff --git a/packages/core/test/lib/integrations/rewriteframes.test.ts b/packages/core/test/lib/integrations/rewriteframes.test.ts
@@ -1,6 +1,6 @@
 import type { Event, StackFrame } from '@sentry/types';
 
-import { rewriteFramesIntegration } from '../src/rewriteframes';
+import { rewriteFramesIntegration } from '../../../src/integrations/rewriteframes';
 
 let rewriteFrames: ReturnType<typeof rewriteFramesIntegration>;
 let exceptionEvent: Event;
diff --git a/packages/core/test/lib/integrations/sessiontiming.test.ts b/packages/core/test/lib/integrations/sessiontiming.test.ts
@@ -1,5 +1,5 @@
 import type { Event } from '@sentry/types';
-import { sessionTimingIntegration } from '../src/sessiontiming';
+import { sessionTimingIntegration } from '../../../src/integrations/sessiontiming';
 
 const sessionTiming = sessionTimingIntegration();
 
diff --git a/packages/core/tsconfig.types.json b/packages/core/tsconfig.types.json
@@ -5,6 +5,6 @@
     "declaration": true,
     "declarationMap": true,
     "emitDeclarationOnly": true,
-    "outDir": "build/types"
+    "outDir": "build/npm/types"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils';`
`2`	`2`
`3`		`-export default makeNPMConfigVariants(makeBaseNPMConfig());`
	`3`	`+export default makeNPMConfigVariants(makeBaseNPMConfig({ hasBundles: true }));`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { defineIntegration } from '@sentry/core';`
	`1`	`+import { defineIntegration } from '../integration';`
`2`	`2`	`import type { Event, EventHint, IntegrationFn } from '@sentry/types';`
`3`	`3`	`import { consoleSandbox } from '@sentry/utils';`
`4`	`4`