Skip to content

Improve cyclic thenable detection in ReactFlightReplyServer - #35369

Merged
unstubbable merged 2 commits into
react:mainfrom
cvan20191:fix-cyclic-thenables
Dec 17, 2025
Merged

Improve cyclic thenable detection in ReactFlightReplyServer#35369
unstubbable merged 2 commits into
react:mainfrom
cvan20191:fix-cyclic-thenables

Conversation

@cvan20191

@cvan20191cvan20191 commented Dec 16, 2025

Copy link
Copy Markdown
Contributor

Summary

This PR improves cyclic thenable detection in ReactFlightReplyServer.js. Fixes#35368.
The previous fix only detected direct self-references (inspectedValue === chunk) and relied on the cycleProtection counter to eventually bail out of longer cycles. This change keeps the existing MAX_THENABLE_CYCLE_DEPTH ($1000$) cycleProtection cap as a hard guardrail and adds a visited set so that we can detect self-cycles and multi-node cycles as soon as any ReactPromise is revisited and while still bounding the amount of work we do for deep acyclic chains via cycleProtection.

How did you test this change?

  • Ran the existing test suite for the server renderer:

    yarn test react-server
    yarn test --prod react-server
    yarn flow dom-node
    yarn linc

@meta-cla

meta-claBot commented Dec 16, 2025

Copy link
Copy Markdown

Hi @cvan20191!

Thank you for your pull request and welcome to our community.

Action Required

In order to merge any pull request (code, docs, etc.), we require contributors to sign our Contributor License Agreement, and we don't seem to have one on file for you.

Process

In order for us to review and merge your suggested changes, please sign at https://code.facebook.com/cla. If you are contributing on behalf of someone else (eg your employer), the individual CLA may not be sufficient and your employer may need to sign the corporate CLA.

Once the CLA is signed, our tooling will perform checks and validations. Afterwards, the pull request will be tagged with CLA signed. The tagging process may take up to 1 hour after signing. Please give it that time before contacting us about it.

If you have received this in error or have any questions, please contact us at cla@meta.com. Thanks!

@meta-cla

meta-claBot commented Dec 16, 2025

Copy link
Copy Markdown

Thank you for signing our Contributor License Agreement. We can now accept your code for this (and any) Meta Open Source project. Thanks!

@react-sizebot

Copy link
Copy Markdown

Comparing: 88ee1f5...50c5c98

Critical size changes

Includes critical production bundles, as well as any change greater than 2%:

Name+/-BaseCurrent+/- gzipBase gzipCurrent gzip
oss-stable/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB+0.05%1.88 kB1.88 kB
oss-stable/react-dom/cjs/react-dom-client.production.js=608.16 kB608.16 kB=107.67 kB107.67 kB
oss-experimental/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB+0.05%1.88 kB1.88 kB
oss-experimental/react-dom/cjs/react-dom-client.production.js=667.39 kB667.39 kB=117.55 kB117.55 kB
facebook-www/ReactDOM-prod.classic.js=693.47 kB693.47 kB=122.05 kB122.05 kB
facebook-www/ReactDOM-prod.modern.js=683.89 kB683.89 kB=120.43 kB120.43 kB

Significant size changes

Includes any change greater than 0.2%:

(No significant changes)

Generated by 🚫 dangerJS against 50c5c98

@unstubbableunstubbable left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you.

@unstubbable
unstubbable merged commit b731fe2 into react:mainDec 17, 2025
239 checks passed
github-actionsBot pushed a commit to code/lib-react that referenced this pull request Dec 21, 2025
)
## Summary
This PR improves cyclic thenable detection in
`ReactFlightReplyServer.js`. Fixesreact#35368.
The previous fix only detected direct self-references (`inspectedValue
=== chunk`) and relied on the `cycleProtection` counter to eventually
bail out of longer cycles. This change keeps the existing
MAX_THENABLE_CYCLE_DEPTH ($1000$) `cycleProtection` cap as a hard
guardrail and adds a visited set so that we can detect self-cycles and
multi-node cycles as soon as any `ReactPromise` is revisited and while
still bounding the amount of work we do for deep acyclic chains via
`cycleProtection`.
## How did you test this change?
- Ran the existing test suite for the server renderer:
```bash
yarn test react-server
yarn test --prod react-server
yarn flow dom-node
yarn linc
```
---------
Co-authored-by: Hendrik Liebau <mail@hendrik-liebau.de>
DiffTrain build for [b731fe2](react@b731fe2)
github-actionsBot pushed a commit to code/lib-react that referenced this pull request Dec 21, 2025
)
## Summary
This PR improves cyclic thenable detection in
`ReactFlightReplyServer.js`. Fixesreact#35368.
The previous fix only detected direct self-references (`inspectedValue
=== chunk`) and relied on the `cycleProtection` counter to eventually
bail out of longer cycles. This change keeps the existing
MAX_THENABLE_CYCLE_DEPTH ($1000$) `cycleProtection` cap as a hard
guardrail and adds a visited set so that we can detect self-cycles and
multi-node cycles as soon as any `ReactPromise` is revisited and while
still bounding the amount of work we do for deep acyclic chains via
`cycleProtection`.
## How did you test this change?
- Ran the existing test suite for the server renderer:
```bash
yarn test react-server
yarn test --prod react-server
yarn flow dom-node
yarn linc
```
---------
Co-authored-by: Hendrik Liebau <mail@hendrik-liebau.de>
DiffTrain build for [b731fe2](react@b731fe2)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Improve cyclic thenable detection in ReactFlightReplyServer

3 participants

@cvan20191@react-sizebot@unstubbable
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Improve cyclic thenable detection in ReactFlightReplyServer by cvan20191 · Pull Request #35369 · react/react · GitHub
Skip to content

Improve cyclic thenable detection in ReactFlightReplyServer - #35369

Merged
unstubbable merged 2 commits into
react:mainfrom
cvan20191:fix-cyclic-thenables
Dec 17, 2025
Merged

Improve cyclic thenable detection in ReactFlightReplyServer#35369
unstubbable merged 2 commits into
react:mainfrom
cvan20191:fix-cyclic-thenables

Conversation

@cvan20191

@cvan20191cvan20191 commented Dec 16, 2025

Copy link
Copy Markdown
Contributor

Summary

This PR improves cyclic thenable detection in ReactFlightReplyServer.js. Fixes#35368.
The previous fix only detected direct self-references (inspectedValue === chunk) and relied on the cycleProtection counter to eventually bail out of longer cycles. This change keeps the existing MAX_THENABLE_CYCLE_DEPTH ($1000$) cycleProtection cap as a hard guardrail and adds a visited set so that we can detect self-cycles and multi-node cycles as soon as any ReactPromise is revisited and while still bounding the amount of work we do for deep acyclic chains via cycleProtection.

How did you test this change?

  • Ran the existing test suite for the server renderer:

    yarn test react-server
    yarn test --prod react-server
    yarn flow dom-node
    yarn linc

@meta-cla

meta-claBot commented Dec 16, 2025

Copy link
Copy Markdown

Hi @cvan20191!

Thank you for your pull request and welcome to our community.

Action Required

In order to merge any pull request (code, docs, etc.), we require contributors to sign our Contributor License Agreement, and we don't seem to have one on file for you.

Process

In order for us to review and merge your suggested changes, please sign at https://code.facebook.com/cla. If you are contributing on behalf of someone else (eg your employer), the individual CLA may not be sufficient and your employer may need to sign the corporate CLA.

Once the CLA is signed, our tooling will perform checks and validations. Afterwards, the pull request will be tagged with CLA signed. The tagging process may take up to 1 hour after signing. Please give it that time before contacting us about it.

If you have received this in error or have any questions, please contact us at cla@meta.com. Thanks!

@meta-cla

meta-claBot commented Dec 16, 2025

Copy link
Copy Markdown

Thank you for signing our Contributor License Agreement. We can now accept your code for this (and any) Meta Open Source project. Thanks!

@react-sizebot

Copy link
Copy Markdown

Comparing: 88ee1f5...50c5c98

Critical size changes

Includes critical production bundles, as well as any change greater than 2%:

Name+/-BaseCurrent+/- gzipBase gzipCurrent gzip
oss-stable/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB+0.05%1.88 kB1.88 kB
oss-stable/react-dom/cjs/react-dom-client.production.js=608.16 kB608.16 kB=107.67 kB107.67 kB
oss-experimental/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB+0.05%1.88 kB1.88 kB
oss-experimental/react-dom/cjs/react-dom-client.production.js=667.39 kB667.39 kB=117.55 kB117.55 kB
facebook-www/ReactDOM-prod.classic.js=693.47 kB693.47 kB=122.05 kB122.05 kB
facebook-www/ReactDOM-prod.modern.js=683.89 kB683.89 kB=120.43 kB120.43 kB

Significant size changes

Includes any change greater than 0.2%:

(No significant changes)

Generated by 🚫 dangerJS against 50c5c98

@unstubbableunstubbable left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you.

@unstubbable
unstubbable merged commit b731fe2 into react:mainDec 17, 2025
239 checks passed
github-actionsBot pushed a commit to code/lib-react that referenced this pull request Dec 21, 2025
)
## Summary
This PR improves cyclic thenable detection in
`ReactFlightReplyServer.js`. Fixesreact#35368.
The previous fix only detected direct self-references (`inspectedValue
=== chunk`) and relied on the `cycleProtection` counter to eventually
bail out of longer cycles. This change keeps the existing
MAX_THENABLE_CYCLE_DEPTH ($1000$) `cycleProtection` cap as a hard
guardrail and adds a visited set so that we can detect self-cycles and
multi-node cycles as soon as any `ReactPromise` is revisited and while
still bounding the amount of work we do for deep acyclic chains via
`cycleProtection`.
## How did you test this change?
- Ran the existing test suite for the server renderer:
```bash
yarn test react-server
yarn test --prod react-server
yarn flow dom-node
yarn linc
```
---------
Co-authored-by: Hendrik Liebau <mail@hendrik-liebau.de>
DiffTrain build for [b731fe2](react@b731fe2)
github-actionsBot pushed a commit to code/lib-react that referenced this pull request Dec 21, 2025
)
## Summary
This PR improves cyclic thenable detection in
`ReactFlightReplyServer.js`. Fixesreact#35368.
The previous fix only detected direct self-references (`inspectedValue
=== chunk`) and relied on the `cycleProtection` counter to eventually
bail out of longer cycles. This change keeps the existing
MAX_THENABLE_CYCLE_DEPTH ($1000$) `cycleProtection` cap as a hard
guardrail and adds a visited set so that we can detect self-cycles and
multi-node cycles as soon as any `ReactPromise` is revisited and while
still bounding the amount of work we do for deep acyclic chains via
`cycleProtection`.
## How did you test this change?
- Ran the existing test suite for the server renderer:
```bash
yarn test react-server
yarn test --prod react-server
yarn flow dom-node
yarn linc
```
---------
Co-authored-by: Hendrik Liebau <mail@hendrik-liebau.de>
DiffTrain build for [b731fe2](react@b731fe2)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Improve cyclic thenable detection in ReactFlightReplyServer

3 participants

@cvan20191@react-sizebot@unstubbable
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Improve cyclic thenable detection in ReactFlightReplyServer by cvan20191 · Pull Request #35369 · react/react · GitHub
Skip to content

Improve cyclic thenable detection in ReactFlightReplyServer - #35369

Merged
unstubbable merged 2 commits into
react:mainfrom
cvan20191:fix-cyclic-thenables
Dec 17, 2025
Merged

Improve cyclic thenable detection in ReactFlightReplyServer#35369
unstubbable merged 2 commits into
react:mainfrom
cvan20191:fix-cyclic-thenables

Conversation

@cvan20191

@cvan20191cvan20191 commented Dec 16, 2025

Copy link
Copy Markdown
Contributor

Summary

This PR improves cyclic thenable detection in ReactFlightReplyServer.js. Fixes#35368.
The previous fix only detected direct self-references (inspectedValue === chunk) and relied on the cycleProtection counter to eventually bail out of longer cycles. This change keeps the existing MAX_THENABLE_CYCLE_DEPTH ($1000$) cycleProtection cap as a hard guardrail and adds a visited set so that we can detect self-cycles and multi-node cycles as soon as any ReactPromise is revisited and while still bounding the amount of work we do for deep acyclic chains via cycleProtection.

How did you test this change?

  • Ran the existing test suite for the server renderer:

    yarn test react-server
    yarn test --prod react-server
    yarn flow dom-node
    yarn linc

@meta-cla

meta-claBot commented Dec 16, 2025

Copy link
Copy Markdown

Hi @cvan20191!

Thank you for your pull request and welcome to our community.

Action Required

In order to merge any pull request (code, docs, etc.), we require contributors to sign our Contributor License Agreement, and we don't seem to have one on file for you.

Process

In order for us to review and merge your suggested changes, please sign at https://code.facebook.com/cla. If you are contributing on behalf of someone else (eg your employer), the individual CLA may not be sufficient and your employer may need to sign the corporate CLA.

Once the CLA is signed, our tooling will perform checks and validations. Afterwards, the pull request will be tagged with CLA signed. The tagging process may take up to 1 hour after signing. Please give it that time before contacting us about it.

If you have received this in error or have any questions, please contact us at cla@meta.com. Thanks!

@meta-cla

meta-claBot commented Dec 16, 2025

Copy link
Copy Markdown

Thank you for signing our Contributor License Agreement. We can now accept your code for this (and any) Meta Open Source project. Thanks!

@react-sizebot

Copy link
Copy Markdown

Comparing: 88ee1f5...50c5c98

Critical size changes

Includes critical production bundles, as well as any change greater than 2%:

Name+/-BaseCurrent+/- gzipBase gzipCurrent gzip
oss-stable/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB+0.05%1.88 kB1.88 kB
oss-stable/react-dom/cjs/react-dom-client.production.js=608.16 kB608.16 kB=107.67 kB107.67 kB
oss-experimental/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB+0.05%1.88 kB1.88 kB
oss-experimental/react-dom/cjs/react-dom-client.production.js=667.39 kB667.39 kB=117.55 kB117.55 kB
facebook-www/ReactDOM-prod.classic.js=693.47 kB693.47 kB=122.05 kB122.05 kB
facebook-www/ReactDOM-prod.modern.js=683.89 kB683.89 kB=120.43 kB120.43 kB

Significant size changes

Includes any change greater than 0.2%:

(No significant changes)

Generated by 🚫 dangerJS against 50c5c98

@unstubbableunstubbable left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you.

@unstubbable
unstubbable merged commit b731fe2 into react:mainDec 17, 2025
239 checks passed
github-actionsBot pushed a commit to code/lib-react that referenced this pull request Dec 21, 2025
)
## Summary
This PR improves cyclic thenable detection in
`ReactFlightReplyServer.js`. Fixesreact#35368.
The previous fix only detected direct self-references (`inspectedValue
=== chunk`) and relied on the `cycleProtection` counter to eventually
bail out of longer cycles. This change keeps the existing
MAX_THENABLE_CYCLE_DEPTH ($1000$) `cycleProtection` cap as a hard
guardrail and adds a visited set so that we can detect self-cycles and
multi-node cycles as soon as any `ReactPromise` is revisited and while
still bounding the amount of work we do for deep acyclic chains via
`cycleProtection`.
## How did you test this change?
- Ran the existing test suite for the server renderer:
```bash
yarn test react-server
yarn test --prod react-server
yarn flow dom-node
yarn linc
```
---------
Co-authored-by: Hendrik Liebau <mail@hendrik-liebau.de>
DiffTrain build for [b731fe2](react@b731fe2)
github-actionsBot pushed a commit to code/lib-react that referenced this pull request Dec 21, 2025
)
## Summary
This PR improves cyclic thenable detection in
`ReactFlightReplyServer.js`. Fixesreact#35368.
The previous fix only detected direct self-references (`inspectedValue
=== chunk`) and relied on the `cycleProtection` counter to eventually
bail out of longer cycles. This change keeps the existing
MAX_THENABLE_CYCLE_DEPTH ($1000$) `cycleProtection` cap as a hard
guardrail and adds a visited set so that we can detect self-cycles and
multi-node cycles as soon as any `ReactPromise` is revisited and while
still bounding the amount of work we do for deep acyclic chains via
`cycleProtection`.
## How did you test this change?
- Ran the existing test suite for the server renderer:
```bash
yarn test react-server
yarn test --prod react-server
yarn flow dom-node
yarn linc
```
---------
Co-authored-by: Hendrik Liebau <mail@hendrik-liebau.de>
DiffTrain build for [b731fe2](react@b731fe2)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Improve cyclic thenable detection in ReactFlightReplyServer

3 participants

@cvan20191@react-sizebot@unstubbable
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Improve cyclic thenable detection in ReactFlightReplyServer by cvan20191 · Pull Request #35369 · react/react · GitHub
Skip to content

Improve cyclic thenable detection in ReactFlightReplyServer - #35369

Merged
unstubbable merged 2 commits into
react:mainfrom
cvan20191:fix-cyclic-thenables
Dec 17, 2025
Merged

Improve cyclic thenable detection in ReactFlightReplyServer#35369
unstubbable merged 2 commits into
react:mainfrom
cvan20191:fix-cyclic-thenables

Conversation

@cvan20191

@cvan20191cvan20191 commented Dec 16, 2025

Copy link
Copy Markdown
Contributor

Summary

This PR improves cyclic thenable detection in ReactFlightReplyServer.js. Fixes#35368.
The previous fix only detected direct self-references (inspectedValue === chunk) and relied on the cycleProtection counter to eventually bail out of longer cycles. This change keeps the existing MAX_THENABLE_CYCLE_DEPTH ($1000$) cycleProtection cap as a hard guardrail and adds a visited set so that we can detect self-cycles and multi-node cycles as soon as any ReactPromise is revisited and while still bounding the amount of work we do for deep acyclic chains via cycleProtection.

How did you test this change?

  • Ran the existing test suite for the server renderer:

    yarn test react-server
    yarn test --prod react-server
    yarn flow dom-node
    yarn linc

@meta-cla

meta-claBot commented Dec 16, 2025

Copy link
Copy Markdown

Hi @cvan20191!

Thank you for your pull request and welcome to our community.

Action Required

In order to merge any pull request (code, docs, etc.), we require contributors to sign our Contributor License Agreement, and we don't seem to have one on file for you.

Process

In order for us to review and merge your suggested changes, please sign at https://code.facebook.com/cla. If you are contributing on behalf of someone else (eg your employer), the individual CLA may not be sufficient and your employer may need to sign the corporate CLA.

Once the CLA is signed, our tooling will perform checks and validations. Afterwards, the pull request will be tagged with CLA signed. The tagging process may take up to 1 hour after signing. Please give it that time before contacting us about it.

If you have received this in error or have any questions, please contact us at cla@meta.com. Thanks!

@meta-cla

meta-claBot commented Dec 16, 2025

Copy link
Copy Markdown

Thank you for signing our Contributor License Agreement. We can now accept your code for this (and any) Meta Open Source project. Thanks!

@react-sizebot

Copy link
Copy Markdown

Comparing: 88ee1f5...50c5c98

Critical size changes

Includes critical production bundles, as well as any change greater than 2%:

Name+/-BaseCurrent+/- gzipBase gzipCurrent gzip
oss-stable/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB+0.05%1.88 kB1.88 kB
oss-stable/react-dom/cjs/react-dom-client.production.js=608.16 kB608.16 kB=107.67 kB107.67 kB
oss-experimental/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB+0.05%1.88 kB1.88 kB
oss-experimental/react-dom/cjs/react-dom-client.production.js=667.39 kB667.39 kB=117.55 kB117.55 kB
facebook-www/ReactDOM-prod.classic.js=693.47 kB693.47 kB=122.05 kB122.05 kB
facebook-www/ReactDOM-prod.modern.js=683.89 kB683.89 kB=120.43 kB120.43 kB

Significant size changes

Includes any change greater than 0.2%:

(No significant changes)

Generated by 🚫 dangerJS against 50c5c98

@unstubbableunstubbable left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you.

@unstubbable
unstubbable merged commit b731fe2 into react:mainDec 17, 2025
239 checks passed
github-actionsBot pushed a commit to code/lib-react that referenced this pull request Dec 21, 2025
)
## Summary
This PR improves cyclic thenable detection in
`ReactFlightReplyServer.js`. Fixesreact#35368.
The previous fix only detected direct self-references (`inspectedValue
=== chunk`) and relied on the `cycleProtection` counter to eventually
bail out of longer cycles. This change keeps the existing
MAX_THENABLE_CYCLE_DEPTH ($1000$) `cycleProtection` cap as a hard
guardrail and adds a visited set so that we can detect self-cycles and
multi-node cycles as soon as any `ReactPromise` is revisited and while
still bounding the amount of work we do for deep acyclic chains via
`cycleProtection`.
## How did you test this change?
- Ran the existing test suite for the server renderer:
```bash
yarn test react-server
yarn test --prod react-server
yarn flow dom-node
yarn linc
```
---------
Co-authored-by: Hendrik Liebau <mail@hendrik-liebau.de>
DiffTrain build for [b731fe2](react@b731fe2)
github-actionsBot pushed a commit to code/lib-react that referenced this pull request Dec 21, 2025
)
## Summary
This PR improves cyclic thenable detection in
`ReactFlightReplyServer.js`. Fixesreact#35368.
The previous fix only detected direct self-references (`inspectedValue
=== chunk`) and relied on the `cycleProtection` counter to eventually
bail out of longer cycles. This change keeps the existing
MAX_THENABLE_CYCLE_DEPTH ($1000$) `cycleProtection` cap as a hard
guardrail and adds a visited set so that we can detect self-cycles and
multi-node cycles as soon as any `ReactPromise` is revisited and while
still bounding the amount of work we do for deep acyclic chains via
`cycleProtection`.
## How did you test this change?
- Ran the existing test suite for the server renderer:
```bash
yarn test react-server
yarn test --prod react-server
yarn flow dom-node
yarn linc
```
---------
Co-authored-by: Hendrik Liebau <mail@hendrik-liebau.de>
DiffTrain build for [b731fe2](react@b731fe2)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Improve cyclic thenable detection in ReactFlightReplyServer

3 participants

@cvan20191@react-sizebot@unstubbable
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Improve cyclic thenable detection in ReactFlightReplyServer by cvan20191 · Pull Request #35369 · react/react · GitHub
Skip to content

Improve cyclic thenable detection in ReactFlightReplyServer - #35369

Merged
unstubbable merged 2 commits into
react:mainfrom
cvan20191:fix-cyclic-thenables
Dec 17, 2025
Merged

Improve cyclic thenable detection in ReactFlightReplyServer#35369
unstubbable merged 2 commits into
react:mainfrom
cvan20191:fix-cyclic-thenables

Conversation

@cvan20191

@cvan20191cvan20191 commented Dec 16, 2025

Copy link
Copy Markdown
Contributor

Summary

This PR improves cyclic thenable detection in ReactFlightReplyServer.js. Fixes#35368.
The previous fix only detected direct self-references (inspectedValue === chunk) and relied on the cycleProtection counter to eventually bail out of longer cycles. This change keeps the existing MAX_THENABLE_CYCLE_DEPTH ($1000$) cycleProtection cap as a hard guardrail and adds a visited set so that we can detect self-cycles and multi-node cycles as soon as any ReactPromise is revisited and while still bounding the amount of work we do for deep acyclic chains via cycleProtection.

How did you test this change?

  • Ran the existing test suite for the server renderer:

    yarn test react-server
    yarn test --prod react-server
    yarn flow dom-node
    yarn linc

@meta-cla

meta-claBot commented Dec 16, 2025

Copy link
Copy Markdown

Hi @cvan20191!

Thank you for your pull request and welcome to our community.

Action Required

In order to merge any pull request (code, docs, etc.), we require contributors to sign our Contributor License Agreement, and we don't seem to have one on file for you.

Process

In order for us to review and merge your suggested changes, please sign at https://code.facebook.com/cla. If you are contributing on behalf of someone else (eg your employer), the individual CLA may not be sufficient and your employer may need to sign the corporate CLA.

Once the CLA is signed, our tooling will perform checks and validations. Afterwards, the pull request will be tagged with CLA signed. The tagging process may take up to 1 hour after signing. Please give it that time before contacting us about it.

If you have received this in error or have any questions, please contact us at cla@meta.com. Thanks!

@meta-cla

meta-claBot commented Dec 16, 2025

Copy link
Copy Markdown

Thank you for signing our Contributor License Agreement. We can now accept your code for this (and any) Meta Open Source project. Thanks!

@react-sizebot

Copy link
Copy Markdown

Comparing: 88ee1f5...50c5c98

Critical size changes

Includes critical production bundles, as well as any change greater than 2%:

Name+/-BaseCurrent+/- gzipBase gzipCurrent gzip
oss-stable/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB+0.05%1.88 kB1.88 kB
oss-stable/react-dom/cjs/react-dom-client.production.js=608.16 kB608.16 kB=107.67 kB107.67 kB
oss-experimental/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB+0.05%1.88 kB1.88 kB
oss-experimental/react-dom/cjs/react-dom-client.production.js=667.39 kB667.39 kB=117.55 kB117.55 kB
facebook-www/ReactDOM-prod.classic.js=693.47 kB693.47 kB=122.05 kB122.05 kB
facebook-www/ReactDOM-prod.modern.js=683.89 kB683.89 kB=120.43 kB120.43 kB

Significant size changes

Includes any change greater than 0.2%:

(No significant changes)

Generated by 🚫 dangerJS against 50c5c98

@unstubbableunstubbable left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you.

@unstubbable
unstubbable merged commit b731fe2 into react:mainDec 17, 2025
239 checks passed
github-actionsBot pushed a commit to code/lib-react that referenced this pull request Dec 21, 2025
)
## Summary
This PR improves cyclic thenable detection in
`ReactFlightReplyServer.js`. Fixesreact#35368.
The previous fix only detected direct self-references (`inspectedValue
=== chunk`) and relied on the `cycleProtection` counter to eventually
bail out of longer cycles. This change keeps the existing
MAX_THENABLE_CYCLE_DEPTH ($1000$) `cycleProtection` cap as a hard
guardrail and adds a visited set so that we can detect self-cycles and
multi-node cycles as soon as any `ReactPromise` is revisited and while
still bounding the amount of work we do for deep acyclic chains via
`cycleProtection`.
## How did you test this change?
- Ran the existing test suite for the server renderer:
```bash
yarn test react-server
yarn test --prod react-server
yarn flow dom-node
yarn linc
```
---------
Co-authored-by: Hendrik Liebau <mail@hendrik-liebau.de>
DiffTrain build for [b731fe2](react@b731fe2)
github-actionsBot pushed a commit to code/lib-react that referenced this pull request Dec 21, 2025
)
## Summary
This PR improves cyclic thenable detection in
`ReactFlightReplyServer.js`. Fixesreact#35368.
The previous fix only detected direct self-references (`inspectedValue
=== chunk`) and relied on the `cycleProtection` counter to eventually
bail out of longer cycles. This change keeps the existing
MAX_THENABLE_CYCLE_DEPTH ($1000$) `cycleProtection` cap as a hard
guardrail and adds a visited set so that we can detect self-cycles and
multi-node cycles as soon as any `ReactPromise` is revisited and while
still bounding the amount of work we do for deep acyclic chains via
`cycleProtection`.
## How did you test this change?
- Ran the existing test suite for the server renderer:
```bash
yarn test react-server
yarn test --prod react-server
yarn flow dom-node
yarn linc
```
---------
Co-authored-by: Hendrik Liebau <mail@hendrik-liebau.de>
DiffTrain build for [b731fe2](react@b731fe2)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Improve cyclic thenable detection in ReactFlightReplyServer

3 participants

@cvan20191@react-sizebot@unstubbable
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Improve cyclic thenable detection in ReactFlightReplyServer by cvan20191 · Pull Request #35369 · react/react · GitHub
Skip to content

Improve cyclic thenable detection in ReactFlightReplyServer - #35369

Merged
unstubbable merged 2 commits into
react:mainfrom
cvan20191:fix-cyclic-thenables
Dec 17, 2025
Merged

Improve cyclic thenable detection in ReactFlightReplyServer#35369
unstubbable merged 2 commits into
react:mainfrom
cvan20191:fix-cyclic-thenables

Conversation

@cvan20191

@cvan20191cvan20191 commented Dec 16, 2025

Copy link
Copy Markdown
Contributor

Summary

This PR improves cyclic thenable detection in ReactFlightReplyServer.js. Fixes#35368.
The previous fix only detected direct self-references (inspectedValue === chunk) and relied on the cycleProtection counter to eventually bail out of longer cycles. This change keeps the existing MAX_THENABLE_CYCLE_DEPTH ($1000$) cycleProtection cap as a hard guardrail and adds a visited set so that we can detect self-cycles and multi-node cycles as soon as any ReactPromise is revisited and while still bounding the amount of work we do for deep acyclic chains via cycleProtection.

How did you test this change?

  • Ran the existing test suite for the server renderer:

    yarn test react-server
    yarn test --prod react-server
    yarn flow dom-node
    yarn linc

@meta-cla

meta-claBot commented Dec 16, 2025

Copy link
Copy Markdown

Hi @cvan20191!

Thank you for your pull request and welcome to our community.

Action Required

In order to merge any pull request (code, docs, etc.), we require contributors to sign our Contributor License Agreement, and we don't seem to have one on file for you.

Process

In order for us to review and merge your suggested changes, please sign at https://code.facebook.com/cla. If you are contributing on behalf of someone else (eg your employer), the individual CLA may not be sufficient and your employer may need to sign the corporate CLA.

Once the CLA is signed, our tooling will perform checks and validations. Afterwards, the pull request will be tagged with CLA signed. The tagging process may take up to 1 hour after signing. Please give it that time before contacting us about it.

If you have received this in error or have any questions, please contact us at cla@meta.com. Thanks!

@meta-cla

meta-claBot commented Dec 16, 2025

Copy link
Copy Markdown

Thank you for signing our Contributor License Agreement. We can now accept your code for this (and any) Meta Open Source project. Thanks!

@react-sizebot

Copy link
Copy Markdown

Comparing: 88ee1f5...50c5c98

Critical size changes

Includes critical production bundles, as well as any change greater than 2%:

Name+/-BaseCurrent+/- gzipBase gzipCurrent gzip
oss-stable/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB+0.05%1.88 kB1.88 kB
oss-stable/react-dom/cjs/react-dom-client.production.js=608.16 kB608.16 kB=107.67 kB107.67 kB
oss-experimental/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB+0.05%1.88 kB1.88 kB
oss-experimental/react-dom/cjs/react-dom-client.production.js=667.39 kB667.39 kB=117.55 kB117.55 kB
facebook-www/ReactDOM-prod.classic.js=693.47 kB693.47 kB=122.05 kB122.05 kB
facebook-www/ReactDOM-prod.modern.js=683.89 kB683.89 kB=120.43 kB120.43 kB

Significant size changes

Includes any change greater than 0.2%:

(No significant changes)

Generated by 🚫 dangerJS against 50c5c98

@unstubbableunstubbable left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you.

@unstubbable
unstubbable merged commit b731fe2 into react:mainDec 17, 2025
239 checks passed
github-actionsBot pushed a commit to code/lib-react that referenced this pull request Dec 21, 2025
)
## Summary
This PR improves cyclic thenable detection in
`ReactFlightReplyServer.js`. Fixesreact#35368.
The previous fix only detected direct self-references (`inspectedValue
=== chunk`) and relied on the `cycleProtection` counter to eventually
bail out of longer cycles. This change keeps the existing
MAX_THENABLE_CYCLE_DEPTH ($1000$) `cycleProtection` cap as a hard
guardrail and adds a visited set so that we can detect self-cycles and
multi-node cycles as soon as any `ReactPromise` is revisited and while
still bounding the amount of work we do for deep acyclic chains via
`cycleProtection`.
## How did you test this change?
- Ran the existing test suite for the server renderer:
```bash
yarn test react-server
yarn test --prod react-server
yarn flow dom-node
yarn linc
```
---------
Co-authored-by: Hendrik Liebau <mail@hendrik-liebau.de>
DiffTrain build for [b731fe2](react@b731fe2)
github-actionsBot pushed a commit to code/lib-react that referenced this pull request Dec 21, 2025
)
## Summary
This PR improves cyclic thenable detection in
`ReactFlightReplyServer.js`. Fixesreact#35368.
The previous fix only detected direct self-references (`inspectedValue
=== chunk`) and relied on the `cycleProtection` counter to eventually
bail out of longer cycles. This change keeps the existing
MAX_THENABLE_CYCLE_DEPTH ($1000$) `cycleProtection` cap as a hard
guardrail and adds a visited set so that we can detect self-cycles and
multi-node cycles as soon as any `ReactPromise` is revisited and while
still bounding the amount of work we do for deep acyclic chains via
`cycleProtection`.
## How did you test this change?
- Ran the existing test suite for the server renderer:
```bash
yarn test react-server
yarn test --prod react-server
yarn flow dom-node
yarn linc
```
---------
Co-authored-by: Hendrik Liebau <mail@hendrik-liebau.de>
DiffTrain build for [b731fe2](react@b731fe2)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Improve cyclic thenable detection in ReactFlightReplyServer

3 participants

@cvan20191@react-sizebot@unstubbable
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Improve cyclic thenable detection in ReactFlightReplyServer by cvan20191 · Pull Request #35369 · react/react · GitHub
Skip to content

Improve cyclic thenable detection in ReactFlightReplyServer - #35369

Merged
unstubbable merged 2 commits into
react:mainfrom
cvan20191:fix-cyclic-thenables
Dec 17, 2025
Merged

Improve cyclic thenable detection in ReactFlightReplyServer#35369
unstubbable merged 2 commits into
react:mainfrom
cvan20191:fix-cyclic-thenables

Conversation

@cvan20191

@cvan20191cvan20191 commented Dec 16, 2025

Copy link
Copy Markdown
Contributor

Summary

This PR improves cyclic thenable detection in ReactFlightReplyServer.js. Fixes#35368.
The previous fix only detected direct self-references (inspectedValue === chunk) and relied on the cycleProtection counter to eventually bail out of longer cycles. This change keeps the existing MAX_THENABLE_CYCLE_DEPTH ($1000$) cycleProtection cap as a hard guardrail and adds a visited set so that we can detect self-cycles and multi-node cycles as soon as any ReactPromise is revisited and while still bounding the amount of work we do for deep acyclic chains via cycleProtection.

How did you test this change?

  • Ran the existing test suite for the server renderer:

    yarn test react-server
    yarn test --prod react-server
    yarn flow dom-node
    yarn linc

@meta-cla

meta-claBot commented Dec 16, 2025

Copy link
Copy Markdown

Hi @cvan20191!

Thank you for your pull request and welcome to our community.

Action Required

In order to merge any pull request (code, docs, etc.), we require contributors to sign our Contributor License Agreement, and we don't seem to have one on file for you.

Process

In order for us to review and merge your suggested changes, please sign at https://code.facebook.com/cla. If you are contributing on behalf of someone else (eg your employer), the individual CLA may not be sufficient and your employer may need to sign the corporate CLA.

Once the CLA is signed, our tooling will perform checks and validations. Afterwards, the pull request will be tagged with CLA signed. The tagging process may take up to 1 hour after signing. Please give it that time before contacting us about it.

If you have received this in error or have any questions, please contact us at cla@meta.com. Thanks!

@meta-cla

meta-claBot commented Dec 16, 2025

Copy link
Copy Markdown

Thank you for signing our Contributor License Agreement. We can now accept your code for this (and any) Meta Open Source project. Thanks!

@react-sizebot

Copy link
Copy Markdown

Comparing: 88ee1f5...50c5c98

Critical size changes

Includes critical production bundles, as well as any change greater than 2%:

Name+/-BaseCurrent+/- gzipBase gzipCurrent gzip
oss-stable/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB+0.05%1.88 kB1.88 kB
oss-stable/react-dom/cjs/react-dom-client.production.js=608.16 kB608.16 kB=107.67 kB107.67 kB
oss-experimental/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB+0.05%1.88 kB1.88 kB
oss-experimental/react-dom/cjs/react-dom-client.production.js=667.39 kB667.39 kB=117.55 kB117.55 kB
facebook-www/ReactDOM-prod.classic.js=693.47 kB693.47 kB=122.05 kB122.05 kB
facebook-www/ReactDOM-prod.modern.js=683.89 kB683.89 kB=120.43 kB120.43 kB

Significant size changes

Includes any change greater than 0.2%:

(No significant changes)

Generated by 🚫 dangerJS against 50c5c98

@unstubbableunstubbable left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you.

@unstubbable
unstubbable merged commit b731fe2 into react:mainDec 17, 2025
239 checks passed
github-actionsBot pushed a commit to code/lib-react that referenced this pull request Dec 21, 2025
)
## Summary
This PR improves cyclic thenable detection in
`ReactFlightReplyServer.js`. Fixesreact#35368.
The previous fix only detected direct self-references (`inspectedValue
=== chunk`) and relied on the `cycleProtection` counter to eventually
bail out of longer cycles. This change keeps the existing
MAX_THENABLE_CYCLE_DEPTH ($1000$) `cycleProtection` cap as a hard
guardrail and adds a visited set so that we can detect self-cycles and
multi-node cycles as soon as any `ReactPromise` is revisited and while
still bounding the amount of work we do for deep acyclic chains via
`cycleProtection`.
## How did you test this change?
- Ran the existing test suite for the server renderer:
```bash
yarn test react-server
yarn test --prod react-server
yarn flow dom-node
yarn linc
```
---------
Co-authored-by: Hendrik Liebau <mail@hendrik-liebau.de>
DiffTrain build for [b731fe2](react@b731fe2)
github-actionsBot pushed a commit to code/lib-react that referenced this pull request Dec 21, 2025
)
## Summary
This PR improves cyclic thenable detection in
`ReactFlightReplyServer.js`. Fixesreact#35368.
The previous fix only detected direct self-references (`inspectedValue
=== chunk`) and relied on the `cycleProtection` counter to eventually
bail out of longer cycles. This change keeps the existing
MAX_THENABLE_CYCLE_DEPTH ($1000$) `cycleProtection` cap as a hard
guardrail and adds a visited set so that we can detect self-cycles and
multi-node cycles as soon as any `ReactPromise` is revisited and while
still bounding the amount of work we do for deep acyclic chains via
`cycleProtection`.
## How did you test this change?
- Ran the existing test suite for the server renderer:
```bash
yarn test react-server
yarn test --prod react-server
yarn flow dom-node
yarn linc
```
---------
Co-authored-by: Hendrik Liebau <mail@hendrik-liebau.de>
DiffTrain build for [b731fe2](react@b731fe2)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Improve cyclic thenable detection in ReactFlightReplyServer

3 participants

@cvan20191@react-sizebot@unstubbable
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Improve cyclic thenable detection in ReactFlightReplyServer by cvan20191 · Pull Request #35369 · react/react · GitHub
Skip to content

Improve cyclic thenable detection in ReactFlightReplyServer - #35369

Merged
unstubbable merged 2 commits into
react:mainfrom
cvan20191:fix-cyclic-thenables
Dec 17, 2025
Merged

Improve cyclic thenable detection in ReactFlightReplyServer#35369
unstubbable merged 2 commits into
react:mainfrom
cvan20191:fix-cyclic-thenables

Conversation

@cvan20191

@cvan20191cvan20191 commented Dec 16, 2025

Copy link
Copy Markdown
Contributor

Summary

This PR improves cyclic thenable detection in ReactFlightReplyServer.js. Fixes#35368.
The previous fix only detected direct self-references (inspectedValue === chunk) and relied on the cycleProtection counter to eventually bail out of longer cycles. This change keeps the existing MAX_THENABLE_CYCLE_DEPTH ($1000$) cycleProtection cap as a hard guardrail and adds a visited set so that we can detect self-cycles and multi-node cycles as soon as any ReactPromise is revisited and while still bounding the amount of work we do for deep acyclic chains via cycleProtection.

How did you test this change?

  • Ran the existing test suite for the server renderer:

    yarn test react-server
    yarn test --prod react-server
    yarn flow dom-node
    yarn linc

@meta-cla

meta-claBot commented Dec 16, 2025

Copy link
Copy Markdown

Hi @cvan20191!

Thank you for your pull request and welcome to our community.

Action Required

In order to merge any pull request (code, docs, etc.), we require contributors to sign our Contributor License Agreement, and we don't seem to have one on file for you.

Process

In order for us to review and merge your suggested changes, please sign at https://code.facebook.com/cla. If you are contributing on behalf of someone else (eg your employer), the individual CLA may not be sufficient and your employer may need to sign the corporate CLA.

Once the CLA is signed, our tooling will perform checks and validations. Afterwards, the pull request will be tagged with CLA signed. The tagging process may take up to 1 hour after signing. Please give it that time before contacting us about it.

If you have received this in error or have any questions, please contact us at cla@meta.com. Thanks!

@meta-cla

meta-claBot commented Dec 16, 2025

Copy link
Copy Markdown

Thank you for signing our Contributor License Agreement. We can now accept your code for this (and any) Meta Open Source project. Thanks!

@react-sizebot

Copy link
Copy Markdown

Comparing: 88ee1f5...50c5c98

Critical size changes

Includes critical production bundles, as well as any change greater than 2%:

Name+/-BaseCurrent+/- gzipBase gzipCurrent gzip
oss-stable/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB+0.05%1.88 kB1.88 kB
oss-stable/react-dom/cjs/react-dom-client.production.js=608.16 kB608.16 kB=107.67 kB107.67 kB
oss-experimental/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB+0.05%1.88 kB1.88 kB
oss-experimental/react-dom/cjs/react-dom-client.production.js=667.39 kB667.39 kB=117.55 kB117.55 kB
facebook-www/ReactDOM-prod.classic.js=693.47 kB693.47 kB=122.05 kB122.05 kB
facebook-www/ReactDOM-prod.modern.js=683.89 kB683.89 kB=120.43 kB120.43 kB

Significant size changes

Includes any change greater than 0.2%:

(No significant changes)

Generated by 🚫 dangerJS against 50c5c98

@unstubbableunstubbable left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you.

@unstubbable
unstubbable merged commit b731fe2 into react:mainDec 17, 2025
239 checks passed
github-actionsBot pushed a commit to code/lib-react that referenced this pull request Dec 21, 2025
)
## Summary
This PR improves cyclic thenable detection in
`ReactFlightReplyServer.js`. Fixesreact#35368.
The previous fix only detected direct self-references (`inspectedValue
=== chunk`) and relied on the `cycleProtection` counter to eventually
bail out of longer cycles. This change keeps the existing
MAX_THENABLE_CYCLE_DEPTH ($1000$) `cycleProtection` cap as a hard
guardrail and adds a visited set so that we can detect self-cycles and
multi-node cycles as soon as any `ReactPromise` is revisited and while
still bounding the amount of work we do for deep acyclic chains via
`cycleProtection`.
## How did you test this change?
- Ran the existing test suite for the server renderer:
```bash
yarn test react-server
yarn test --prod react-server
yarn flow dom-node
yarn linc
```
---------
Co-authored-by: Hendrik Liebau <mail@hendrik-liebau.de>
DiffTrain build for [b731fe2](react@b731fe2)
github-actionsBot pushed a commit to code/lib-react that referenced this pull request Dec 21, 2025
)
## Summary
This PR improves cyclic thenable detection in
`ReactFlightReplyServer.js`. Fixesreact#35368.
The previous fix only detected direct self-references (`inspectedValue
=== chunk`) and relied on the `cycleProtection` counter to eventually
bail out of longer cycles. This change keeps the existing
MAX_THENABLE_CYCLE_DEPTH ($1000$) `cycleProtection` cap as a hard
guardrail and adds a visited set so that we can detect self-cycles and
multi-node cycles as soon as any `ReactPromise` is revisited and while
still bounding the amount of work we do for deep acyclic chains via
`cycleProtection`.
## How did you test this change?
- Ran the existing test suite for the server renderer:
```bash
yarn test react-server
yarn test --prod react-server
yarn flow dom-node
yarn linc
```
---------
Co-authored-by: Hendrik Liebau <mail@hendrik-liebau.de>
DiffTrain build for [b731fe2](react@b731fe2)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Improve cyclic thenable detection in ReactFlightReplyServer

3 participants

@cvan20191@react-sizebot@unstubbable