@@ -137,25 +137,28 @@ function setUpTunnelRewriteRules(userNextConfig: NextConfigObject, tunnelPath: s
137
137
{
138
138
type : 'query' ,
139
139
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})' ,
141
141
} ,
142
142
] ,
143
143
destination : 'https://o:orgid.ingest.:region.sentry.io/api/:projectid/envelope/?hsts=0' ,
144
144
} ;
145
145
146
+ // Order of these is important, they get applied first to last.
147
+ const newRewrites = [ tunnelRouteRewriteWithRegion , tunnelRouteRewrite ] ;
148
+
146
149
if ( typeof originalRewrites !== 'function' ) {
147
- return [ tunnelRouteRewriteWithRegion , tunnelRouteRewrite ] ;
150
+ return newRewrites ;
148
151
}
149
152
150
153
// @ts -expect-error Expected 0 arguments but got 1 - this is from the future-proofing mentioned above, so we don't care about it
151
154
const originalRewritesResult = await originalRewrites ( ...args ) ;
152
155
153
156
if ( Array . isArray ( originalRewritesResult ) ) {
154
- return [ tunnelRouteRewriteWithRegion , tunnelRouteRewrite , ...originalRewritesResult ] ;
157
+ return [ ... newRewrites , ...originalRewritesResult ] ;
155
158
} else {
156
159
return {
157
160
...originalRewritesResult ,
158
- beforeFiles : [ tunnelRouteRewriteWithRegion , tunnelRouteRewrite , ...( originalRewritesResult . beforeFiles || [ ] ) ] ,
161
+ beforeFiles : [ ... newRewrites , ...( originalRewritesResult . beforeFiles || [ ] ) ] ,
159
162
} ;
160
163
}
161
164
} ;
0 commit comments