Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/remix/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 1 addition & 4 deletions packages/remix/src/index.client.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +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 { BrowserTracing } from '@sentry/tracing';
export * from '@sentry/react';

export { Integrations };

export function init(options: RemixOptions): void {
buildMetadata(options, ['remix', 'react']);
options.environment = options.environment || process.env.NODE_ENV;
Expand Down
1 change: 0 additions & 1 deletion packages/remix/src/index.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
7 changes: 6 additions & 1 deletion packages/remix/test/index.server.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down Expand Up @@ -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();
});
});