Skip to content

Commit

Permalink
fix(nextjs/v7): Fix tunnelRoute matching logic for hybrid cloud (#1…
Browse files Browse the repository at this point in the history
  • Loading branch information
lforst committed Apr 12, 2024
1 parent 8abd97c commit fadc9ac
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions packages/nextjs/src/config/withSentryConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,25 +133,28 @@ function setUpTunnelRewriteRules(userNextConfig: NextConfigObject, tunnelPath: s
{
type: 'query',
key: 'r', // short for region - we keep it short so matching is harder for ad-blockers
value: '(?<region>\\[a-z\\]{2})',
value: '(?<region>[a-z]{2})',
},
],
destination: 'https://o:orgid.ingest.:region.sentry.io/api/:projectid/envelope/?hsts=0',
};

// Order of these is important, they get applied first to last.
const newRewrites = [tunnelRouteRewriteWithRegion, tunnelRouteRewrite];

if (typeof originalRewrites !== 'function') {
return [tunnelRouteRewriteWithRegion, tunnelRouteRewrite];
return newRewrites;
}

// @ts-expect-error Expected 0 arguments but got 1 - this is from the future-proofing mentioned above, so we don't care about it
const originalRewritesResult = await originalRewrites(...args);

if (Array.isArray(originalRewritesResult)) {
return [tunnelRouteRewriteWithRegion, tunnelRouteRewrite, ...originalRewritesResult];
return [...newRewrites, ...originalRewritesResult];
} else {
return {
...originalRewritesResult,
beforeFiles: [tunnelRouteRewriteWithRegion, tunnelRouteRewrite, ...(originalRewritesResult.beforeFiles || [])],
beforeFiles: [...newRewrites, ...(originalRewritesResult.beforeFiles || [])],
};
}
};
Expand Down

0 comments on commit fadc9ac

Please sign in to comment.