From 29405a3d31f74c9825d9d7058812a50963de0de2 Mon Sep 17 00:00:00 2001
From: Tim Fish <tim@timfish.uk>
Date: Wed, 22 Mar 2023 17:39:47 +0000
Subject: [PATCH 1/2] Remove `@sentry/tracing` dependency from Remix SDK

---
 packages/remix/package.json         | 1 -
 packages/remix/src/index.client.tsx | 1 -
 packages/remix/src/index.server.ts  | 1 -
 3 files changed, 3 deletions(-)

diff --git a/packages/remix/package.json b/packages/remix/package.json
index d08489a442c9..a2d68a4e0c38 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -25,7 +25,6 @@
     "@sentry/integrations": "7.44.2",
     "@sentry/node": "7.44.2",
     "@sentry/react": "7.44.2",
-    "@sentry/tracing": "7.44.2",
     "@sentry/types": "7.44.2",
     "@sentry/utils": "7.44.2",
     "@sentry/webpack-plugin": "1.19.0",
diff --git a/packages/remix/src/index.client.tsx b/packages/remix/src/index.client.tsx
index 22d9ce73fe82..ca66a1b1ac1e 100644
--- a/packages/remix/src/index.client.tsx
+++ b/packages/remix/src/index.client.tsx
@@ -4,7 +4,6 @@ import { configureScope, init as reactInit, Integrations } from '@sentry/react';
 import { buildMetadata } from './utils/metadata';
 import type { RemixOptions } from './utils/remixOptions';
 export { remixRouterInstrumentation, withSentry } from './performance/client';
-export { BrowserTracing } from '@sentry/tracing';
 export * from '@sentry/react';
 
 export { Integrations };
diff --git a/packages/remix/src/index.server.ts b/packages/remix/src/index.server.ts
index b2ad73866fde..21cfc20b17ab 100644
--- a/packages/remix/src/index.server.ts
+++ b/packages/remix/src/index.server.ts
@@ -8,7 +8,6 @@ import type { RemixOptions } from './utils/remixOptions';
 
 export { ErrorBoundary, withErrorBoundary } from '@sentry/react';
 export { remixRouterInstrumentation, withSentry } from './performance/client';
-export { BrowserTracing, Integrations } from '@sentry/tracing';
 export * from '@sentry/node';
 export { wrapExpressCreateRequestHandler } from './utils/serverAdapters/express';
 

From ea3871c7a621ebc3ae2319764fd79fdf0d428935 Mon Sep 17 00:00:00 2001
From: Tim Fish <tim@timfish.uk>
Date: Wed, 22 Mar 2023 17:54:19 +0000
Subject: [PATCH 2/2] Test both node and tracing integrations are accessible

---
 packages/remix/src/index.client.tsx      | 4 +---
 packages/remix/test/index.server.test.ts | 7 ++++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/remix/src/index.client.tsx b/packages/remix/src/index.client.tsx
index ca66a1b1ac1e..5c76ee4907bf 100644
--- a/packages/remix/src/index.client.tsx
+++ b/packages/remix/src/index.client.tsx
@@ -1,13 +1,11 @@
 /* eslint-disable import/export */
-import { configureScope, init as reactInit, Integrations } from '@sentry/react';
+import { configureScope, init as reactInit } from '@sentry/react';
 
 import { buildMetadata } from './utils/metadata';
 import type { RemixOptions } from './utils/remixOptions';
 export { remixRouterInstrumentation, withSentry } from './performance/client';
 export * from '@sentry/react';
 
-export { Integrations };
-
 export function init(options: RemixOptions): void {
   buildMetadata(options, ['remix', 'react']);
   options.environment = options.environment || process.env.NODE_ENV;
diff --git a/packages/remix/test/index.server.test.ts b/packages/remix/test/index.server.test.ts
index f4d4f9c95fe0..ec1610aee400 100644
--- a/packages/remix/test/index.server.test.ts
+++ b/packages/remix/test/index.server.test.ts
@@ -2,7 +2,7 @@ import * as SentryNode from '@sentry/node';
 import { getCurrentHub } from '@sentry/node';
 import { GLOBAL_OBJ } from '@sentry/utils';
 
-import { init } from '../src/index.server';
+import { init, Integrations } from '../src/index.server';
 
 const nodeInit = jest.spyOn(SentryNode, 'init');
 
@@ -57,4 +57,9 @@ describe('Server init()', () => {
     // @ts-ignore need access to protected _tags attribute
     expect(currentScope._tags).toEqual({ runtime: 'node' });
   });
+
+  it('has both node and tracing integrations', () => {
+    expect(Integrations.Apollo).not.toBeUndefined();
+    expect(Integrations.Http).not.toBeUndefined();
+  });
 });