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