delete sentry/integration deps

s1gr1d · s1gr1d · commit aeb4922ad808 · 2024-02-26T13:33:57.000+01:00
diff --git a/.craft.yml b/.craft.yml
@@ -70,9 +70,6 @@ targets:
   - name: npm
     id: '@sentry/wasm'
     includeNames: /^sentry-wasm-\d.*\.tgz$/
-  - name: npm
-    id: '@sentry/integrations'
-    includeNames: /^sentry-integrations-\d.*\.tgz$/
 
   ## 4. WinterCG Packages
   - name: npm
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -101,7 +101,6 @@ jobs:
               - 'packages/tracing-internal/**'
               - 'packages/utils/**'
               - 'packages/types/**'
-              - 'packages/integrations/**'
             browser: &browser
               - *shared
               - 'packages/browser/**'
@@ -424,7 +423,6 @@ jobs:
           name: ${{ github.sha }}
           path: |
             ${{ github.workspace }}/packages/browser/build/bundles/**
-            ${{ github.workspace }}/packages/integrations/build/bundles/**
             ${{ github.workspace }}/packages/replay/build/bundles/**
             ${{ github.workspace }}/packages/replay-canvas/build/bundles/**
             ${{ github.workspace }}/packages/**/*.tgz
diff --git a/MIGRATION.md b/MIGRATION.md
@@ -112,6 +112,23 @@ Sentry SDK requires the fetch API to be available in the environment.
   [`error.cause`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error/cause) by
   default.
 
+## Integrations
+
+We moved optional integrations from their own package (`@sentry/integrations`) to `@sentry/browser` and `@sentry/node`.
+
+Integrations that are now exported from `@sentry/browser` :
+- httpClientIntegration
+- contextLinesIntegration
+- reportingObserverIntegration
+
+Integrations that are now exported from `@sentry/node` and `@sentry/browser` (or framework-specific packages like `@sentry/react`):
+- captureConsoleIntegration 
+- debugIntegration
+- dedupeIntegration
+- extraErrorDataIntegration
+- rewriteFramesIntegration
+- sessionTimingIntegration
+
 # Deprecations in 7.x
 
 You can use the **Experimental** [@sentry/migr8](https://www.npmjs.com/package/@sentry/migr8) to automatically update
diff --git a/README.md b/README.md
@@ -57,8 +57,6 @@ package. Please refer to the README and instructions of those SDKs for more deta
 - [`@sentry/gatsby`](https://github.com/getsentry/sentry-javascript/tree/master/packages/gatsby): SDK for Gatsby
 - [`@sentry/nextjs`](https://github.com/getsentry/sentry-javascript/tree/master/packages/nextjs): SDK for Next.js
 - [`@sentry/remix`](https://github.com/getsentry/sentry-javascript/tree/master/packages/remix): SDK for Remix
-- [`@sentry/integrations`](https://github.com/getsentry/sentry-javascript/tree/master/packages/integrations): Pluggable
-  integrations that can be used to enhance JS SDKs
 - [`@sentry/serverless`](https://github.com/getsentry/sentry-javascript/tree/master/packages/serverless): SDK for
   Serverless Platforms (AWS, GCP)
 - [`@sentry/electron`](https://github.com/getsentry/sentry-electron): SDK for Electron with support for native crashes
diff --git a/dev-packages/browser-integration-tests/suites/integrations/ContextLines/init.js b/dev-packages/browser-integration-tests/suites/integrations/ContextLines/init.js
@@ -1,9 +1,8 @@
 import * as Sentry from '@sentry/browser';
-import { contextLinesIntegration } from '@sentry/integrations';
 
 window.Sentry = Sentry;
 
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
-  integrations: [contextLinesIntegration()],
+  integrations: [Sentry.contextLinesIntegration()],
 });
diff --git a/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/init.js b/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/init.js
@@ -1,11 +1,10 @@
 import * as Sentry from '@sentry/browser';
-import { httpClientIntegration } from '@sentry/integrations';
 
 window.Sentry = Sentry;
 
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
-  integrations: [httpClientIntegration()],
+  integrations: [Sentry.httpClientIntegration()],
   tracesSampleRate: 1,
   sendDefaultPii: true,
 });
diff --git a/dev-packages/browser-integration-tests/suites/integrations/httpclient/httpClientIntegration/init.js b/dev-packages/browser-integration-tests/suites/integrations/httpclient/httpClientIntegration/init.js
@@ -1,11 +1,10 @@
 import * as Sentry from '@sentry/browser';
-import { httpClientIntegration } from '@sentry/integrations';
 
 window.Sentry = Sentry;
 
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
-  integrations: [httpClientIntegration()],
+  integrations: [Sentry.httpClientIntegration()],
   tracesSampleRate: 1,
   sendDefaultPii: true,
 });
diff --git a/dev-packages/browser-integration-tests/suites/integrations/httpclient/init.js b/dev-packages/browser-integration-tests/suites/integrations/httpclient/init.js
@@ -1,11 +1,10 @@
 import * as Sentry from '@sentry/browser';
-import { httpClientIntegration } from '@sentry/integrations';
 
 window.Sentry = Sentry;
 
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
-  integrations: [httpClientIntegration()],
+  integrations: [Sentry.httpClientIntegration()],
   tracesSampleRate: 1,
   sendDefaultPii: true,
 });
diff --git a/dev-packages/browser-integration-tests/utils/generatePlugin.ts b/dev-packages/browser-integration-tests/utils/generatePlugin.ts
@@ -169,7 +169,6 @@ class SentryScenarioGenerationPlugin {
           // To help Webpack resolve Sentry modules in `import` statements in cases where they're provided in bundles rather than in `node_modules`
           '@sentry/browser': 'Sentry',
           '@sentry/replay': 'Sentry',
-          '@sentry/integrations': 'Sentry',
           '@sentry/wasm': 'Sentry',
         }
       : {};
diff --git a/dev-packages/e2e-tests/test-applications/generic-ts3.8/index.ts b/dev-packages/e2e-tests/test-applications/generic-ts3.8/index.ts
@@ -3,8 +3,6 @@ import * as _SentryBrowser from '@sentry/browser';
 // biome-ignore lint/nursery/noUnusedImports:
 import * as _SentryCore from '@sentry/core';
 // biome-ignore lint/nursery/noUnusedImports:
-import * as _SentryIntegrations from '@sentry/integrations';
-// biome-ignore lint/nursery/noUnusedImports:
 import * as _SentryNode from '@sentry/node';
 // biome-ignore lint/nursery/noUnusedImports:
 import * as _SentryOpentelemetry from '@sentry/opentelemetry-node';
diff --git a/dev-packages/e2e-tests/test-applications/generic-ts3.8/package.json b/dev-packages/e2e-tests/test-applications/generic-ts3.8/package.json
@@ -15,7 +15,6 @@
   "dependencies": {
     "@sentry/browser": "latest || *",
     "@sentry/core": "latest || *",
-    "@sentry/integrations": "latest || *",
     "@sentry/node": "latest || *",
     "@sentry/opentelemetry-node": "latest || *",
     "@sentry/replay": "latest || *",
diff --git a/dev-packages/e2e-tests/test-applications/node-express-app/package.json b/dev-packages/e2e-tests/test-applications/node-express-app/package.json
@@ -11,7 +11,6 @@
     "test:assert": "pnpm test"
   },
   "dependencies": {
-    "@sentry/integrations": "latest || *",
     "@sentry/node": "latest || *",
     "@sentry/types": "latest || *",
     "express": "4.18.2",
diff --git a/dev-packages/e2e-tests/test-applications/node-express-app/src/app.ts b/dev-packages/e2e-tests/test-applications/node-express-app/src/app.ts
@@ -1,4 +1,3 @@
-import { httpClientIntegration } from '@sentry/integrations';
 import * as Sentry from '@sentry/node';
 import express from 'express';
 
@@ -12,7 +11,6 @@ Sentry.init({
   environment: 'qa', // dynamic sampling bias to keep transactions
   dsn: process.env.E2E_TEST_DSN,
   includeLocalVariables: true,
-  integrations: [httpClientIntegration()],
   debug: true,
   tunnel: `http://localhost:3031/`, // proxy server
   tracesSampleRate: 1,
diff --git a/dev-packages/e2e-tests/test-applications/node-hapi-app/package.json b/dev-packages/e2e-tests/test-applications/node-hapi-app/package.json
@@ -12,7 +12,6 @@
   },
   "dependencies": {
     "@hapi/hapi": "21.3.2",
-    "@sentry/integrations": "latest || *",
     "@sentry/node": "latest || *",
     "@sentry/types": "latest || *",
     "@types/node": "18.15.1",
diff --git a/dev-packages/e2e-tests/verdaccio-config/config.yaml b/dev-packages/e2e-tests/verdaccio-config/config.yaml
@@ -86,12 +86,6 @@ packages:
     unpublish: $all
     # proxy: npmjs # Don't proxy for E2E tests!
 
-  '@sentry/integrations':
-    access: $all
-    publish: $all
-    unpublish: $all
-    # proxy: npmjs # Don't proxy for E2E tests!
-
   '@sentry/nextjs':
     access: $all
     publish: $all
diff --git a/dev-packages/rollup-utils/bundleHelpers.mjs b/dev-packages/rollup-utils/bundleHelpers.mjs
@@ -59,7 +59,7 @@ export function makeBaseBundleConfig(options) {
     plugins: [rrwebBuildPlugin, markAsBrowserBuildPlugin],
   };
 
-  // used by `@sentry/integrations` and `@sentry/wasm` (bundles which need to be combined with a stand-alone SDK bundle)
+  // used by `@sentry/wasm` (bundles which need to be combined with a stand-alone SDK bundle)
   const addOnBundleConfig = {
     // These output settings are designed to mimic an IIFE. We don't use Rollup's `iife` format because we don't want to
     // attach this code to a new global variable, but rather inject it into the existing SDK's `Integrations` object.
diff --git a/package.json b/package.json
@@ -57,7 +57,6 @@
     "packages/eslint-plugin-sdk",
     "packages/feedback",
     "packages/gatsby",
-    "packages/integrations",
     "packages/integration-shims",
     "packages/nextjs",
     "packages/node",
diff --git a/packages/astro/src/index.types.ts b/packages/astro/src/index.types.ts
@@ -18,6 +18,7 @@ export declare function init(options: Options | clientSdk.BrowserOptions | serve
 export declare const Integrations: typeof serverSdk.Integrations;
 
 export declare const linkedErrorsIntegration: typeof clientSdk.linkedErrorsIntegration;
+export declare const contextLinesIntegration: typeof clientSdk.contextLinesIntegration;
 
 export declare const getDefaultIntegrations: (options: Options) => Integration[];
 export declare const defaultStackParser: StackParser;
diff --git a/packages/core/src/integrations/requestdata.ts b/packages/core/src/integrations/requestdata.ts
@@ -130,7 +130,7 @@ const _requestDataIntegration = ((options: RequestDataIntegrationOptions = {}) =
 export const requestDataIntegration = defineIntegration(_requestDataIntegration);
 
 /**
- * Add data about a request to an event. Primarily for use in Node-based SDKs, but included in `@sentry/integrations`
+ * Add data about a request to an event. Primarily for use in Node-based SDKs, but included in `@sentry/core`
  * so it can be used in cross-platform SDKs like `@sentry/nextjs`.
  * @deprecated Use `requestDataIntegration()` instead.
  */
diff --git a/packages/core/test/lib/integrations/captureconsole.test.ts b/packages/core/test/lib/integrations/captureconsole.test.ts
@@ -1,7 +1,13 @@
 /* eslint-disable @typescript-eslint/unbound-method */
 
 import type { Client, ConsoleLevel, Event } from '@sentry/types';
-import { CONSOLE_LEVELS, GLOBAL_OBJ, originalConsoleMethods, resetInstrumentationHandlers } from '@sentry/utils';
+import {
+  CONSOLE_LEVELS,
+  GLOBAL_OBJ,
+  addConsoleInstrumentationHandler,
+  originalConsoleMethods,
+  resetInstrumentationHandlers,
+} from '@sentry/utils';
 import * as CurrentScopes from '../../../src/currentscopes';
 import * as SentryCore from '../../../src/exports';
 
@@ -19,7 +25,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;
diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json
@@ -26,7 +26,6 @@
   "dependencies": {
     "@rollup/plugin-commonjs": "24.0.0",
     "@sentry/core": "7.100.0",
-    "@sentry/integrations": "7.100.0",
     "@sentry/node-experimental": "7.100.0",
     "@sentry/react": "7.100.0",
     "@sentry/types": "7.100.0",
diff --git a/packages/nextjs/src/client/clientNormalizationIntegration.ts b/packages/nextjs/src/client/clientNormalizationIntegration.ts
@@ -1,5 +1,5 @@
+import { rewriteFramesIntegration } from '@sentry/browser';
 import { defineIntegration } from '@sentry/core';
-import { rewriteFramesIntegration } from '@sentry/integrations';
 
 export const nextjsClientStackFrameNormalizationIntegration = defineIntegration(
   ({ assetPrefixPath }: { assetPrefixPath: string }) => {
diff --git a/packages/nextjs/src/edge/distDirRewriteFramesIntegration.ts b/packages/nextjs/src/edge/distDirRewriteFramesIntegration.ts
@@ -1,5 +1,4 @@
-import { defineIntegration } from '@sentry/core';
-import { rewriteFramesIntegration } from '@sentry/integrations';
+import { defineIntegration, rewriteFramesIntegration } from '@sentry/core';
 import { escapeStringForRegex } from '@sentry/utils';
 
 export const distDirRewriteFramesIntegration = defineIntegration(({ distDirName }: { distDirName: string }) => {
diff --git a/packages/nextjs/src/edge/rewriteFramesIntegration.ts b/packages/nextjs/src/edge/rewriteFramesIntegration.ts
@@ -1,5 +1,4 @@
-import { defineIntegration } from '@sentry/core';
-import { rewriteFramesIntegration as originalRewriteFramesIntegration } from '@sentry/integrations';
+import { defineIntegration, rewriteFramesIntegration as originalRewriteFramesIntegration } from '@sentry/core';
 import type { IntegrationFn, StackFrame } from '@sentry/types';
 import { GLOBAL_OBJ, escapeStringForRegex } from '@sentry/utils';
 
diff --git a/packages/nextjs/src/index.types.ts b/packages/nextjs/src/index.types.ts
@@ -22,6 +22,7 @@ export declare function init(
 export declare const Integrations: undefined; // TODO(v8): Remove this line. Can only be done when dependencies don't export `Integrations` anymore.
 
 export declare const linkedErrorsIntegration: typeof clientSdk.linkedErrorsIntegration;
+export declare const contextLinesIntegration: typeof clientSdk.contextLinesIntegration;
 
 export declare const getDefaultIntegrations: (options: Options) => Integration[];
 export declare const defaultStackParser: StackParser;
diff --git a/packages/nextjs/src/server/distDirRewriteFramesIntegration.ts b/packages/nextjs/src/server/distDirRewriteFramesIntegration.ts
@@ -1,6 +1,5 @@
 import * as path from 'path';
-import { defineIntegration } from '@sentry/core';
-import { rewriteFramesIntegration } from '@sentry/integrations';
+import { defineIntegration, rewriteFramesIntegration } from '@sentry/core';
 import { escapeStringForRegex } from '@sentry/utils';
 
 export const distDirRewriteFramesIntegration = defineIntegration(({ distDirName }: { distDirName: string }) => {
diff --git a/packages/nextjs/src/server/rewriteFramesIntegration.ts b/packages/nextjs/src/server/rewriteFramesIntegration.ts
@@ -1,6 +1,5 @@
 import * as path from 'path';
-import { defineIntegration } from '@sentry/core';
-import { rewriteFramesIntegration as originalRewriteFramesIntegration } from '@sentry/integrations';
+import { defineIntegration, rewriteFramesIntegration as originalRewriteFramesIntegration } from '@sentry/core';
 import type { IntegrationFn, StackFrame } from '@sentry/types';
 import { escapeStringForRegex } from '@sentry/utils';
 
diff --git a/packages/nextjs/test/integration/package.json b/packages/nextjs/test/integration/package.json
@@ -27,7 +27,6 @@
   "resolutions": {
     "@sentry/browser": "file:../../../browser",
     "@sentry/core": "file:../../../core",
-    "@sentry/integrations": "file:../../../integrations",
     "@sentry/node": "file:../../../node-experimental",
     "@sentry/node-experimental": "file:../../../node",
     "@sentry/react": "file:../../../react",
diff --git a/packages/node-experimental/src/index.ts b/packages/node-experimental/src/index.ts
@@ -84,6 +84,12 @@ export {
   captureException,
   captureEvent,
   captureMessage,
+  captureConsoleIntegration,
+  debugIntegration,
+  dedupeIntegration,
+  extraErrorDataIntegration,
+  rewriteFramesIntegration,
+  sessionTimingIntegration,
 } from '@sentry/core';
 
 export type {
diff --git a/packages/node/src/integrations/index.ts b/packages/node/src/integrations/index.ts
@@ -10,3 +10,12 @@ export { RequestData } from '@sentry/core';
 export { Undici } from './undici';
 export { Spotlight } from './spotlight';
 export { Hapi } from './hapi';
+
+export {
+  captureConsoleIntegration,
+  debugIntegration,
+  dedupeIntegration,
+  extraErrorDataIntegration,
+  rewriteFramesIntegration,
+  sessionTimingIntegration,
+} from '@sentry/core';
diff --git a/packages/remix/src/index.types.ts b/packages/remix/src/index.types.ts
@@ -17,6 +17,7 @@ export declare function init(options: RemixOptions): void;
 export declare const Integrations: typeof clientSdk.Integrations & typeof serverSdk.Integrations;
 
 export declare const linkedErrorsIntegration: typeof clientSdk.linkedErrorsIntegration;
+export declare const contextLinesIntegration: typeof clientSdk.contextLinesIntegration;
 
 export declare const getDefaultIntegrations: (options: Options) => Integration[];
 export declare const defaultStackParser: StackParser;
diff --git a/packages/remix/test/integration/package.json b/packages/remix/test/integration/package.json
@@ -25,7 +25,6 @@
   "resolutions": {
     "@sentry/browser": "file:../../../browser",
     "@sentry/core": "file:../../../core",
-    "@sentry/integrations": "file:../../../integrations",
     "@sentry/node": "file:../../../node-experimental",
     "@sentry/node-experimental": "file:../../../node",
     "@sentry/react": "file:../../../react",
diff --git a/packages/sveltekit/package.json b/packages/sveltekit/package.json
@@ -39,7 +39,6 @@
   "dependencies": {
     "@sentry-internal/tracing": "7.100.0",
     "@sentry/core": "7.100.0",
-    "@sentry/integrations": "7.100.0",
     "@sentry/node-experimental": "7.100.0",
     "@sentry/svelte": "7.100.0",
     "@sentry/types": "7.100.0",
diff --git a/packages/sveltekit/src/index.types.ts b/packages/sveltekit/src/index.types.ts
@@ -41,6 +41,7 @@ export declare function wrapLoadWithSentry<T extends (...args: any) => any>(orig
 export declare const Integrations: typeof clientSdk.Integrations & typeof serverSdk.Integrations;
 
 export declare const linkedErrorsIntegration: typeof clientSdk.linkedErrorsIntegration;
+export declare const contextLinesIntegration: typeof clientSdk.contextLinesIntegration;
 
 export declare const getDefaultIntegrations: (options: Options) => Integration[];
 export declare const defaultStackParser: StackParser;
diff --git a/packages/sveltekit/src/server/rewriteFramesIntegration.ts b/packages/sveltekit/src/server/rewriteFramesIntegration.ts
@@ -1,5 +1,4 @@
-import { defineIntegration } from '@sentry/core';
-import { rewriteFramesIntegration as originalRewriteFramesIntegration } from '@sentry/integrations';
+import { defineIntegration, rewriteFramesIntegration as originalRewriteFramesIntegration } from '@sentry/core';
 import type { IntegrationFn, StackFrame } from '@sentry/types';
 import { GLOBAL_OBJ, basename, escapeStringForRegex, join } from '@sentry/utils';
 import { WRAPPED_MODULE_SUFFIX } from '../vite/autoInstrument';
diff --git a/packages/sveltekit/test/server/rewriteFramesIntegration.ts b/packages/sveltekit/test/server/rewriteFramesIntegration.ts
@@ -1,4 +1,4 @@
-import { rewriteFramesIntegration } from '@sentry/integrations';
+import { rewriteFramesIntegration } from '@sentry/browser';
 import type { Event, StackFrame } from '@sentry/types';
 import { basename } from '@sentry/utils';
 

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,6 @@ class SentryScenarioGenerationPlugin {`
`169`	`169`	// To help Webpack resolve Sentry modules in `import` statements in cases where they're provided in bundles rather than in `node_modules`
`170`	`170`	`'@sentry/browser': 'Sentry',`
`171`	`171`	`'@sentry/replay': 'Sentry',`
`172`		`- '@sentry/integrations': 'Sentry',`
`173`	`172`	`'@sentry/wasm': 'Sentry',`
`174`	`173`	`}`
`175`	`174`	`: {};`