Skip to content

Commit fadc9ac

Browse files
author
Luca Forstner
authored
fix(nextjs/v7): Fix tunnelRoute matching logic for hybrid cloud (#11577)
Fixes #11559
1 parent 8abd97c commit fadc9ac

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

packages/nextjs/src/config/withSentryConfig.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,25 +133,28 @@ function setUpTunnelRewriteRules(userNextConfig: NextConfigObject, tunnelPath: s
133133
{
134134
type: 'query',
135135
key: 'r', // short for region - we keep it short so matching is harder for ad-blockers
136-
value: '(?<region>\\[a-z\\]{2})',
136+
value: '(?<region>[a-z]{2})',
137137
},
138138
],
139139
destination: 'https://o:orgid.ingest.:region.sentry.io/api/:projectid/envelope/?hsts=0',
140140
};
141141

142+
// Order of these is important, they get applied first to last.
143+
const newRewrites = [tunnelRouteRewriteWithRegion, tunnelRouteRewrite];
144+
142145
if (typeof originalRewrites !== 'function') {
143-
return [tunnelRouteRewriteWithRegion, tunnelRouteRewrite];
146+
return newRewrites;
144147
}
145148

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

149152
if (Array.isArray(originalRewritesResult)) {
150-
return [tunnelRouteRewriteWithRegion, tunnelRouteRewrite, ...originalRewritesResult];
153+
return [...newRewrites, ...originalRewritesResult];
151154
} else {
152155
return {
153156
...originalRewritesResult,
154-
beforeFiles: [tunnelRouteRewriteWithRegion, tunnelRouteRewrite, ...(originalRewritesResult.beforeFiles || [])],
157+
beforeFiles: [...newRewrites, ...(originalRewritesResult.beforeFiles || [])],
155158
};
156159
}
157160
};

0 commit comments

Comments
 (0)