@@ -137,25 +137,28 @@ function setUpTunnelRewriteRules(userNextConfig: NextConfigObject, tunnelPath: s
137137 {
138138 type : 'query' ,
139139 key : 'r' , // short for region - we keep it short so matching is harder for ad-blockers
140- value : '(?<region>\\ [a-z\\ ]{2})' ,
140+ value : '(?<region>[a-z]{2})' ,
141141 } ,
142142 ] ,
143143 destination : 'https://o:orgid.ingest.:region.sentry.io/api/:projectid/envelope/?hsts=0' ,
144144 } ;
145145
146+ // Order of these is important, they get applied first to last.
147+ const newRewrites = [ tunnelRouteRewriteWithRegion , tunnelRouteRewrite ] ;
148+
146149 if ( typeof originalRewrites !== 'function' ) {
147- return [ tunnelRouteRewriteWithRegion , tunnelRouteRewrite ] ;
150+ return newRewrites ;
148151 }
149152
150153 // @ts -expect-error Expected 0 arguments but got 1 - this is from the future-proofing mentioned above, so we don't care about it
151154 const originalRewritesResult = await originalRewrites ( ...args ) ;
152155
153156 if ( Array . isArray ( originalRewritesResult ) ) {
154- return [ tunnelRouteRewriteWithRegion , tunnelRouteRewrite , ...originalRewritesResult ] ;
157+ return [ ... newRewrites , ...originalRewritesResult ] ;
155158 } else {
156159 return {
157160 ...originalRewritesResult ,
158- beforeFiles : [ tunnelRouteRewriteWithRegion , tunnelRouteRewrite , ...( originalRewritesResult . beforeFiles || [ ] ) ] ,
161+ beforeFiles : [ ... newRewrites , ...( originalRewritesResult . beforeFiles || [ ] ) ] ,
159162 } ;
160163 }
161164 } ;
0 commit comments