Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(nextjs): Fix faulty import in Next.js .d.ts #7175

Merged
merged 4 commits into from
Feb 14, 2023
Merged

fix(nextjs): Fix faulty import in Next.js .d.ts #7175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f42330c
fix(nextjs): Fix faulty import in Next.js .d.ts
lforst Feb 14, 2023
3b0257f
Add to test
lforst Feb 14, 2023
101fc7d
Remove testing leftover
lforst Feb 14, 2023
2287eed
Update packages/e2e-tests/test-applications/create-next-app/sentry.se…
lforst Feb 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/e2e-tests/test-applications/create-next-app/sentry.server.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ Sentry.init({
// Note: if you want to override the automatic release value, do not set a
// `release` value here - use the environment variable `SENTRY_RELEASE`, so
// that it will also get attached to your source maps

integrations: [new Sentry.Integrations.LocalVariables()],
});

Sentry.addGlobalEventProcessor(event => {
Expand Down
17 changes: 9 additions & 8 deletions packages/nextjs/src/index.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,19 @@ export * from './edge';

import type { Integration, Options, StackParser } from '@sentry/types';

import type { BrowserOptions } from './client';
import * as clientSdk from './client';
import type { EdgeOptions } from './edge';
import * as edgeSdk from './edge';
import type { NodeOptions } from './server';
import * as serverSdk from './server';
import type * as clientSdk from './client';
import type * as edgeSdk from './edge';
import type * as serverSdk from './server';

/** Initializes Sentry Next.js SDK */
export declare function init(options: Options | BrowserOptions | NodeOptions | EdgeOptions): void;
export declare function init(
options: Options | clientSdk.BrowserOptions | serverSdk.NodeOptions | edgeSdk.EdgeOptions,
): void;

// We export a merged Integrations object so that users can (at least typing-wise) use all integrations everywhere.
export const Integrations = { ...clientSdk.Integrations, ...serverSdk.Integrations, ...edgeSdk.Integrations };
export declare const Integrations: typeof clientSdk.Integrations &
typeof serverSdk.Integrations &
typeof edgeSdk.Integrations;

export declare const defaultIntegrations: Integration[];
export declare const defaultStackParser: StackParser;
Expand Down