Skip to content

Commit 7e5dbf1

Browse files
eps1loneps1lon
committed
Don't replace setTimeout in Fizz runtime
1 parent 17ee1fd commit 7e5dbf1

File tree

5 files changed

+67
-9
lines changed

5 files changed

+67
-9
lines changed

‎packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.development.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9933,10 +9933,10 @@
99339933
completeSegmentData2 = stringToPrecomputedChunk('" data-pid="'),
99349934
completeSegmentDataEnd = dataElementQuotedEnd,
99359935
completeBoundaryScriptFunctionOnly = stringToPrecomputedChunk(
9936-
'$RB=[];$RC=function(d,c){function m(){$RT=performance.now();var f=$RB;$RB=[];for(var e=0;e<f.length;e+=2){var a=f[e],l=f[e+1],g=a.parentNode;if(g){var h=a.previousSibling,k=0;do{if(a&&8===a.nodeType){var b=a.data;if("/$"===b||"/&"===b)if(0===k)break;else k--;else"$"!==b&&"$?"!==b&&"$~"!==b&&"$!"!==b&&"&"!==b||k++}b=a.nextSibling;g.removeChild(a);a=b}while(a);for(;l.firstChild;)g.insertBefore(l.firstChild,a);h.data="$";h._reactRetry&&h._reactRetry()}}}if(c=document.getElementById(c))if(c.parentNode.removeChild(c),d=\ndocument.getElementById(d))d.previousSibling.data="$~",$RB.push(d,c),2===$RB.length&&setTimeoutOrImmediate(m,("number"!==typeof $RT?0:$RT)+300-performance.now())};'
9936+
'$RB=[];$RC=function(d,c){function m(){$RT=performance.now();var f=$RB;$RB=[];for(var e=0;e<f.length;e+=2){var a=f[e],l=f[e+1],g=a.parentNode;if(g){var h=a.previousSibling,k=0;do{if(a&&8===a.nodeType){var b=a.data;if("/$"===b||"/&"===b)if(0===k)break;else k--;else"$"!==b&&"$?"!==b&&"$~"!==b&&"$!"!==b&&"&"!==b||k++}b=a.nextSibling;g.removeChild(a);a=b}while(a);for(;l.firstChild;)g.insertBefore(l.firstChild,a);h.data="$";h._reactRetry&&h._reactRetry()}}}if(c=document.getElementById(c))if(c.parentNode.removeChild(c),d=\ndocument.getElementById(d))d.previousSibling.data="$~",$RB.push(d,c),2===$RB.length&&setTimeout(m,("number"!==typeof $RT?0:$RT)+300-performance.now())};'
99379937
),
99389938
completeBoundaryScript1Full = stringToPrecomputedChunk(
9939-
'$RB=[];$RC=function(d,c){function m(){$RT=performance.now();var f=$RB;$RB=[];for(var e=0;e<f.length;e+=2){var a=f[e],l=f[e+1],g=a.parentNode;if(g){var h=a.previousSibling,k=0;do{if(a&&8===a.nodeType){var b=a.data;if("/$"===b||"/&"===b)if(0===k)break;else k--;else"$"!==b&&"$?"!==b&&"$~"!==b&&"$!"!==b&&"&"!==b||k++}b=a.nextSibling;g.removeChild(a);a=b}while(a);for(;l.firstChild;)g.insertBefore(l.firstChild,a);h.data="$";h._reactRetry&&h._reactRetry()}}}if(c=document.getElementById(c))if(c.parentNode.removeChild(c),d=\ndocument.getElementById(d))d.previousSibling.data="$~",$RB.push(d,c),2===$RB.length&&setTimeoutOrImmediate(m,("number"!==typeof $RT?0:$RT)+300-performance.now())};$RC("'
9939+
'$RB=[];$RC=function(d,c){function m(){$RT=performance.now();var f=$RB;$RB=[];for(var e=0;e<f.length;e+=2){var a=f[e],l=f[e+1],g=a.parentNode;if(g){var h=a.previousSibling,k=0;do{if(a&&8===a.nodeType){var b=a.data;if("/$"===b||"/&"===b)if(0===k)break;else k--;else"$"!==b&&"$?"!==b&&"$~"!==b&&"$!"!==b&&"&"!==b||k++}b=a.nextSibling;g.removeChild(a);a=b}while(a);for(;l.firstChild;)g.insertBefore(l.firstChild,a);h.data="$";h._reactRetry&&h._reactRetry()}}}if(c=document.getElementById(c))if(c.parentNode.removeChild(c),d=\ndocument.getElementById(d))d.previousSibling.data="$~",$RB.push(d,c),2===$RB.length&&setTimeout(m,("number"!==typeof $RT?0:$RT)+300-performance.now())};$RC("'
99409940
),
99419941
completeBoundaryScript1Partial = stringToPrecomputedChunk('$RC("'),
99429942
completeBoundaryWithStylesScript1FullPartial = stringToPrecomputedChunk(

‎packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.production.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2562,10 +2562,10 @@ var completeSegmentScript1Full = stringToPrecomputedChunk(
25622562
),
25632563
completeSegmentData2 = stringToPrecomputedChunk('" data-pid="'),
25642564
completeBoundaryScriptFunctionOnly = stringToPrecomputedChunk(
2565-
'$RB=[];$RC=function(d,c){function m(){$RT=performance.now();var f=$RB;$RB=[];for(var e=0;e<f.length;e+=2){var a=f[e],l=f[e+1],g=a.parentNode;if(g){var h=a.previousSibling,k=0;do{if(a&&8===a.nodeType){var b=a.data;if("/$"===b||"/&"===b)if(0===k)break;else k--;else"$"!==b&&"$?"!==b&&"$~"!==b&&"$!"!==b&&"&"!==b||k++}b=a.nextSibling;g.removeChild(a);a=b}while(a);for(;l.firstChild;)g.insertBefore(l.firstChild,a);h.data="$";h._reactRetry&&h._reactRetry()}}}if(c=document.getElementById(c))if(c.parentNode.removeChild(c),d=\ndocument.getElementById(d))d.previousSibling.data="$~",$RB.push(d,c),2===$RB.length&&setTimeoutOrImmediate(m,("number"!==typeof $RT?0:$RT)+300-performance.now())};'
2565+
'$RB=[];$RC=function(d,c){function m(){$RT=performance.now();var f=$RB;$RB=[];for(var e=0;e<f.length;e+=2){var a=f[e],l=f[e+1],g=a.parentNode;if(g){var h=a.previousSibling,k=0;do{if(a&&8===a.nodeType){var b=a.data;if("/$"===b||"/&"===b)if(0===k)break;else k--;else"$"!==b&&"$?"!==b&&"$~"!==b&&"$!"!==b&&"&"!==b||k++}b=a.nextSibling;g.removeChild(a);a=b}while(a);for(;l.firstChild;)g.insertBefore(l.firstChild,a);h.data="$";h._reactRetry&&h._reactRetry()}}}if(c=document.getElementById(c))if(c.parentNode.removeChild(c),d=\ndocument.getElementById(d))d.previousSibling.data="$~",$RB.push(d,c),2===$RB.length&&setTimeout(m,("number"!==typeof $RT?0:$RT)+300-performance.now())};'
25662566
),
25672567
completeBoundaryScript1Full = stringToPrecomputedChunk(
2568-
'$RB=[];$RC=function(d,c){function m(){$RT=performance.now();var f=$RB;$RB=[];for(var e=0;e<f.length;e+=2){var a=f[e],l=f[e+1],g=a.parentNode;if(g){var h=a.previousSibling,k=0;do{if(a&&8===a.nodeType){var b=a.data;if("/$"===b||"/&"===b)if(0===k)break;else k--;else"$"!==b&&"$?"!==b&&"$~"!==b&&"$!"!==b&&"&"!==b||k++}b=a.nextSibling;g.removeChild(a);a=b}while(a);for(;l.firstChild;)g.insertBefore(l.firstChild,a);h.data="$";h._reactRetry&&h._reactRetry()}}}if(c=document.getElementById(c))if(c.parentNode.removeChild(c),d=\ndocument.getElementById(d))d.previousSibling.data="$~",$RB.push(d,c),2===$RB.length&&setTimeoutOrImmediate(m,("number"!==typeof $RT?0:$RT)+300-performance.now())};$RC("'
2568+
'$RB=[];$RC=function(d,c){function m(){$RT=performance.now();var f=$RB;$RB=[];for(var e=0;e<f.length;e+=2){var a=f[e],l=f[e+1],g=a.parentNode;if(g){var h=a.previousSibling,k=0;do{if(a&&8===a.nodeType){var b=a.data;if("/$"===b||"/&"===b)if(0===k)break;else k--;else"$"!==b&&"$?"!==b&&"$~"!==b&&"$!"!==b&&"&"!==b||k++}b=a.nextSibling;g.removeChild(a);a=b}while(a);for(;l.firstChild;)g.insertBefore(l.firstChild,a);h.data="$";h._reactRetry&&h._reactRetry()}}}if(c=document.getElementById(c))if(c.parentNode.removeChild(c),d=\ndocument.getElementById(d))d.previousSibling.data="$~",$RB.push(d,c),2===$RB.length&&setTimeout(m,("number"!==typeof $RT?0:$RT)+300-performance.now())};$RC("'
25692569
),
25702570
completeBoundaryScript1Partial = stringToPrecomputedChunk('$RC("'),
25712571
completeBoundaryWithStylesScript1FullPartial = stringToPrecomputedChunk(

‎packages/next/src/compiled/react-dom/cjs/react-dom-server.edge.development.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9126,10 +9126,10 @@
91269126
stringToPrecomputedChunk('<template data-rsi="" data-sid="');
91279127
stringToPrecomputedChunk('" data-pid="');
91289128
var completeBoundaryScriptFunctionOnly = stringToPrecomputedChunk(
9129-
'$RB=[];$RC=function(d,c){function m(){$RT=performance.now();var f=$RB;$RB=[];for(var e=0;e<f.length;e+=2){var a=f[e],l=f[e+1],g=a.parentNode;if(g){var h=a.previousSibling,k=0;do{if(a&&8===a.nodeType){var b=a.data;if("/$"===b||"/&"===b)if(0===k)break;else k--;else"$"!==b&&"$?"!==b&&"$~"!==b&&"$!"!==b&&"&"!==b||k++}b=a.nextSibling;g.removeChild(a);a=b}while(a);for(;l.firstChild;)g.insertBefore(l.firstChild,a);h.data="$";h._reactRetry&&h._reactRetry()}}}if(c=document.getElementById(c))if(c.parentNode.removeChild(c),d=\ndocument.getElementById(d))d.previousSibling.data="$~",$RB.push(d,c),2===$RB.length&&setTimeoutOrImmediate(m,("number"!==typeof $RT?0:$RT)+300-performance.now())};'
9129+
'$RB=[];$RC=function(d,c){function m(){$RT=performance.now();var f=$RB;$RB=[];for(var e=0;e<f.length;e+=2){var a=f[e],l=f[e+1],g=a.parentNode;if(g){var h=a.previousSibling,k=0;do{if(a&&8===a.nodeType){var b=a.data;if("/$"===b||"/&"===b)if(0===k)break;else k--;else"$"!==b&&"$?"!==b&&"$~"!==b&&"$!"!==b&&"&"!==b||k++}b=a.nextSibling;g.removeChild(a);a=b}while(a);for(;l.firstChild;)g.insertBefore(l.firstChild,a);h.data="$";h._reactRetry&&h._reactRetry()}}}if(c=document.getElementById(c))if(c.parentNode.removeChild(c),d=\ndocument.getElementById(d))d.previousSibling.data="$~",$RB.push(d,c),2===$RB.length&&setTimeout(m,("number"!==typeof $RT?0:$RT)+300-performance.now())};'
91309130
),
91319131
completeBoundaryScript1Full = stringToPrecomputedChunk(
9132-
'$RB=[];$RC=function(d,c){function m(){$RT=performance.now();var f=$RB;$RB=[];for(var e=0;e<f.length;e+=2){var a=f[e],l=f[e+1],g=a.parentNode;if(g){var h=a.previousSibling,k=0;do{if(a&&8===a.nodeType){var b=a.data;if("/$"===b||"/&"===b)if(0===k)break;else k--;else"$"!==b&&"$?"!==b&&"$~"!==b&&"$!"!==b&&"&"!==b||k++}b=a.nextSibling;g.removeChild(a);a=b}while(a);for(;l.firstChild;)g.insertBefore(l.firstChild,a);h.data="$";h._reactRetry&&h._reactRetry()}}}if(c=document.getElementById(c))if(c.parentNode.removeChild(c),d=\ndocument.getElementById(d))d.previousSibling.data="$~",$RB.push(d,c),2===$RB.length&&setTimeoutOrImmediate(m,("number"!==typeof $RT?0:$RT)+300-performance.now())};$RC("'
9132+
'$RB=[];$RC=function(d,c){function m(){$RT=performance.now();var f=$RB;$RB=[];for(var e=0;e<f.length;e+=2){var a=f[e],l=f[e+1],g=a.parentNode;if(g){var h=a.previousSibling,k=0;do{if(a&&8===a.nodeType){var b=a.data;if("/$"===b||"/&"===b)if(0===k)break;else k--;else"$"!==b&&"$?"!==b&&"$~"!==b&&"$!"!==b&&"&"!==b||k++}b=a.nextSibling;g.removeChild(a);a=b}while(a);for(;l.firstChild;)g.insertBefore(l.firstChild,a);h.data="$";h._reactRetry&&h._reactRetry()}}}if(c=document.getElementById(c))if(c.parentNode.removeChild(c),d=\ndocument.getElementById(d))d.previousSibling.data="$~",$RB.push(d,c),2===$RB.length&&setTimeout(m,("number"!==typeof $RT?0:$RT)+300-performance.now())};$RC("'
91339133
),
91349134
completeBoundaryScript1Partial = stringToPrecomputedChunk('$RC("'),
91359135
completeBoundaryWithStylesScript1FullPartial = stringToPrecomputedChunk(

‎packages/next/src/compiled/react-dom/cjs/react-dom-server.edge.production.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2476,10 +2476,10 @@ var completeSegmentScript1Full = stringToPrecomputedChunk(
24762476
stringToPrecomputedChunk('<template data-rsi="" data-sid="');
24772477
stringToPrecomputedChunk('" data-pid="');
24782478
var completeBoundaryScriptFunctionOnly = stringToPrecomputedChunk(
2479-
'$RB=[];$RC=function(d,c){function m(){$RT=performance.now();var f=$RB;$RB=[];for(var e=0;e<f.length;e+=2){var a=f[e],l=f[e+1],g=a.parentNode;if(g){var h=a.previousSibling,k=0;do{if(a&&8===a.nodeType){var b=a.data;if("/$"===b||"/&"===b)if(0===k)break;else k--;else"$"!==b&&"$?"!==b&&"$~"!==b&&"$!"!==b&&"&"!==b||k++}b=a.nextSibling;g.removeChild(a);a=b}while(a);for(;l.firstChild;)g.insertBefore(l.firstChild,a);h.data="$";h._reactRetry&&h._reactRetry()}}}if(c=document.getElementById(c))if(c.parentNode.removeChild(c),d=\ndocument.getElementById(d))d.previousSibling.data="$~",$RB.push(d,c),2===$RB.length&&setTimeoutOrImmediate(m,("number"!==typeof $RT?0:$RT)+300-performance.now())};'
2479+
'$RB=[];$RC=function(d,c){function m(){$RT=performance.now();var f=$RB;$RB=[];for(var e=0;e<f.length;e+=2){var a=f[e],l=f[e+1],g=a.parentNode;if(g){var h=a.previousSibling,k=0;do{if(a&&8===a.nodeType){var b=a.data;if("/$"===b||"/&"===b)if(0===k)break;else k--;else"$"!==b&&"$?"!==b&&"$~"!==b&&"$!"!==b&&"&"!==b||k++}b=a.nextSibling;g.removeChild(a);a=b}while(a);for(;l.firstChild;)g.insertBefore(l.firstChild,a);h.data="$";h._reactRetry&&h._reactRetry()}}}if(c=document.getElementById(c))if(c.parentNode.removeChild(c),d=\ndocument.getElementById(d))d.previousSibling.data="$~",$RB.push(d,c),2===$RB.length&&setTimeout(m,("number"!==typeof $RT?0:$RT)+300-performance.now())};'
24802480
),
24812481
completeBoundaryScript1Full = stringToPrecomputedChunk(
2482-
'$RB=[];$RC=function(d,c){function m(){$RT=performance.now();var f=$RB;$RB=[];for(var e=0;e<f.length;e+=2){var a=f[e],l=f[e+1],g=a.parentNode;if(g){var h=a.previousSibling,k=0;do{if(a&&8===a.nodeType){var b=a.data;if("/$"===b||"/&"===b)if(0===k)break;else k--;else"$"!==b&&"$?"!==b&&"$~"!==b&&"$!"!==b&&"&"!==b||k++}b=a.nextSibling;g.removeChild(a);a=b}while(a);for(;l.firstChild;)g.insertBefore(l.firstChild,a);h.data="$";h._reactRetry&&h._reactRetry()}}}if(c=document.getElementById(c))if(c.parentNode.removeChild(c),d=\ndocument.getElementById(d))d.previousSibling.data="$~",$RB.push(d,c),2===$RB.length&&setTimeoutOrImmediate(m,("number"!==typeof $RT?0:$RT)+300-performance.now())};$RC("'
2482+
'$RB=[];$RC=function(d,c){function m(){$RT=performance.now();var f=$RB;$RB=[];for(var e=0;e<f.length;e+=2){var a=f[e],l=f[e+1],g=a.parentNode;if(g){var h=a.previousSibling,k=0;do{if(a&&8===a.nodeType){var b=a.data;if("/$"===b||"/&"===b)if(0===k)break;else k--;else"$"!==b&&"$?"!==b&&"$~"!==b&&"$!"!==b&&"&"!==b||k++}b=a.nextSibling;g.removeChild(a);a=b}while(a);for(;l.firstChild;)g.insertBefore(l.firstChild,a);h.data="$";h._reactRetry&&h._reactRetry()}}}if(c=document.getElementById(c))if(c.parentNode.removeChild(c),d=\ndocument.getElementById(d))d.previousSibling.data="$~",$RB.push(d,c),2===$RB.length&&setTimeout(m,("number"!==typeof $RT?0:$RT)+300-performance.now())};$RC("'
24832483
),
24842484
completeBoundaryScript1Partial = stringToPrecomputedChunk('$RC("'),
24852485
completeBoundaryWithStylesScript1FullPartial = stringToPrecomputedChunk(

‎packages/next/taskfile.js‎

Lines changed: 59 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1673,7 +1673,65 @@ export async function copy_vendor_react(task_) {
16731673

16741674
// NOTE: we have to replace these before inserting the definition of `setTimeoutOrImmediate`,
16751675
// otherwise we'd break it!
1676-
code = code.replaceAll(`setTimeout`, `setTimeoutOrImmediate`)
1676+
code = code.replaceAll('setTimeout', (match, offset, originalCode) => {
1677+
// parse the arguments to setTimeout ensuring nested () are handled.
1678+
// We only want to replace setTimeout calls with an immediate callback i.e. `0` or `undefined`.
1679+
// E.g. Fizz runtime calls setTimeout with the throttle timeout.
1680+
// Technically we don't want to replace anything in the Fizz runtime regardless of the arguments.
1681+
// But we also don't want to replace setTimeout(callback, 50) on the server
1682+
// since that would change semantics.
1683+
// And detecting Fizz runtime is harder.
1684+
const args = []
1685+
let depth = 0
1686+
let arg = ''
1687+
for (let i = offset + match.length; i < originalCode.length; i++) {
1688+
const char = code[i]
1689+
if (char === '(') {
1690+
depth++
1691+
} else if (char === ')') {
1692+
depth--
1693+
}
1694+
if (depth === 1 && char === ',') {
1695+
args.push(arg.trim())
1696+
arg = ''
1697+
} else {
1698+
arg += char
1699+
}
1700+
if (depth < 1) {
1701+
args.push(arg.trim())
1702+
break
1703+
}
1704+
}
1705+
1706+
if (depth !== 0) {
1707+
// unmatched parentheses
1708+
throw new Error(
1709+
`Unmatched parentheses (depth=${depth}) in setTimeout call in ${file} at ${offset}:\n` +
1710+
originalCode.slice(offset)
1711+
)
1712+
}
1713+
if (args.length < 1 || args.length > 2) {
1714+
throw new Error(
1715+
`Invalid number of arguments to setTimeout in ${file} at ${offset}:\n` +
1716+
'args: ' +
1717+
JSON.stringify(args, null, 2) +
1718+
'\n' +
1719+
originalCode.slice(offset)
1720+
)
1721+
}
1722+
1723+
// 1st arg as opening `(`. remove it
1724+
args[0] = args[0].slice(1)
1725+
// last arg as closing `)`. remove it
1726+
args[args.length - 1] = args[args.length - 1].slice(0, -1)
1727+
1728+
const [, timeoutMS] = args
1729+
if (timeoutMS === '0' || timeoutMS === undefined) {
1730+
return 'setTimeoutOrImmediate'
1731+
} else {
1732+
return match
1733+
}
1734+
})
16771735

16781736
const insertionPoint = code.search(insertBeforePattern)
16791737
if (insertionPoint === -1) {

0 commit comments

Comments
 (0)