Commit 42d05fd
committed
Fix instrumentation.ts loading inconsistency between dev and production
- Add validation to detect conflicting instrumentation files (both root and src/)
- Throw error when both root and src instrumentation files exist
- Apply fix to both build process and dev server
- Consistent with middleware/proxy conflict handling1 parent 40b9243 commit 42d05fd
File tree
3 files changed
+35
-1
lines changed- packages/next
- src
- build
- server/lib/router-utils
3 files changed
+35
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1050 | 1050 | | |
1051 | 1051 | | |
1052 | 1052 | | |
1053 | | - | |
| 1053 | + | |
| 1054 | + | |
| 1055 | + | |
1054 | 1056 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1215 | 1215 | | |
1216 | 1216 | | |
1217 | 1217 | | |
| 1218 | + | |
| 1219 | + | |
1218 | 1220 | | |
1219 | 1221 | | |
1220 | 1222 | | |
| |||
1235 | 1237 | | |
1236 | 1238 | | |
1237 | 1239 | | |
| 1240 | + | |
| 1241 | + | |
| 1242 | + | |
| 1243 | + | |
| 1244 | + | |
1238 | 1245 | | |
1239 | 1246 | | |
1240 | 1247 | | |
1241 | 1248 | | |
| 1249 | + | |
| 1250 | + | |
| 1251 | + | |
| 1252 | + | |
| 1253 | + | |
| 1254 | + | |
| 1255 | + | |
| 1256 | + | |
| 1257 | + | |
| 1258 | + | |
| 1259 | + | |
| 1260 | + | |
| 1261 | + | |
| 1262 | + | |
| 1263 | + | |
| 1264 | + | |
1242 | 1265 | | |
1243 | 1266 | | |
1244 | 1267 | | |
| |||
Lines changed: 9 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
591 | 591 | | |
592 | 592 | | |
593 | 593 | | |
| 594 | + | |
| 595 | + | |
| 596 | + | |
| 597 | + | |
| 598 | + | |
| 599 | + | |
| 600 | + | |
| 601 | + | |
| 602 | + | |
594 | 603 | | |
595 | 604 | | |
596 | 605 | | |
| |||
0 commit comments