Skip to content

fix(react-router): prevent unstable_sentryVitePluginOptions spread from overwriting sourcemaps #22930

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

Closed
okxint wants to merge 1 commit into from
Closed

fix(react-router): prevent unstable_sentryVitePluginOptions spread from overwriting sourcemaps #22930

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions packages/react-router/src/vite/makeCustomSentryVitePlugins.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ export async function makeCustomSentryVitePlugins(options: SentryReactRouterBuil
release,
} = options;

// Destructure keys that are merged explicitly below so the trailing spread
// cannot overwrite them with the user's raw value.
const { sourcemaps: userSourcemaps, ...restUnstableVitePluginOptions } =
unstable_sentryVitePluginOptions ?? {};

const sentryVitePlugins = sentryVitePlugin({
applicationKey,
authToken: authToken ?? process.env.SENTRY_AUTH_TOKEN,
Expand All @@ -45,9 +50,9 @@ export async function makeCustomSentryVitePlugins(options: SentryReactRouterBuil
// will be handled in buildEnd hook
sourcemaps: {
disable: true,
...unstable_sentryVitePluginOptions?.sourcemaps,
...userSourcemaps,
},
...unstable_sentryVitePluginOptions,
...restUnstableVitePluginOptions,
}) as Plugin[];

return sentryVitePlugins;
Expand Down