Skip to content

Commit a5c4fcb

Browse files
authored
feat(v8/integrations): Merge integrations into core (#10799)
Move relevant integrations. Part of #9833
1 parent 519aacc commit a5c4fcb

File tree

85 files changed

+167
-526
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+167
-526
lines changed

.craft.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,6 @@ targets:
7070
- name: npm
7171
id: '@sentry/wasm'
7272
includeNames: /^sentry-wasm-\d.*\.tgz$/
73-
- name: npm
74-
id: '@sentry/integrations'
75-
includeNames: /^sentry-integrations-\d.*\.tgz$/
7673

7774
## 4. WinterCG Packages
7875
- name: npm

.github/workflows/build.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ jobs:
101101
- 'packages/tracing-internal/**'
102102
- 'packages/utils/**'
103103
- 'packages/types/**'
104-
- 'packages/integrations/**'
105104
browser: &browser
106105
- *shared
107106
- 'packages/browser/**'
@@ -424,7 +423,6 @@ jobs:
424423
name: ${{ github.sha }}
425424
path: |
426425
${{ github.workspace }}/packages/browser/build/bundles/**
427-
${{ github.workspace }}/packages/integrations/build/bundles/**
428426
${{ github.workspace }}/packages/replay/build/bundles/**
429427
${{ github.workspace }}/packages/replay-canvas/build/bundles/**
430428
${{ github.workspace }}/packages/**/*.tgz

MIGRATION.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,26 @@ Sentry SDK requires the fetch API to be available in the environment.
112112
[`error.cause`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error/cause) by
113113
default.
114114

115+
## Integrations
116+
117+
We moved pluggable integrations from their own package (`@sentry/integrations`) to `@sentry/browser` and `@sentry/node`.
118+
119+
Integrations that are now exported from `@sentry/browser` (or framework-specific packages like `@sentry/react`):
120+
121+
- httpClientIntegration
122+
- contextLinesIntegration
123+
- reportingObserverIntegration
124+
125+
Integrations that are now exported from `@sentry/node` and `@sentry/browser` (or framework-specific packages like
126+
`@sentry/react`):
127+
128+
- captureConsoleIntegration
129+
- debugIntegration
130+
- extraErrorDataIntegration
131+
- rewriteFramesIntegration
132+
- sessionTimingIntegration
133+
- dedupeIntegration (enabled by default, not pluggable)
134+
115135
# Deprecations in 7.x
116136

117137
You can use the **Experimental** [@sentry/migr8](https://www.npmjs.com/package/@sentry/migr8) to automatically update

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ package. Please refer to the README and instructions of those SDKs for more deta
5757
- [`@sentry/gatsby`](https://github.com/getsentry/sentry-javascript/tree/master/packages/gatsby): SDK for Gatsby
5858
- [`@sentry/nextjs`](https://github.com/getsentry/sentry-javascript/tree/master/packages/nextjs): SDK for Next.js
5959
- [`@sentry/remix`](https://github.com/getsentry/sentry-javascript/tree/master/packages/remix): SDK for Remix
60-
- [`@sentry/integrations`](https://github.com/getsentry/sentry-javascript/tree/master/packages/integrations): Pluggable
61-
integrations that can be used to enhance JS SDKs
6260
- [`@sentry/serverless`](https://github.com/getsentry/sentry-javascript/tree/master/packages/serverless): SDK for
6361
Serverless Platforms (AWS, GCP)
6462
- [`@sentry/electron`](https://github.com/getsentry/sentry-electron): SDK for Electron with support for native crashes

dev-packages/browser-integration-tests/suites/integrations/ContextLines/init.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as Sentry from '@sentry/browser';
2-
import { contextLinesIntegration } from '@sentry/integrations';
2+
import { contextLinesIntegration } from '@sentry/browser';
33

44
window.Sentry = Sentry;
55

dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/init.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as Sentry from '@sentry/browser';
2-
import { httpClientIntegration } from '@sentry/integrations';
2+
import { httpClientIntegration } from '@sentry/browser';
33

44
window.Sentry = Sentry;
55

dev-packages/browser-integration-tests/suites/integrations/httpclient/httpClientIntegration/init.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as Sentry from '@sentry/browser';
2-
import { httpClientIntegration } from '@sentry/integrations';
2+
import { httpClientIntegration } from '@sentry/browser';
33

44
window.Sentry = Sentry;
55

dev-packages/browser-integration-tests/suites/integrations/httpclient/init.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as Sentry from '@sentry/browser';
2-
import { httpClientIntegration } from '@sentry/integrations';
2+
import { httpClientIntegration } from '@sentry/browser';
33

44
window.Sentry = Sentry;
55

dev-packages/browser-integration-tests/suites/manual-client/browser-context/init.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
import {
22
Breadcrumbs,
33
BrowserClient,
4-
Dedupe,
54
FunctionToString,
65
HttpContext,
76
Hub,
87
InboundFilters,
98
LinkedErrors,
9+
dedupeIntegration,
1010
defaultStackParser,
1111
makeFetchTransport,
1212
} from '@sentry/browser';
1313

1414
const integrations = [
1515
new Breadcrumbs(),
1616
new FunctionToString(),
17-
new Dedupe(),
17+
dedupeIntegration(),
1818
new HttpContext(),
1919
new InboundFilters(),
2020
new LinkedErrors(),

dev-packages/browser-integration-tests/utils/generatePlugin.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ class SentryScenarioGenerationPlugin {
169169
// To help Webpack resolve Sentry modules in `import` statements in cases where they're provided in bundles rather than in `node_modules`
170170
'@sentry/browser': 'Sentry',
171171
'@sentry/replay': 'Sentry',
172-
'@sentry/integrations': 'Sentry',
173172
'@sentry/wasm': 'Sentry',
174173
}
175174
: {};
@@ -242,7 +241,7 @@ class SentryScenarioGenerationPlugin {
242241
this.localOutPath,
243242
path.resolve(
244243
PACKAGES_DIR,
245-
'integrations',
244+
'browser',
246245
BUNDLE_PATHS['integrations'][integrationBundleKey].replace('[INTEGRATION_NAME]', integration),
247246
),
248247
fileName,

0 commit comments

Comments
 (0)