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 devserver CORS blockage when assetPrefix is defined #9766

Merged
merged 3 commits into from
Dec 7, 2023
Merged

fix(nextjs): Fix devserver CORS blockage when assetPrefix is defined #9766

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2671547
fix(nextjs): Fix devserver CORS blockage when `assetPrefix` is defined
lforst Dec 6, 2023
f0b10b7
lint
lforst Dec 7, 2023
b48b4d0
CI fail?
lforst Dec 7, 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
11 changes: 10 additions & 1 deletion packages/nextjs/src/client/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,16 @@ function addClientIntegrations(options: BrowserOptions): void {
if (hasTracingEnabled(options)) {
const defaultBrowserTracingIntegration = new BrowserTracing({
// eslint-disable-next-line deprecation/deprecation
tracingOrigins: [...defaultRequestInstrumentationOptions.tracingOrigins, /^(api\/)/],
tracingOrigins:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can/should we use tracePropagationTargets here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe that would be breaking if people configured tracingOrigins themselves because the tracePropagationTargets would gain precedence?

sentry-javascript/packages/tracing-internal/src/browser/browsertracing.ts

Line 204 in 0b65c57

// In case both are specified, tracePropagationTargets takes precedence

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm yeah could be. let's leave it as is then!

process.env.NODE_ENV === 'development'
? [
// Will match any URL that contains "localhost" but not "webpack.hot-update.json" - The webpack dev-server
// has cors and it doesn't like extra headers when it's accessed from a different URL.
// TODO(v8): Ideally we rework our tracePropagationTargets logic so this hack won't be necessary anymore (see issue #9764)
/^(?=.*localhost)(?!.*webpack\.hot-update\.json).*/,
/^\/(?!\/)/,
]
: [...defaultRequestInstrumentationOptions.tracingOrigins, /^(api\/)/],
routingInstrumentation: nextRouterInstrumentation,
});

Expand Down