Skip to content

Commit 6baff7a

Browse files
unstubbableunstubbable
authored
[Flight] Allow cyclic references to be serialized when unwrapping lazy elements (#35471)
When `renderModelDestructive` unwraps a lazy element and subsequently calls `renderModelDestructive` again with the resolved model, we should preserve the parent connection so that cyclic references can be serialized properly. This can occur in an advanced scenario where the result from the Flight Client is serialized again with the Flight Server, e.g. for slicing a precomputed payload into multiple parts. Note: The added test only fails when run with `--prod`. In dev mode, the component info outlining prevents the issue from occurring.
1 parent bef88f7 commit 6baff7a

2 files changed

Lines changed: 70 additions & 2 deletions

File tree

‎packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMEdge-test.js‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,74 @@ describe('ReactFlightDOMEdge', () => {
321321
expect(result).toEqual('<span>Client Component</span>');
322322
});
323323

324+
it('should resolve cyclic references in client component props after two rounds of serialization and deserialization',async()=>{
325+
constClientComponent=clientExports(functionClientComponent({data}){
326+
return(
327+
<div>{data.self===data ? 'Cycle resolved' : 'Cycle broken'}</div>
328+
);
329+
});
330+
constclientModuleMetadata=webpackMap[ClientComponent.$$id];
331+
constconsumerModuleId='consumer-'+clientModuleMetadata.id;
332+
constclientReference=Object.defineProperties(ClientComponent,{
333+
$$typeof: {value: Symbol.for('react.client.reference')},
334+
$$id: {value: ClientComponent.$$id},
335+
});
336+
webpackModules[consumerModuleId]=clientReference;
337+
338+
constcyclic={self: null};
339+
cyclic.self=cyclic;
340+
341+
conststream1=ReactServerDOMServer.renderToReadableStream(
342+
<React.Fragmentkey="this-key-is-important-to-repro-a-prior-cycle-serialization-bug">
343+
<ClientComponentdata={cyclic}/>
344+
</React.Fragment>,
345+
webpackMap,
346+
);
347+
348+
constpromise=ReactServerDOMClient.createFromReadableStream(stream1,{
349+
serverConsumerManifest: {
350+
moduleMap: {
351+
[clientModuleMetadata.id]: {
352+
'*': {
353+
id: consumerModuleId,
354+
chunks: [],
355+
name: '*',
356+
},
357+
},
358+
},
359+
moduleLoading: webpackModuleLoading,
360+
serverModuleMap: null,
361+
},
362+
});
363+
364+
consterrors=[];
365+
conststream2=awaitserverAct(()=>
366+
ReactServerDOMServer.renderToReadableStream(promise,webpackMap,{
367+
onError(error){
368+
errors.push(error);
369+
},
370+
}),
371+
);
372+
373+
expect(errors).toEqual([]);
374+
375+
constelement=awaitserverAct(()=>
376+
ReactServerDOMClient.createFromReadableStream(stream2,{
377+
serverConsumerManifest: {
378+
moduleMap: null,
379+
moduleLoading: null,
380+
},
381+
}),
382+
);
383+
384+
constssrStream=awaitserverAct(()=>
385+
ReactDOMServer.renderToReadableStream(element),
386+
);
387+
constresult=awaitreadResult(ssrStream);
388+
389+
expect(result).toBe('<div>Cycle resolved</div>');
390+
});
391+
324392
it('should be able to load a server reference on a consuming server if a mapping exists',async()=>{
325393
functiongreet(name){
326394
return'hi, '+name;

‎packages/react-server/src/ReactFlightServer.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3622,8 +3622,8 @@ function renderModelDestructive(
36223622
return renderModelDestructive(
36233623
request,
36243624
task,
3625-
emptyRoot,
3626-
'',
3625+
parent,
3626+
parentPropertyName,
36273627
resolvedModel,
36283628
);
36293629
}

0 commit comments

Comments
 (0)
, '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" + '
[Flight] Allow cyclic references to be serialized when unwrapping laz… · react/react@6baff7a · GitHub
Skip to content
Commit 6baff7a
Browse files
unstubbableunstubbable
authored
[Flight] Allow cyclic references to be serialized when unwrapping lazy elements (#35471)
When `renderModelDestructive` unwraps a lazy element and subsequently
calls `renderModelDestructive` again with the resolved model, we should
preserve the parent connection so that cyclic references can be
serialized properly. This can occur in an advanced scenario where the
result from the Flight Client is serialized again with the Flight
Server, e.g. for slicing a precomputed payload into multiple parts.
Note: The added test only fails when run with `--prod`. In dev mode, the
component info outlining prevents the issue from occurring.
1 parent bef88f7 commit 6baff7a
2 files changed
Lines changed: 70 additions & 2 deletions
File tree
‎packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMEdge-test.js‎
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,74 @@ describe('ReactFlightDOMEdge', () => {
321321
expect(result).toEqual('<span>Client Component</span>');
322322
});
323323

324+
it('should resolve cyclic references in client component props after two rounds of serialization and deserialization',async()=>{
325+
constClientComponent=clientExports(functionClientComponent({data}){
326+
return(
327+
<div>{data.self===data ? 'Cycle resolved' : 'Cycle broken'}</div>
328+
);
329+
});
330+
constclientModuleMetadata=webpackMap[ClientComponent.$$id];
331+
constconsumerModuleId='consumer-'+clientModuleMetadata.id;
332+
constclientReference=Object.defineProperties(ClientComponent,{
333+
$$typeof: {value: Symbol.for('react.client.reference')},
334+
$$id: {value: ClientComponent.$$id},
335+
});
336+
webpackModules[consumerModuleId]=clientReference;
337+
338+
constcyclic={self: null};
339+
cyclic.self=cyclic;
340+
341+
conststream1=ReactServerDOMServer.renderToReadableStream(
342+
<React.Fragmentkey="this-key-is-important-to-repro-a-prior-cycle-serialization-bug">
343+
<ClientComponentdata={cyclic}/>
344+
</React.Fragment>,
345+
webpackMap,
346+
);
347+
348+
constpromise=ReactServerDOMClient.createFromReadableStream(stream1,{
349+
serverConsumerManifest: {
350+
moduleMap: {
351+
[clientModuleMetadata.id]: {
352+
'*': {
353+
id: consumerModuleId,
354+
chunks: [],
355+
name: '*',
356+
},
357+
},
358+
},
359+
moduleLoading: webpackModuleLoading,
360+
serverModuleMap: null,
361+
},
362+
});
363+
364+
consterrors=[];
365+
conststream2=awaitserverAct(()=>
366+
ReactServerDOMServer.renderToReadableStream(promise,webpackMap,{
367+
onError(error){
368+
errors.push(error);
369+
},
370+
}),
371+
);
372+
373+
expect(errors).toEqual([]);
374+
375+
constelement=awaitserverAct(()=>
376+
ReactServerDOMClient.createFromReadableStream(stream2,{
377+
serverConsumerManifest: {
378+
moduleMap: null,
379+
moduleLoading: null,
380+
},
381+
}),
382+
);
383+
384+
constssrStream=awaitserverAct(()=>
385+
ReactDOMServer.renderToReadableStream(element),
386+
);
387+
constresult=awaitreadResult(ssrStream);
388+
389+
expect(result).toBe('<div>Cycle resolved</div>');
390+
});
391+
324392
it('should be able to load a server reference on a consuming server if a mapping exists',async()=>{
325393
functiongreet(name){
326394
return'hi, '+name;
‎packages/react-server/src/ReactFlightServer.js‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3622,8 +3622,8 @@ function renderModelDestructive(
36223622
 return renderModelDestructive(
36233623
 request,
36243624
 task,
3625-
emptyRoot,
3626-
'',
3625+
parent,
3626+
parentPropertyName,
36273627
 resolvedModel,
36283628
 );
36293629
}
0 commit comments
Comments
 (0)

, '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('^' + ".*" + '
[Flight] Allow cyclic references to be serialized when unwrapping laz… · react/react@6baff7a · GitHub
Skip to content
Commit 6baff7a
Browse files
unstubbableunstubbable
authored
[Flight] Allow cyclic references to be serialized when unwrapping lazy elements (#35471)
When `renderModelDestructive` unwraps a lazy element and subsequently
calls `renderModelDestructive` again with the resolved model, we should
preserve the parent connection so that cyclic references can be
serialized properly. This can occur in an advanced scenario where the
result from the Flight Client is serialized again with the Flight
Server, e.g. for slicing a precomputed payload into multiple parts.
Note: The added test only fails when run with `--prod`. In dev mode, the
component info outlining prevents the issue from occurring.
1 parent bef88f7 commit 6baff7a
2 files changed
Lines changed: 70 additions & 2 deletions
File tree
‎packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMEdge-test.js‎
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,74 @@ describe('ReactFlightDOMEdge', () => {
321321
expect(result).toEqual('<span>Client Component</span>');
322322
});
323323

324+
it('should resolve cyclic references in client component props after two rounds of serialization and deserialization',async()=>{
325+
constClientComponent=clientExports(functionClientComponent({data}){
326+
return(
327+
<div>{data.self===data ? 'Cycle resolved' : 'Cycle broken'}</div>
328+
);
329+
});
330+
constclientModuleMetadata=webpackMap[ClientComponent.$$id];
331+
constconsumerModuleId='consumer-'+clientModuleMetadata.id;
332+
constclientReference=Object.defineProperties(ClientComponent,{
333+
$$typeof: {value: Symbol.for('react.client.reference')},
334+
$$id: {value: ClientComponent.$$id},
335+
});
336+
webpackModules[consumerModuleId]=clientReference;
337+
338+
constcyclic={self: null};
339+
cyclic.self=cyclic;
340+
341+
conststream1=ReactServerDOMServer.renderToReadableStream(
342+
<React.Fragmentkey="this-key-is-important-to-repro-a-prior-cycle-serialization-bug">
343+
<ClientComponentdata={cyclic}/>
344+
</React.Fragment>,
345+
webpackMap,
346+
);
347+
348+
constpromise=ReactServerDOMClient.createFromReadableStream(stream1,{
349+
serverConsumerManifest: {
350+
moduleMap: {
351+
[clientModuleMetadata.id]: {
352+
'*': {
353+
id: consumerModuleId,
354+
chunks: [],
355+
name: '*',
356+
},
357+
},
358+
},
359+
moduleLoading: webpackModuleLoading,
360+
serverModuleMap: null,
361+
},
362+
});
363+
364+
consterrors=[];
365+
conststream2=awaitserverAct(()=>
366+
ReactServerDOMServer.renderToReadableStream(promise,webpackMap,{
367+
onError(error){
368+
errors.push(error);
369+
},
370+
}),
371+
);
372+
373+
expect(errors).toEqual([]);
374+
375+
constelement=awaitserverAct(()=>
376+
ReactServerDOMClient.createFromReadableStream(stream2,{
377+
serverConsumerManifest: {
378+
moduleMap: null,
379+
moduleLoading: null,
380+
},
381+
}),
382+
);
383+
384+
constssrStream=awaitserverAct(()=>
385+
ReactDOMServer.renderToReadableStream(element),
386+
);
387+
constresult=awaitreadResult(ssrStream);
388+
389+
expect(result).toBe('<div>Cycle resolved</div>');
390+
});
391+
324392
it('should be able to load a server reference on a consuming server if a mapping exists',async()=>{
325393
functiongreet(name){
326394
return'hi, '+name;
‎packages/react-server/src/ReactFlightServer.js‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3622,8 +3622,8 @@ function renderModelDestructive(
36223622
 return renderModelDestructive(
36233623
 request,
36243624
 task,
3625-
emptyRoot,
3626-
'',
3625+
parent,
3626+
parentPropertyName,
36273627
 resolvedModel,
36283628
 );
36293629
}
0 commit comments
Comments
 (0)

, '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('^' + ".*" + '
[Flight] Allow cyclic references to be serialized when unwrapping laz… · react/react@6baff7a · GitHub
Skip to content
Commit 6baff7a
Browse files
unstubbableunstubbable
authored
[Flight] Allow cyclic references to be serialized when unwrapping lazy elements (#35471)
When `renderModelDestructive` unwraps a lazy element and subsequently
calls `renderModelDestructive` again with the resolved model, we should
preserve the parent connection so that cyclic references can be
serialized properly. This can occur in an advanced scenario where the
result from the Flight Client is serialized again with the Flight
Server, e.g. for slicing a precomputed payload into multiple parts.
Note: The added test only fails when run with `--prod`. In dev mode, the
component info outlining prevents the issue from occurring.
1 parent bef88f7 commit 6baff7a
2 files changed
Lines changed: 70 additions & 2 deletions
File tree
‎packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMEdge-test.js‎
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,74 @@ describe('ReactFlightDOMEdge', () => {
321321
expect(result).toEqual('<span>Client Component</span>');
322322
});
323323

324+
it('should resolve cyclic references in client component props after two rounds of serialization and deserialization',async()=>{
325+
constClientComponent=clientExports(functionClientComponent({data}){
326+
return(
327+
<div>{data.self===data ? 'Cycle resolved' : 'Cycle broken'}</div>
328+
);
329+
});
330+
constclientModuleMetadata=webpackMap[ClientComponent.$$id];
331+
constconsumerModuleId='consumer-'+clientModuleMetadata.id;
332+
constclientReference=Object.defineProperties(ClientComponent,{
333+
$$typeof: {value: Symbol.for('react.client.reference')},
334+
$$id: {value: ClientComponent.$$id},
335+
});
336+
webpackModules[consumerModuleId]=clientReference;
337+
338+
constcyclic={self: null};
339+
cyclic.self=cyclic;
340+
341+
conststream1=ReactServerDOMServer.renderToReadableStream(
342+
<React.Fragmentkey="this-key-is-important-to-repro-a-prior-cycle-serialization-bug">
343+
<ClientComponentdata={cyclic}/>
344+
</React.Fragment>,
345+
webpackMap,
346+
);
347+
348+
constpromise=ReactServerDOMClient.createFromReadableStream(stream1,{
349+
serverConsumerManifest: {
350+
moduleMap: {
351+
[clientModuleMetadata.id]: {
352+
'*': {
353+
id: consumerModuleId,
354+
chunks: [],
355+
name: '*',
356+
},
357+
},
358+
},
359+
moduleLoading: webpackModuleLoading,
360+
serverModuleMap: null,
361+
},
362+
});
363+
364+
consterrors=[];
365+
conststream2=awaitserverAct(()=>
366+
ReactServerDOMServer.renderToReadableStream(promise,webpackMap,{
367+
onError(error){
368+
errors.push(error);
369+
},
370+
}),
371+
);
372+
373+
expect(errors).toEqual([]);
374+
375+
constelement=awaitserverAct(()=>
376+
ReactServerDOMClient.createFromReadableStream(stream2,{
377+
serverConsumerManifest: {
378+
moduleMap: null,
379+
moduleLoading: null,
380+
},
381+
}),
382+
);
383+
384+
constssrStream=awaitserverAct(()=>
385+
ReactDOMServer.renderToReadableStream(element),
386+
);
387+
constresult=awaitreadResult(ssrStream);
388+
389+
expect(result).toBe('<div>Cycle resolved</div>');
390+
});
391+
324392
it('should be able to load a server reference on a consuming server if a mapping exists',async()=>{
325393
functiongreet(name){
326394
return'hi, '+name;
‎packages/react-server/src/ReactFlightServer.js‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3622,8 +3622,8 @@ function renderModelDestructive(
36223622
 return renderModelDestructive(
36233623
 request,
36243624
 task,
3625-
emptyRoot,
3626-
'',
3625+
parent,
3626+
parentPropertyName,
36273627
 resolvedModel,
36283628
 );
36293629
}
0 commit comments
Comments
 (0)

, '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" + '
[Flight] Allow cyclic references to be serialized when unwrapping laz… · react/react@6baff7a · GitHub
Skip to content
Commit 6baff7a
Browse files
unstubbableunstubbable
authored
[Flight] Allow cyclic references to be serialized when unwrapping lazy elements (#35471)
When `renderModelDestructive` unwraps a lazy element and subsequently
calls `renderModelDestructive` again with the resolved model, we should
preserve the parent connection so that cyclic references can be
serialized properly. This can occur in an advanced scenario where the
result from the Flight Client is serialized again with the Flight
Server, e.g. for slicing a precomputed payload into multiple parts.
Note: The added test only fails when run with `--prod`. In dev mode, the
component info outlining prevents the issue from occurring.
1 parent bef88f7 commit 6baff7a
2 files changed
Lines changed: 70 additions & 2 deletions
File tree
‎packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMEdge-test.js‎
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,74 @@ describe('ReactFlightDOMEdge', () => {
321321
expect(result).toEqual('<span>Client Component</span>');
322322
});
323323

324+
it('should resolve cyclic references in client component props after two rounds of serialization and deserialization',async()=>{
325+
constClientComponent=clientExports(functionClientComponent({data}){
326+
return(
327+
<div>{data.self===data ? 'Cycle resolved' : 'Cycle broken'}</div>
328+
);
329+
});
330+
constclientModuleMetadata=webpackMap[ClientComponent.$$id];
331+
constconsumerModuleId='consumer-'+clientModuleMetadata.id;
332+
constclientReference=Object.defineProperties(ClientComponent,{
333+
$$typeof: {value: Symbol.for('react.client.reference')},
334+
$$id: {value: ClientComponent.$$id},
335+
});
336+
webpackModules[consumerModuleId]=clientReference;
337+
338+
constcyclic={self: null};
339+
cyclic.self=cyclic;
340+
341+
conststream1=ReactServerDOMServer.renderToReadableStream(
342+
<React.Fragmentkey="this-key-is-important-to-repro-a-prior-cycle-serialization-bug">
343+
<ClientComponentdata={cyclic}/>
344+
</React.Fragment>,
345+
webpackMap,
346+
);
347+
348+
constpromise=ReactServerDOMClient.createFromReadableStream(stream1,{
349+
serverConsumerManifest: {
350+
moduleMap: {
351+
[clientModuleMetadata.id]: {
352+
'*': {
353+
id: consumerModuleId,
354+
chunks: [],
355+
name: '*',
356+
},
357+
},
358+
},
359+
moduleLoading: webpackModuleLoading,
360+
serverModuleMap: null,
361+
},
362+
});
363+
364+
consterrors=[];
365+
conststream2=awaitserverAct(()=>
366+
ReactServerDOMServer.renderToReadableStream(promise,webpackMap,{
367+
onError(error){
368+
errors.push(error);
369+
},
370+
}),
371+
);
372+
373+
expect(errors).toEqual([]);
374+
375+
constelement=awaitserverAct(()=>
376+
ReactServerDOMClient.createFromReadableStream(stream2,{
377+
serverConsumerManifest: {
378+
moduleMap: null,
379+
moduleLoading: null,
380+
},
381+
}),
382+
);
383+
384+
constssrStream=awaitserverAct(()=>
385+
ReactDOMServer.renderToReadableStream(element),
386+
);
387+
constresult=awaitreadResult(ssrStream);
388+
389+
expect(result).toBe('<div>Cycle resolved</div>');
390+
});
391+
324392
it('should be able to load a server reference on a consuming server if a mapping exists',async()=>{
325393
functiongreet(name){
326394
return'hi, '+name;
‎packages/react-server/src/ReactFlightServer.js‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3622,8 +3622,8 @@ function renderModelDestructive(
36223622
 return renderModelDestructive(
36233623
 request,
36243624
 task,
3625-
emptyRoot,
3626-
'',
3625+
parent,
3626+
parentPropertyName,
36273627
 resolvedModel,
36283628
 );
36293629
}
0 commit comments
Comments
 (0)

, '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('^' + ".*" + '
[Flight] Allow cyclic references to be serialized when unwrapping laz… · react/react@6baff7a · GitHub
Skip to content
Commit 6baff7a
Browse files
unstubbableunstubbable
authored
[Flight] Allow cyclic references to be serialized when unwrapping lazy elements (#35471)
When `renderModelDestructive` unwraps a lazy element and subsequently
calls `renderModelDestructive` again with the resolved model, we should
preserve the parent connection so that cyclic references can be
serialized properly. This can occur in an advanced scenario where the
result from the Flight Client is serialized again with the Flight
Server, e.g. for slicing a precomputed payload into multiple parts.
Note: The added test only fails when run with `--prod`. In dev mode, the
component info outlining prevents the issue from occurring.
1 parent bef88f7 commit 6baff7a
2 files changed
Lines changed: 70 additions & 2 deletions
File tree
‎packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMEdge-test.js‎
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,74 @@ describe('ReactFlightDOMEdge', () => {
321321
expect(result).toEqual('<span>Client Component</span>');
322322
});
323323

324+
it('should resolve cyclic references in client component props after two rounds of serialization and deserialization',async()=>{
325+
constClientComponent=clientExports(functionClientComponent({data}){
326+
return(
327+
<div>{data.self===data ? 'Cycle resolved' : 'Cycle broken'}</div>
328+
);
329+
});
330+
constclientModuleMetadata=webpackMap[ClientComponent.$$id];
331+
constconsumerModuleId='consumer-'+clientModuleMetadata.id;
332+
constclientReference=Object.defineProperties(ClientComponent,{
333+
$$typeof: {value: Symbol.for('react.client.reference')},
334+
$$id: {value: ClientComponent.$$id},
335+
});
336+
webpackModules[consumerModuleId]=clientReference;
337+
338+
constcyclic={self: null};
339+
cyclic.self=cyclic;
340+
341+
conststream1=ReactServerDOMServer.renderToReadableStream(
342+
<React.Fragmentkey="this-key-is-important-to-repro-a-prior-cycle-serialization-bug">
343+
<ClientComponentdata={cyclic}/>
344+
</React.Fragment>,
345+
webpackMap,
346+
);
347+
348+
constpromise=ReactServerDOMClient.createFromReadableStream(stream1,{
349+
serverConsumerManifest: {
350+
moduleMap: {
351+
[clientModuleMetadata.id]: {
352+
'*': {
353+
id: consumerModuleId,
354+
chunks: [],
355+
name: '*',
356+
},
357+
},
358+
},
359+
moduleLoading: webpackModuleLoading,
360+
serverModuleMap: null,
361+
},
362+
});
363+
364+
consterrors=[];
365+
conststream2=awaitserverAct(()=>
366+
ReactServerDOMServer.renderToReadableStream(promise,webpackMap,{
367+
onError(error){
368+
errors.push(error);
369+
},
370+
}),
371+
);
372+
373+
expect(errors).toEqual([]);
374+
375+
constelement=awaitserverAct(()=>
376+
ReactServerDOMClient.createFromReadableStream(stream2,{
377+
serverConsumerManifest: {
378+
moduleMap: null,
379+
moduleLoading: null,
380+
},
381+
}),
382+
);
383+
384+
constssrStream=awaitserverAct(()=>
385+
ReactDOMServer.renderToReadableStream(element),
386+
);
387+
constresult=awaitreadResult(ssrStream);
388+
389+
expect(result).toBe('<div>Cycle resolved</div>');
390+
});
391+
324392
it('should be able to load a server reference on a consuming server if a mapping exists',async()=>{
325393
functiongreet(name){
326394
return'hi, '+name;
‎packages/react-server/src/ReactFlightServer.js‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3622,8 +3622,8 @@ function renderModelDestructive(
36223622
 return renderModelDestructive(
36233623
 request,
36243624
 task,
3625-
emptyRoot,
3626-
'',
3625+
parent,
3626+
parentPropertyName,
36273627
 resolvedModel,
36283628
 );
36293629
}
0 commit comments
Comments
 (0)

, '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('^' + ".*" + '
[Flight] Allow cyclic references to be serialized when unwrapping laz… · react/react@6baff7a · GitHub
Skip to content
Commit 6baff7a
Browse files
unstubbableunstubbable
authored
[Flight] Allow cyclic references to be serialized when unwrapping lazy elements (#35471)
When `renderModelDestructive` unwraps a lazy element and subsequently
calls `renderModelDestructive` again with the resolved model, we should
preserve the parent connection so that cyclic references can be
serialized properly. This can occur in an advanced scenario where the
result from the Flight Client is serialized again with the Flight
Server, e.g. for slicing a precomputed payload into multiple parts.
Note: The added test only fails when run with `--prod`. In dev mode, the
component info outlining prevents the issue from occurring.
1 parent bef88f7 commit 6baff7a
2 files changed
Lines changed: 70 additions & 2 deletions
File tree
‎packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMEdge-test.js‎
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,74 @@ describe('ReactFlightDOMEdge', () => {
321321
expect(result).toEqual('<span>Client Component</span>');
322322
});
323323

324+
it('should resolve cyclic references in client component props after two rounds of serialization and deserialization',async()=>{
325+
constClientComponent=clientExports(functionClientComponent({data}){
326+
return(
327+
<div>{data.self===data ? 'Cycle resolved' : 'Cycle broken'}</div>
328+
);
329+
});
330+
constclientModuleMetadata=webpackMap[ClientComponent.$$id];
331+
constconsumerModuleId='consumer-'+clientModuleMetadata.id;
332+
constclientReference=Object.defineProperties(ClientComponent,{
333+
$$typeof: {value: Symbol.for('react.client.reference')},
334+
$$id: {value: ClientComponent.$$id},
335+
});
336+
webpackModules[consumerModuleId]=clientReference;
337+
338+
constcyclic={self: null};
339+
cyclic.self=cyclic;
340+
341+
conststream1=ReactServerDOMServer.renderToReadableStream(
342+
<React.Fragmentkey="this-key-is-important-to-repro-a-prior-cycle-serialization-bug">
343+
<ClientComponentdata={cyclic}/>
344+
</React.Fragment>,
345+
webpackMap,
346+
);
347+
348+
constpromise=ReactServerDOMClient.createFromReadableStream(stream1,{
349+
serverConsumerManifest: {
350+
moduleMap: {
351+
[clientModuleMetadata.id]: {
352+
'*': {
353+
id: consumerModuleId,
354+
chunks: [],
355+
name: '*',
356+
},
357+
},
358+
},
359+
moduleLoading: webpackModuleLoading,
360+
serverModuleMap: null,
361+
},
362+
});
363+
364+
consterrors=[];
365+
conststream2=awaitserverAct(()=>
366+
ReactServerDOMServer.renderToReadableStream(promise,webpackMap,{
367+
onError(error){
368+
errors.push(error);
369+
},
370+
}),
371+
);
372+
373+
expect(errors).toEqual([]);
374+
375+
constelement=awaitserverAct(()=>
376+
ReactServerDOMClient.createFromReadableStream(stream2,{
377+
serverConsumerManifest: {
378+
moduleMap: null,
379+
moduleLoading: null,
380+
},
381+
}),
382+
);
383+
384+
constssrStream=awaitserverAct(()=>
385+
ReactDOMServer.renderToReadableStream(element),
386+
);
387+
constresult=awaitreadResult(ssrStream);
388+
389+
expect(result).toBe('<div>Cycle resolved</div>');
390+
});
391+
324392
it('should be able to load a server reference on a consuming server if a mapping exists',async()=>{
325393
functiongreet(name){
326394
return'hi, '+name;
‎packages/react-server/src/ReactFlightServer.js‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3622,8 +3622,8 @@ function renderModelDestructive(
36223622
 return renderModelDestructive(
36233623
 request,
36243624
 task,
3625-
emptyRoot,
3626-
'',
3625+
parent,
3626+
parentPropertyName,
36273627
 resolvedModel,
36283628
 );
36293629
}
0 commit comments
Comments
 (0)

, '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); }
})();
})();
[Flight] Allow cyclic references to be serialized when unwrapping laz… · react/react@6baff7a · GitHub
Skip to content
Commit 6baff7a
Browse files
unstubbableunstubbable
authored
[Flight] Allow cyclic references to be serialized when unwrapping lazy elements (#35471)
When `renderModelDestructive` unwraps a lazy element and subsequently
calls `renderModelDestructive` again with the resolved model, we should
preserve the parent connection so that cyclic references can be
serialized properly. This can occur in an advanced scenario where the
result from the Flight Client is serialized again with the Flight
Server, e.g. for slicing a precomputed payload into multiple parts.
Note: The added test only fails when run with `--prod`. In dev mode, the
component info outlining prevents the issue from occurring.
1 parent bef88f7 commit 6baff7a
2 files changed
Lines changed: 70 additions & 2 deletions
File tree
‎packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMEdge-test.js‎
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,74 @@ describe('ReactFlightDOMEdge', () => {
321321
expect(result).toEqual('<span>Client Component</span>');
322322
});
323323

324+
it('should resolve cyclic references in client component props after two rounds of serialization and deserialization',async()=>{
325+
constClientComponent=clientExports(functionClientComponent({data}){
326+
return(
327+
<div>{data.self===data ? 'Cycle resolved' : 'Cycle broken'}</div>
328+
);
329+
});
330+
constclientModuleMetadata=webpackMap[ClientComponent.$$id];
331+
constconsumerModuleId='consumer-'+clientModuleMetadata.id;
332+
constclientReference=Object.defineProperties(ClientComponent,{
333+
$$typeof: {value: Symbol.for('react.client.reference')},
334+
$$id: {value: ClientComponent.$$id},
335+
});
336+
webpackModules[consumerModuleId]=clientReference;
337+
338+
constcyclic={self: null};
339+
cyclic.self=cyclic;
340+
341+
conststream1=ReactServerDOMServer.renderToReadableStream(
342+
<React.Fragmentkey="this-key-is-important-to-repro-a-prior-cycle-serialization-bug">
343+
<ClientComponentdata={cyclic}/>
344+
</React.Fragment>,
345+
webpackMap,
346+
);
347+
348+
constpromise=ReactServerDOMClient.createFromReadableStream(stream1,{
349+
serverConsumerManifest: {
350+
moduleMap: {
351+
[clientModuleMetadata.id]: {
352+
'*': {
353+
id: consumerModuleId,
354+
chunks: [],
355+
name: '*',
356+
},
357+
},
358+
},
359+
moduleLoading: webpackModuleLoading,
360+
serverModuleMap: null,
361+
},
362+
});
363+
364+
consterrors=[];
365+
conststream2=awaitserverAct(()=>
366+
ReactServerDOMServer.renderToReadableStream(promise,webpackMap,{
367+
onError(error){
368+
errors.push(error);
369+
},
370+
}),
371+
);
372+
373+
expect(errors).toEqual([]);
374+
375+
constelement=awaitserverAct(()=>
376+
ReactServerDOMClient.createFromReadableStream(stream2,{
377+
serverConsumerManifest: {
378+
moduleMap: null,
379+
moduleLoading: null,
380+
},
381+
}),
382+
);
383+
384+
constssrStream=awaitserverAct(()=>
385+
ReactDOMServer.renderToReadableStream(element),
386+
);
387+
constresult=awaitreadResult(ssrStream);
388+
389+
expect(result).toBe('<div>Cycle resolved</div>');
390+
});
391+
324392
it('should be able to load a server reference on a consuming server if a mapping exists',async()=>{
325393
functiongreet(name){
326394
return'hi, '+name;
‎packages/react-server/src/ReactFlightServer.js‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3622,8 +3622,8 @@ function renderModelDestructive(
36223622
 return renderModelDestructive(
36233623
 request,
36243624
 task,
3625-
emptyRoot,
3626-
'',
3625+
parent,
3626+
parentPropertyName,
36273627
 resolvedModel,
36283628
 );
36293629
}
0 commit comments
Comments
 (0)