Commit d1ee0f0
authored
Prevent
When `dynamicIO` is enabled and a `"use cache"` function accesses
dynamic request APIs, we fail the prerendering with a timeout error
after 50 seconds.
This error could be swallowed in userland code however, when the cached
function is wrapped in a try/catch block. That's not the intended
behavior, so we now fail the prerendering (or dynamic validation in dev
mode) with the timeout error in this case as well, using the same
approach as in vercel#77838.
This also works around a bug that led to the timeout errors not being
source-mapped correctly with Turbopack.
In a future PR, we will adapt the behaviour for prerendering of fallback
shells that are allowed to be empty, in which case the timeout must not
fail the build."use cache" timeout errors from being caught in userland code (vercel#78998)1 parent 66acc83 commit d1ee0f0
10 files changed
Lines changed: 238 additions & 125 deletions
File tree
- packages/next/src/server
- app-render
- request
- use-cache
- test/e2e/app-dir/use-cache-hanging-inputs
- app
- fallback-params/[slug]
- search-params-caught
- uncached-promise-nested
- uncached-promise
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
187 | 187 | | |
188 | 188 | | |
189 | 189 | | |
190 | | - | |
191 | 190 | | |
192 | 191 | | |
193 | 192 | | |
| |||
632 | 631 | | |
633 | 632 | | |
634 | 633 | | |
635 | | - | |
636 | 634 | | |
637 | 635 | | |
638 | 636 | | |
| |||
1390 | 1388 | | |
1391 | 1389 | | |
1392 | 1390 | | |
1393 | | - | |
1394 | 1391 | | |
1395 | 1392 | | |
1396 | 1393 | | |
| |||
1410 | 1407 | | |
1411 | 1408 | | |
1412 | 1409 | | |
1413 | | - | |
1414 | | - | |
| 1410 | + | |
| 1411 | + | |
1415 | 1412 | | |
1416 | 1413 | | |
1417 | 1414 | | |
| |||
1564 | 1561 | | |
1565 | 1562 | | |
1566 | 1563 | | |
1567 | | - | |
1568 | 1564 | | |
1569 | 1565 | | |
1570 | 1566 | | |
| |||
1591 | 1587 | | |
1592 | 1588 | | |
1593 | 1589 | | |
1594 | | - | |
1595 | 1590 | | |
1596 | 1591 | | |
1597 | 1592 | | |
1598 | 1593 | | |
1599 | 1594 | | |
1600 | | - | |
1601 | | - | |
| 1595 | + | |
| 1596 | + | |
1602 | 1597 | | |
1603 | 1598 | | |
1604 | 1599 | | |
| |||
1727 | 1722 | | |
1728 | 1723 | | |
1729 | 1724 | | |
1730 | | - | |
1731 | 1725 | | |
1732 | 1726 | | |
1733 | 1727 | | |
| |||
1873 | 1867 | | |
1874 | 1868 | | |
1875 | 1869 | | |
1876 | | - | |
1877 | 1870 | | |
1878 | 1871 | | |
1879 | 1872 | | |
| |||
2220 | 2213 | | |
2221 | 2214 | | |
2222 | 2215 | | |
2223 | | - | |
2224 | 2216 | | |
2225 | 2217 | | |
2226 | | - | |
| 2218 | + | |
2227 | 2219 | | |
2228 | 2220 | | |
2229 | 2221 | | |
| |||
2317 | 2309 | | |
2318 | 2310 | | |
2319 | 2311 | | |
2320 | | - | |
| 2312 | + | |
2321 | 2313 | | |
2322 | 2314 | | |
2323 | 2315 | | |
| |||
2335 | 2327 | | |
2336 | 2328 | | |
2337 | 2329 | | |
2338 | | - | |
| 2330 | + | |
2339 | 2331 | | |
2340 | 2332 | | |
2341 | 2333 | | |
| |||
2375 | 2367 | | |
2376 | 2368 | | |
2377 | 2369 | | |
2378 | | - | |
| 2370 | + | |
2379 | 2371 | | |
2380 | 2372 | | |
2381 | 2373 | | |
| |||
2387 | 2379 | | |
2388 | 2380 | | |
2389 | 2381 | | |
2390 | | - | |
| 2382 | + | |
2391 | 2383 | | |
2392 | 2384 | | |
2393 | 2385 | | |
| |||
2467 | 2459 | | |
2468 | 2460 | | |
2469 | 2461 | | |
2470 | | - | |
2471 | | - | |
2472 | | - | |
2473 | | - | |
2474 | 2462 | | |
2475 | 2463 | | |
2476 | 2464 | | |
| |||
2511 | 2499 | | |
2512 | 2500 | | |
2513 | 2501 | | |
2514 | | - | |
2515 | | - | |
2516 | | - | |
2517 | | - | |
2518 | | - | |
2519 | | - | |
2520 | 2502 | | |
2521 | 2503 | | |
2522 | 2504 | | |
| |||
2531 | 2513 | | |
2532 | 2514 | | |
2533 | 2515 | | |
2534 | | - | |
| 2516 | + | |
2535 | 2517 | | |
2536 | 2518 | | |
2537 | 2519 | | |
| |||
2572 | 2554 | | |
2573 | 2555 | | |
2574 | 2556 | | |
2575 | | - | |
| 2557 | + | |
2576 | 2558 | | |
2577 | 2559 | | |
2578 | 2560 | | |
| |||
2611 | 2593 | | |
2612 | 2594 | | |
2613 | 2595 | | |
2614 | | - | |
2615 | 2596 | | |
2616 | 2597 | | |
2617 | 2598 | | |
| |||
2626 | 2607 | | |
2627 | 2608 | | |
2628 | 2609 | | |
| 2610 | + | |
2629 | 2611 | | |
2630 | 2612 | | |
2631 | 2613 | | |
| |||
2840 | 2822 | | |
2841 | 2823 | | |
2842 | 2824 | | |
| 2825 | + | |
| 2826 | + | |
| 2827 | + | |
| 2828 | + | |
| 2829 | + | |
| 2830 | + | |
2843 | 2831 | | |
2844 | 2832 | | |
2845 | 2833 | | |
| |||
3106 | 3094 | | |
3107 | 3095 | | |
3108 | 3096 | | |
3109 | | - | |
| 3097 | + | |
3110 | 3098 | | |
3111 | 3099 | | |
3112 | 3100 | | |
| |||
3428 | 3416 | | |
3429 | 3417 | | |
3430 | 3418 | | |
| 3419 | + | |
| 3420 | + | |
| 3421 | + | |
| 3422 | + | |
| 3423 | + | |
| 3424 | + | |
3431 | 3425 | | |
3432 | 3426 | | |
3433 | 3427 | | |
| |||
3591 | 3585 | | |
3592 | 3586 | | |
3593 | 3587 | | |
3594 | | - | |
| 3588 | + | |
3595 | 3589 | | |
3596 | 3590 | | |
3597 | 3591 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
651 | 651 | | |
652 | 652 | | |
653 | 653 | | |
654 | | - | |
| 654 | + | |
655 | 655 | | |
656 | 656 | | |
657 | 657 | | |
658 | 658 | | |
659 | 659 | | |
| 660 | + | |
| 661 | + | |
| 662 | + | |
| 663 | + | |
| 664 | + | |
660 | 665 | | |
661 | 666 | | |
662 | 667 | | |
| |||
698 | 703 | | |
699 | 704 | | |
700 | 705 | | |
701 | | - | |
| 706 | + | |
702 | 707 | | |
703 | 708 | | |
704 | 709 | | |
| |||
708 | 713 | | |
709 | 714 | | |
710 | 715 | | |
711 | | - | |
| 716 | + | |
712 | 717 | | |
713 | 718 | | |
714 | 719 | | |
| |||
Lines changed: 4 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
54 | | - | |
55 | | - | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
56 | 57 | | |
57 | 58 | | |
58 | 59 | | |
59 | | - | |
| 60 | + | |
60 | 61 | | |
61 | 62 | | |
62 | 63 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
32 | | - | |
| 32 | + | |
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
253 | 253 | | |
254 | 254 | | |
255 | 255 | | |
256 | | - | |
257 | | - | |
| 256 | + | |
| 257 | + | |
258 | 258 | | |
259 | 259 | | |
260 | 260 | | |
| |||
365 | 365 | | |
366 | 366 | | |
367 | 367 | | |
368 | | - | |
369 | 368 | | |
370 | 369 | | |
371 | 370 | | |
| |||
385 | 384 | | |
386 | 385 | | |
387 | 386 | | |
388 | | - | |
389 | | - | |
390 | | - | |
391 | | - | |
392 | | - | |
393 | | - | |
394 | | - | |
395 | 387 | | |
396 | 388 | | |
397 | 389 | | |
| |||
404 | 396 | | |
405 | 397 | | |
406 | 398 | | |
| 399 | + | |
407 | 400 | | |
408 | 401 | | |
409 | 402 | | |
| |||
422 | 415 | | |
423 | 416 | | |
424 | 417 | | |
425 | | - | |
| 418 | + | |
426 | 419 | | |
427 | 420 | | |
428 | 421 | | |
| |||
433 | 426 | | |
434 | 427 | | |
435 | 428 | | |
436 | | - | |
437 | | - | |
438 | | - | |
439 | | - | |
440 | | - | |
| 429 | + | |
441 | 430 | | |
442 | 431 | | |
443 | 432 | | |
| |||
Lines changed: 14 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
Lines changed: 28 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
0 commit comments