Skip to content

Commit 6a8a8ef

Browse files
eps1loneps1lon
authored
[Flight] Add <Activity> (#34697)
1 parent f89ed71 commit 6a8a8ef

6 files changed

Lines changed: 140 additions & 2 deletions

File tree

‎packages/react-reconciler/src/__tests__/ActivityReactServer-test.js‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
/**
2+
* Copyright (c) Meta Platforms, Inc. and affiliates.
3+
*
4+
* This source code is licensed under the MIT license found in the
5+
* LICENSE file in the root directory of this source tree.
6+
*
7+
* @emails react-core
8+
* @jest-environment node
9+
*/
10+
11+
'use strict';
12+
13+
letact;
14+
letActivity;
15+
letReact;
16+
letReactServer;
17+
letReactNoop;
18+
letReactNoopFlightClient;
19+
letReactNoopFlightServer;
20+
21+
describe('ActivityReactServer',()=>{
22+
beforeEach(()=>{
23+
jest.resetModules();
24+
jest.mock('react',()=>require('react/react.react-server'));
25+
ReactServer=require('react');
26+
Activity=ReactServer.Activity;
27+
ReactNoopFlightServer=require('react-noop-renderer/flight-server');
28+
29+
jest.resetModules();
30+
__unmockReact();
31+
React=require('react');
32+
ReactNoopFlightClient=require('react-noop-renderer/flight-client');
33+
ReactNoop=require('react-noop-renderer');
34+
constInternalTestUtils=require('internal-test-utils');
35+
act=InternalTestUtils.act;
36+
});
37+
38+
afterEach(()=>{
39+
jest.restoreAllMocks();
40+
});
41+
42+
it('can be rendered in React Server',async()=>{
43+
functionApp(){
44+
returnReactServer.createElement(
45+
Activity,
46+
{mode: 'hidden'},
47+
ReactServer.createElement('div',null,'Hello, Dave!'),
48+
);
49+
}
50+
51+
consttransport=ReactNoopFlightServer.render(
52+
ReactServer.createElement(App,null),
53+
);
54+
55+
awaitact(async()=>{
56+
constapp=awaitReactNoopFlightClient.read(transport);
57+
58+
ReactNoop.render(app);
59+
});
60+
61+
expect(ReactNoop).toMatchRenderedOutput(
62+
<divhidden={true}>Hello, Dave!</div>,
63+
);
64+
});
65+
});

‎packages/react-reconciler/src/__tests__/ViewTransitionReactServer-test.js‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
/**
2+
* Copyright (c) Meta Platforms, Inc. and affiliates.
3+
*
4+
* This source code is licensed under the MIT license found in the
5+
* LICENSE file in the root directory of this source tree.
6+
*
7+
* @emails react-core
8+
* @jest-environment node
9+
*/
10+
11+
'use strict';
12+
13+
letact;
14+
letViewTransition;
15+
letReact;
16+
letReactServer;
17+
letReactNoop;
18+
letReactNoopFlightClient;
19+
letReactNoopFlightServer;
20+
21+
describe('ViewTransitionReactServer',()=>{
22+
beforeEach(()=>{
23+
jest.resetModules();
24+
jest.mock('react',()=>require('react/react.react-server'));
25+
ReactServer=require('react');
26+
ViewTransition=ReactServer.unstable_ViewTransition;
27+
ReactNoopFlightServer=require('react-noop-renderer/flight-server');
28+
29+
jest.resetModules();
30+
__unmockReact();
31+
React=require('react');
32+
ReactNoopFlightClient=require('react-noop-renderer/flight-client');
33+
ReactNoop=require('react-noop-renderer');
34+
constInternalTestUtils=require('internal-test-utils');
35+
act=InternalTestUtils.act;
36+
});
37+
38+
afterEach(()=>{
39+
jest.restoreAllMocks();
40+
});
41+
42+
// @gate enableViewTransition || fb
43+
it('can be rendered in React Server',async()=>{
44+
functionApp(){
45+
returnReactServer.createElement(
46+
ViewTransition,
47+
{},
48+
ReactServer.createElement('div',null,'Hello, Dave!'),
49+
);
50+
}
51+
52+
consttransport=ReactNoopFlightServer.render(
53+
ReactServer.createElement(App,null),
54+
);
55+
56+
awaitact(async()=>{
57+
constapp=awaitReactNoopFlightClient.read(transport);
58+
59+
ReactNoop.render(app);
60+
});
61+
62+
expect(ReactNoop).toMatchRenderedOutput(<div>Hello, Dave!</div>);
63+
});
64+
});

‎packages/react/src/ReactServer.experimental.development.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ export {
5858

5959
export{
6060
Children,
61+
REACT_ACTIVITY_TYPEasActivity,
6162
REACT_FRAGMENT_TYPEasFragment,
6263
REACT_PROFILER_TYPEasProfiler,
6364
REACT_STRICT_MODE_TYPEasStrictMode,
@@ -83,6 +84,5 @@ export {
8384
// Experimental
8485
REACT_SUSPENSE_LIST_TYPEasunstable_SuspenseList,
8586
REACT_VIEW_TRANSITION_TYPEasunstable_ViewTransition,
86-
REACT_ACTIVITY_TYPEasunstable_Activity,
8787
captureOwnerStack,// DEV-only
8888
};

‎packages/react/src/ReactServer.experimental.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ export {
5757

5858
export{
5959
Children,
60+
REACT_ACTIVITY_TYPEasActivity,
6061
REACT_FRAGMENT_TYPEasFragment,
6162
REACT_PROFILER_TYPEasProfiler,
6263
REACT_STRICT_MODE_TYPEasStrictMode,
@@ -82,5 +83,4 @@ export {
8283
// Experimental
8384
REACT_SUSPENSE_LIST_TYPEasunstable_SuspenseList,
8485
REACT_VIEW_TRANSITION_TYPEasunstable_ViewTransition,
85-
REACT_ACTIVITY_TYPEasActivity,
8686
};

‎packages/react/src/ReactServer.fb.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,13 @@ export {default as __SERVER_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRA
1212
import{forEach,map,count,toArray,only}from'./ReactChildren';
1313
import{captureOwnerStackascaptureOwnerStackImpl}from'./ReactOwnerStack';
1414
import{
15+
REACT_ACTIVITY_TYPE,
1516
REACT_FRAGMENT_TYPE,
1617
REACT_PROFILER_TYPE,
1718
REACT_STRICT_MODE_TYPE,
1819
REACT_SUSPENSE_TYPE,
20+
REACT_SUSPENSE_LIST_TYPE,
21+
REACT_VIEW_TRANSITION_TYPE,
1922
}from'shared/ReactSymbols';
2023
import{
2124
cloneElement,
@@ -45,6 +48,7 @@ if (__DEV__) {
4548

4649
export{
4750
Children,
51+
REACT_ACTIVITY_TYPEasActivity,
4852
REACT_FRAGMENT_TYPEasFragment,
4953
REACT_PROFILER_TYPEasProfiler,
5054
REACT_STRICT_MODE_TYPEasStrictMode,
@@ -65,4 +69,7 @@ export {
6569
useMemo,
6670
version,
6771
captureOwnerStack,// DEV-only
72+
// Experimental
73+
REACT_SUSPENSE_LIST_TYPEasunstable_SuspenseList,
74+
REACT_VIEW_TRANSITION_TYPEasunstable_ViewTransition,
6875
};

‎packages/react/src/ReactServer.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export {default as __SERVER_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRA
1111

1212
import{forEach,map,count,toArray,only}from'./ReactChildren';
1313
import{
14+
REACT_ACTIVITY_TYPE,
1415
REACT_FRAGMENT_TYPE,
1516
REACT_PROFILER_TYPE,
1617
REACT_STRICT_MODE_TYPE,
@@ -40,6 +41,7 @@ const Children = {
4041

4142
export{
4243
Children,
44+
REACT_ACTIVITY_TYPEasActivity,
4345
REACT_FRAGMENT_TYPEasFragment,
4446
REACT_PROFILER_TYPEasProfiler,
4547
REACT_STRICT_MODE_TYPEasStrictMode,

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] Add `<Activity>` (#34697) · react/react@6a8a8ef · GitHub
Skip to content
Commit 6a8a8ef
Browse files
eps1loneps1lon
authored
[Flight] Add <Activity> (#34697)
1 parent f89ed71 commit 6a8a8ef
6 files changed
Lines changed: 140 additions & 2 deletions
File tree
‎packages/react-reconciler/src/__tests__/ActivityReactServer-test.js‎
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
/**
2+
 * Copyright (c) Meta Platforms, Inc. and affiliates.
3+
 *
4+
 * This source code is licensed under the MIT license found in the
5+
 * LICENSE file in the root directory of this source tree.
6+
 *
7+
 * @emails react-core
8+
 * @jest-environment node
9+
 */
10+
11+
'use strict';
12+
13+
letact;
14+
letActivity;
15+
letReact;
16+
letReactServer;
17+
letReactNoop;
18+
letReactNoopFlightClient;
19+
letReactNoopFlightServer;
20+
21+
describe('ActivityReactServer',()=>{
22+
beforeEach(()=>{
23+
jest.resetModules();
24+
jest.mock('react',()=>require('react/react.react-server'));
25+
ReactServer=require('react');
26+
Activity=ReactServer.Activity;
27+
ReactNoopFlightServer=require('react-noop-renderer/flight-server');
28+
29+
jest.resetModules();
30+
__unmockReact();
31+
React=require('react');
32+
ReactNoopFlightClient=require('react-noop-renderer/flight-client');
33+
ReactNoop=require('react-noop-renderer');
34+
constInternalTestUtils=require('internal-test-utils');
35+
act=InternalTestUtils.act;
36+
});
37+
38+
afterEach(()=>{
39+
jest.restoreAllMocks();
40+
});
41+
42+
it('can be rendered in React Server',async()=>{
43+
functionApp(){
44+
returnReactServer.createElement(
45+
Activity,
46+
{mode: 'hidden'},
47+
ReactServer.createElement('div',null,'Hello, Dave!'),
48+
);
49+
}
50+
51+
consttransport=ReactNoopFlightServer.render(
52+
ReactServer.createElement(App,null),
53+
);
54+
55+
awaitact(async()=>{
56+
constapp=awaitReactNoopFlightClient.read(transport);
57+
58+
ReactNoop.render(app);
59+
});
60+
61+
expect(ReactNoop).toMatchRenderedOutput(
62+
<divhidden={true}>Hello, Dave!</div>,
63+
);
64+
});
65+
});
‎packages/react-reconciler/src/__tests__/ViewTransitionReactServer-test.js‎
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
/**
2+
 * Copyright (c) Meta Platforms, Inc. and affiliates.
3+
 *
4+
 * This source code is licensed under the MIT license found in the
5+
 * LICENSE file in the root directory of this source tree.
6+
 *
7+
 * @emails react-core
8+
 * @jest-environment node
9+
 */
10+
11+
'use strict';
12+
13+
letact;
14+
letViewTransition;
15+
letReact;
16+
letReactServer;
17+
letReactNoop;
18+
letReactNoopFlightClient;
19+
letReactNoopFlightServer;
20+
21+
describe('ViewTransitionReactServer',()=>{
22+
beforeEach(()=>{
23+
jest.resetModules();
24+
jest.mock('react',()=>require('react/react.react-server'));
25+
ReactServer=require('react');
26+
ViewTransition=ReactServer.unstable_ViewTransition;
27+
ReactNoopFlightServer=require('react-noop-renderer/flight-server');
28+
29+
jest.resetModules();
30+
__unmockReact();
31+
React=require('react');
32+
ReactNoopFlightClient=require('react-noop-renderer/flight-client');
33+
ReactNoop=require('react-noop-renderer');
34+
constInternalTestUtils=require('internal-test-utils');
35+
act=InternalTestUtils.act;
36+
});
37+
38+
afterEach(()=>{
39+
jest.restoreAllMocks();
40+
});
41+
42+
// @gate enableViewTransition || fb
43+
it('can be rendered in React Server',async()=>{
44+
functionApp(){
45+
returnReactServer.createElement(
46+
ViewTransition,
47+
{},
48+
ReactServer.createElement('div',null,'Hello, Dave!'),
49+
);
50+
}
51+
52+
consttransport=ReactNoopFlightServer.render(
53+
ReactServer.createElement(App,null),
54+
);
55+
56+
awaitact(async()=>{
57+
constapp=awaitReactNoopFlightClient.read(transport);
58+
59+
ReactNoop.render(app);
60+
});
61+
62+
expect(ReactNoop).toMatchRenderedOutput(<div>Hello, Dave!</div>);
63+
});
64+
});
‎packages/react/src/ReactServer.experimental.development.js‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ export {
5858

5959
export{
6060
Children,
61+
REACT_ACTIVITY_TYPEasActivity,
6162
REACT_FRAGMENT_TYPEasFragment,
6263
REACT_PROFILER_TYPEasProfiler,
6364
REACT_STRICT_MODE_TYPEasStrictMode,
@@ -83,6 +84,5 @@ export {
8384
// Experimental
8485
REACT_SUSPENSE_LIST_TYPEasunstable_SuspenseList,
8586
REACT_VIEW_TRANSITION_TYPEasunstable_ViewTransition,
86-
REACT_ACTIVITY_TYPEasunstable_Activity,
8787
captureOwnerStack,// DEV-only
8888
};
‎packages/react/src/ReactServer.experimental.js‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ export {
5757

5858
export{
5959
Children,
60+
REACT_ACTIVITY_TYPEasActivity,
6061
REACT_FRAGMENT_TYPEasFragment,
6162
REACT_PROFILER_TYPEasProfiler,
6263
REACT_STRICT_MODE_TYPEasStrictMode,
@@ -82,5 +83,4 @@ export {
8283
// Experimental
8384
REACT_SUSPENSE_LIST_TYPEasunstable_SuspenseList,
8485
REACT_VIEW_TRANSITION_TYPEasunstable_ViewTransition,
85-
REACT_ACTIVITY_TYPEasActivity,
8686
};
‎packages/react/src/ReactServer.fb.js‎
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,13 @@ export {default as __SERVER_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRA
1212
import{forEach,map,count,toArray,only}from'./ReactChildren';
1313
import{captureOwnerStackascaptureOwnerStackImpl}from'./ReactOwnerStack';
1414
import{
15+
REACT_ACTIVITY_TYPE,
1516
REACT_FRAGMENT_TYPE,
1617
REACT_PROFILER_TYPE,
1718
REACT_STRICT_MODE_TYPE,
1819
REACT_SUSPENSE_TYPE,
20+
REACT_SUSPENSE_LIST_TYPE,
21+
REACT_VIEW_TRANSITION_TYPE,
1922
}from'shared/ReactSymbols';
2023
import{
2124
cloneElement,
@@ -45,6 +48,7 @@ if (__DEV__) {
4548

4649
export{
4750
Children,
51+
REACT_ACTIVITY_TYPEasActivity,
4852
REACT_FRAGMENT_TYPEasFragment,
4953
REACT_PROFILER_TYPEasProfiler,
5054
REACT_STRICT_MODE_TYPEasStrictMode,
@@ -65,4 +69,7 @@ export {
6569
useMemo,
6670
version,
6771
captureOwnerStack,// DEV-only
72+
// Experimental
73+
REACT_SUSPENSE_LIST_TYPEasunstable_SuspenseList,
74+
REACT_VIEW_TRANSITION_TYPEasunstable_ViewTransition,
6875
};
‎packages/react/src/ReactServer.js‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export {default as __SERVER_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRA
1111

1212
import{forEach,map,count,toArray,only}from'./ReactChildren';
1313
import{
14+
REACT_ACTIVITY_TYPE,
1415
REACT_FRAGMENT_TYPE,
1516
REACT_PROFILER_TYPE,
1617
REACT_STRICT_MODE_TYPE,
@@ -40,6 +41,7 @@ const Children = {
4041

4142
export{
4243
Children,
44+
REACT_ACTIVITY_TYPEasActivity,
4345
REACT_FRAGMENT_TYPEasFragment,
4446
REACT_PROFILER_TYPEasProfiler,
4547
REACT_STRICT_MODE_TYPEasStrictMode,
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] Add `<Activity>` (#34697) · react/react@6a8a8ef · GitHub
Skip to content
Commit 6a8a8ef
Browse files
eps1loneps1lon
authored
[Flight] Add <Activity> (#34697)
1 parent f89ed71 commit 6a8a8ef
6 files changed
Lines changed: 140 additions & 2 deletions
File tree
‎packages/react-reconciler/src/__tests__/ActivityReactServer-test.js‎
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
/**
2+
 * Copyright (c) Meta Platforms, Inc. and affiliates.
3+
 *
4+
 * This source code is licensed under the MIT license found in the
5+
 * LICENSE file in the root directory of this source tree.
6+
 *
7+
 * @emails react-core
8+
 * @jest-environment node
9+
 */
10+
11+
'use strict';
12+
13+
letact;
14+
letActivity;
15+
letReact;
16+
letReactServer;
17+
letReactNoop;
18+
letReactNoopFlightClient;
19+
letReactNoopFlightServer;
20+
21+
describe('ActivityReactServer',()=>{
22+
beforeEach(()=>{
23+
jest.resetModules();
24+
jest.mock('react',()=>require('react/react.react-server'));
25+
ReactServer=require('react');
26+
Activity=ReactServer.Activity;
27+
ReactNoopFlightServer=require('react-noop-renderer/flight-server');
28+
29+
jest.resetModules();
30+
__unmockReact();
31+
React=require('react');
32+
ReactNoopFlightClient=require('react-noop-renderer/flight-client');
33+
ReactNoop=require('react-noop-renderer');
34+
constInternalTestUtils=require('internal-test-utils');
35+
act=InternalTestUtils.act;
36+
});
37+
38+
afterEach(()=>{
39+
jest.restoreAllMocks();
40+
});
41+
42+
it('can be rendered in React Server',async()=>{
43+
functionApp(){
44+
returnReactServer.createElement(
45+
Activity,
46+
{mode: 'hidden'},
47+
ReactServer.createElement('div',null,'Hello, Dave!'),
48+
);
49+
}
50+
51+
consttransport=ReactNoopFlightServer.render(
52+
ReactServer.createElement(App,null),
53+
);
54+
55+
awaitact(async()=>{
56+
constapp=awaitReactNoopFlightClient.read(transport);
57+
58+
ReactNoop.render(app);
59+
});
60+
61+
expect(ReactNoop).toMatchRenderedOutput(
62+
<divhidden={true}>Hello, Dave!</div>,
63+
);
64+
});
65+
});
‎packages/react-reconciler/src/__tests__/ViewTransitionReactServer-test.js‎
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
/**
2+
 * Copyright (c) Meta Platforms, Inc. and affiliates.
3+
 *
4+
 * This source code is licensed under the MIT license found in the
5+
 * LICENSE file in the root directory of this source tree.
6+
 *
7+
 * @emails react-core
8+
 * @jest-environment node
9+
 */
10+
11+
'use strict';
12+
13+
letact;
14+
letViewTransition;
15+
letReact;
16+
letReactServer;
17+
letReactNoop;
18+
letReactNoopFlightClient;
19+
letReactNoopFlightServer;
20+
21+
describe('ViewTransitionReactServer',()=>{
22+
beforeEach(()=>{
23+
jest.resetModules();
24+
jest.mock('react',()=>require('react/react.react-server'));
25+
ReactServer=require('react');
26+
ViewTransition=ReactServer.unstable_ViewTransition;
27+
ReactNoopFlightServer=require('react-noop-renderer/flight-server');
28+
29+
jest.resetModules();
30+
__unmockReact();
31+
React=require('react');
32+
ReactNoopFlightClient=require('react-noop-renderer/flight-client');
33+
ReactNoop=require('react-noop-renderer');
34+
constInternalTestUtils=require('internal-test-utils');
35+
act=InternalTestUtils.act;
36+
});
37+
38+
afterEach(()=>{
39+
jest.restoreAllMocks();
40+
});
41+
42+
// @gate enableViewTransition || fb
43+
it('can be rendered in React Server',async()=>{
44+
functionApp(){
45+
returnReactServer.createElement(
46+
ViewTransition,
47+
{},
48+
ReactServer.createElement('div',null,'Hello, Dave!'),
49+
);
50+
}
51+
52+
consttransport=ReactNoopFlightServer.render(
53+
ReactServer.createElement(App,null),
54+
);
55+
56+
awaitact(async()=>{
57+
constapp=awaitReactNoopFlightClient.read(transport);
58+
59+
ReactNoop.render(app);
60+
});
61+
62+
expect(ReactNoop).toMatchRenderedOutput(<div>Hello, Dave!</div>);
63+
});
64+
});
‎packages/react/src/ReactServer.experimental.development.js‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ export {
5858

5959
export{
6060
Children,
61+
REACT_ACTIVITY_TYPEasActivity,
6162
REACT_FRAGMENT_TYPEasFragment,
6263
REACT_PROFILER_TYPEasProfiler,
6364
REACT_STRICT_MODE_TYPEasStrictMode,
@@ -83,6 +84,5 @@ export {
8384
// Experimental
8485
REACT_SUSPENSE_LIST_TYPEasunstable_SuspenseList,
8586
REACT_VIEW_TRANSITION_TYPEasunstable_ViewTransition,
86-
REACT_ACTIVITY_TYPEasunstable_Activity,
8787
captureOwnerStack,// DEV-only
8888
};
‎packages/react/src/ReactServer.experimental.js‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ export {
5757

5858
export{
5959
Children,
60+
REACT_ACTIVITY_TYPEasActivity,
6061
REACT_FRAGMENT_TYPEasFragment,
6162
REACT_PROFILER_TYPEasProfiler,
6263
REACT_STRICT_MODE_TYPEasStrictMode,
@@ -82,5 +83,4 @@ export {
8283
// Experimental
8384
REACT_SUSPENSE_LIST_TYPEasunstable_SuspenseList,
8485
REACT_VIEW_TRANSITION_TYPEasunstable_ViewTransition,
85-
REACT_ACTIVITY_TYPEasActivity,
8686
};
‎packages/react/src/ReactServer.fb.js‎
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,13 @@ export {default as __SERVER_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRA
1212
import{forEach,map,count,toArray,only}from'./ReactChildren';
1313
import{captureOwnerStackascaptureOwnerStackImpl}from'./ReactOwnerStack';
1414
import{
15+
REACT_ACTIVITY_TYPE,
1516
REACT_FRAGMENT_TYPE,
1617
REACT_PROFILER_TYPE,
1718
REACT_STRICT_MODE_TYPE,
1819
REACT_SUSPENSE_TYPE,
20+
REACT_SUSPENSE_LIST_TYPE,
21+
REACT_VIEW_TRANSITION_TYPE,
1922
}from'shared/ReactSymbols';
2023
import{
2124
cloneElement,
@@ -45,6 +48,7 @@ if (__DEV__) {
4548

4649
export{
4750
Children,
51+
REACT_ACTIVITY_TYPEasActivity,
4852
REACT_FRAGMENT_TYPEasFragment,
4953
REACT_PROFILER_TYPEasProfiler,
5054
REACT_STRICT_MODE_TYPEasStrictMode,
@@ -65,4 +69,7 @@ export {
6569
useMemo,
6670
version,
6771
captureOwnerStack,// DEV-only
72+
// Experimental
73+
REACT_SUSPENSE_LIST_TYPEasunstable_SuspenseList,
74+
REACT_VIEW_TRANSITION_TYPEasunstable_ViewTransition,
6875
};
‎packages/react/src/ReactServer.js‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export {default as __SERVER_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRA
1111

1212
import{forEach,map,count,toArray,only}from'./ReactChildren';
1313
import{
14+
REACT_ACTIVITY_TYPE,
1415
REACT_FRAGMENT_TYPE,
1516
REACT_PROFILER_TYPE,
1617
REACT_STRICT_MODE_TYPE,
@@ -40,6 +41,7 @@ const Children = {
4041

4142
export{
4243
Children,
44+
REACT_ACTIVITY_TYPEasActivity,
4345
REACT_FRAGMENT_TYPEasFragment,
4446
REACT_PROFILER_TYPEasProfiler,
4547
REACT_STRICT_MODE_TYPEasStrictMode,
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] Add `<Activity>` (#34697) · react/react@6a8a8ef · GitHub
Skip to content
Commit 6a8a8ef
Browse files
eps1loneps1lon
authored
[Flight] Add <Activity> (#34697)
1 parent f89ed71 commit 6a8a8ef
6 files changed
Lines changed: 140 additions & 2 deletions
File tree
‎packages/react-reconciler/src/__tests__/ActivityReactServer-test.js‎
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
/**
2+
 * Copyright (c) Meta Platforms, Inc. and affiliates.
3+
 *
4+
 * This source code is licensed under the MIT license found in the
5+
 * LICENSE file in the root directory of this source tree.
6+
 *
7+
 * @emails react-core
8+
 * @jest-environment node
9+
 */
10+
11+
'use strict';
12+
13+
letact;
14+
letActivity;
15+
letReact;
16+
letReactServer;
17+
letReactNoop;
18+
letReactNoopFlightClient;
19+
letReactNoopFlightServer;
20+
21+
describe('ActivityReactServer',()=>{
22+
beforeEach(()=>{
23+
jest.resetModules();
24+
jest.mock('react',()=>require('react/react.react-server'));
25+
ReactServer=require('react');
26+
Activity=ReactServer.Activity;
27+
ReactNoopFlightServer=require('react-noop-renderer/flight-server');
28+
29+
jest.resetModules();
30+
__unmockReact();
31+
React=require('react');
32+
ReactNoopFlightClient=require('react-noop-renderer/flight-client');
33+
ReactNoop=require('react-noop-renderer');
34+
constInternalTestUtils=require('internal-test-utils');
35+
act=InternalTestUtils.act;
36+
});
37+
38+
afterEach(()=>{
39+
jest.restoreAllMocks();
40+
});
41+
42+
it('can be rendered in React Server',async()=>{
43+
functionApp(){
44+
returnReactServer.createElement(
45+
Activity,
46+
{mode: 'hidden'},
47+
ReactServer.createElement('div',null,'Hello, Dave!'),
48+
);
49+
}
50+
51+
consttransport=ReactNoopFlightServer.render(
52+
ReactServer.createElement(App,null),
53+
);
54+
55+
awaitact(async()=>{
56+
constapp=awaitReactNoopFlightClient.read(transport);
57+
58+
ReactNoop.render(app);
59+
});
60+
61+
expect(ReactNoop).toMatchRenderedOutput(
62+
<divhidden={true}>Hello, Dave!</div>,
63+
);
64+
});
65+
});
‎packages/react-reconciler/src/__tests__/ViewTransitionReactServer-test.js‎
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
/**
2+
 * Copyright (c) Meta Platforms, Inc. and affiliates.
3+
 *
4+
 * This source code is licensed under the MIT license found in the
5+
 * LICENSE file in the root directory of this source tree.
6+
 *
7+
 * @emails react-core
8+
 * @jest-environment node
9+
 */
10+
11+
'use strict';
12+
13+
letact;
14+
letViewTransition;
15+
letReact;
16+
letReactServer;
17+
letReactNoop;
18+
letReactNoopFlightClient;
19+
letReactNoopFlightServer;
20+
21+
describe('ViewTransitionReactServer',()=>{
22+
beforeEach(()=>{
23+
jest.resetModules();
24+
jest.mock('react',()=>require('react/react.react-server'));
25+
ReactServer=require('react');
26+
ViewTransition=ReactServer.unstable_ViewTransition;
27+
ReactNoopFlightServer=require('react-noop-renderer/flight-server');
28+
29+
jest.resetModules();
30+
__unmockReact();
31+
React=require('react');
32+
ReactNoopFlightClient=require('react-noop-renderer/flight-client');
33+
ReactNoop=require('react-noop-renderer');
34+
constInternalTestUtils=require('internal-test-utils');
35+
act=InternalTestUtils.act;
36+
});
37+
38+
afterEach(()=>{
39+
jest.restoreAllMocks();
40+
});
41+
42+
// @gate enableViewTransition || fb
43+
it('can be rendered in React Server',async()=>{
44+
functionApp(){
45+
returnReactServer.createElement(
46+
ViewTransition,
47+
{},
48+
ReactServer.createElement('div',null,'Hello, Dave!'),
49+
);
50+
}
51+
52+
consttransport=ReactNoopFlightServer.render(
53+
ReactServer.createElement(App,null),
54+
);
55+
56+
awaitact(async()=>{
57+
constapp=awaitReactNoopFlightClient.read(transport);
58+
59+
ReactNoop.render(app);
60+
});
61+
62+
expect(ReactNoop).toMatchRenderedOutput(<div>Hello, Dave!</div>);
63+
});
64+
});
‎packages/react/src/ReactServer.experimental.development.js‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ export {
5858

5959
export{
6060
Children,
61+
REACT_ACTIVITY_TYPEasActivity,
6162
REACT_FRAGMENT_TYPEasFragment,
6263
REACT_PROFILER_TYPEasProfiler,
6364
REACT_STRICT_MODE_TYPEasStrictMode,
@@ -83,6 +84,5 @@ export {
8384
// Experimental
8485
REACT_SUSPENSE_LIST_TYPEasunstable_SuspenseList,
8586
REACT_VIEW_TRANSITION_TYPEasunstable_ViewTransition,
86-
REACT_ACTIVITY_TYPEasunstable_Activity,
8787
captureOwnerStack,// DEV-only
8888
};
‎packages/react/src/ReactServer.experimental.js‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ export {
5757

5858
export{
5959
Children,
60+
REACT_ACTIVITY_TYPEasActivity,
6061
REACT_FRAGMENT_TYPEasFragment,
6162
REACT_PROFILER_TYPEasProfiler,
6263
REACT_STRICT_MODE_TYPEasStrictMode,
@@ -82,5 +83,4 @@ export {
8283
// Experimental
8384
REACT_SUSPENSE_LIST_TYPEasunstable_SuspenseList,
8485
REACT_VIEW_TRANSITION_TYPEasunstable_ViewTransition,
85-
REACT_ACTIVITY_TYPEasActivity,
8686
};
‎packages/react/src/ReactServer.fb.js‎
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,13 @@ export {default as __SERVER_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRA
1212
import{forEach,map,count,toArray,only}from'./ReactChildren';
1313
import{captureOwnerStackascaptureOwnerStackImpl}from'./ReactOwnerStack';
1414
import{
15+
REACT_ACTIVITY_TYPE,
1516
REACT_FRAGMENT_TYPE,
1617
REACT_PROFILER_TYPE,
1718
REACT_STRICT_MODE_TYPE,
1819
REACT_SUSPENSE_TYPE,
20+
REACT_SUSPENSE_LIST_TYPE,
21+
REACT_VIEW_TRANSITION_TYPE,
1922
}from'shared/ReactSymbols';
2023
import{
2124
cloneElement,
@@ -45,6 +48,7 @@ if (__DEV__) {
4548

4649
export{
4750
Children,
51+
REACT_ACTIVITY_TYPEasActivity,
4852
REACT_FRAGMENT_TYPEasFragment,
4953
REACT_PROFILER_TYPEasProfiler,
5054
REACT_STRICT_MODE_TYPEasStrictMode,
@@ -65,4 +69,7 @@ export {
6569
useMemo,
6670
version,
6771
captureOwnerStack,// DEV-only
72+
// Experimental
73+
REACT_SUSPENSE_LIST_TYPEasunstable_SuspenseList,
74+
REACT_VIEW_TRANSITION_TYPEasunstable_ViewTransition,
6875
};
‎packages/react/src/ReactServer.js‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export {default as __SERVER_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRA
1111

1212
import{forEach,map,count,toArray,only}from'./ReactChildren';
1313
import{
14+
REACT_ACTIVITY_TYPE,
1415
REACT_FRAGMENT_TYPE,
1516
REACT_PROFILER_TYPE,
1617
REACT_STRICT_MODE_TYPE,
@@ -40,6 +41,7 @@ const Children = {
4041

4142
export{
4243
Children,
44+
REACT_ACTIVITY_TYPEasActivity,
4345
REACT_FRAGMENT_TYPEasFragment,
4446
REACT_PROFILER_TYPEasProfiler,
4547
REACT_STRICT_MODE_TYPEasStrictMode,
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] Add `<Activity>` (#34697) · react/react@6a8a8ef · GitHub
Skip to content
Commit 6a8a8ef
Browse files
eps1loneps1lon
authored
[Flight] Add <Activity> (#34697)
1 parent f89ed71 commit 6a8a8ef
6 files changed
Lines changed: 140 additions & 2 deletions
File tree
‎packages/react-reconciler/src/__tests__/ActivityReactServer-test.js‎
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
/**
2+
 * Copyright (c) Meta Platforms, Inc. and affiliates.
3+
 *
4+
 * This source code is licensed under the MIT license found in the
5+
 * LICENSE file in the root directory of this source tree.
6+
 *
7+
 * @emails react-core
8+
 * @jest-environment node
9+
 */
10+
11+
'use strict';
12+
13+
letact;
14+
letActivity;
15+
letReact;
16+
letReactServer;
17+
letReactNoop;
18+
letReactNoopFlightClient;
19+
letReactNoopFlightServer;
20+
21+
describe('ActivityReactServer',()=>{
22+
beforeEach(()=>{
23+
jest.resetModules();
24+
jest.mock('react',()=>require('react/react.react-server'));
25+
ReactServer=require('react');
26+
Activity=ReactServer.Activity;
27+
ReactNoopFlightServer=require('react-noop-renderer/flight-server');
28+
29+
jest.resetModules();
30+
__unmockReact();
31+
React=require('react');
32+
ReactNoopFlightClient=require('react-noop-renderer/flight-client');
33+
ReactNoop=require('react-noop-renderer');
34+
constInternalTestUtils=require('internal-test-utils');
35+
act=InternalTestUtils.act;
36+
});
37+
38+
afterEach(()=>{
39+
jest.restoreAllMocks();
40+
});
41+
42+
it('can be rendered in React Server',async()=>{
43+
functionApp(){
44+
returnReactServer.createElement(
45+
Activity,
46+
{mode: 'hidden'},
47+
ReactServer.createElement('div',null,'Hello, Dave!'),
48+
);
49+
}
50+
51+
consttransport=ReactNoopFlightServer.render(
52+
ReactServer.createElement(App,null),
53+
);
54+
55+
awaitact(async()=>{
56+
constapp=awaitReactNoopFlightClient.read(transport);
57+
58+
ReactNoop.render(app);
59+
});
60+
61+
expect(ReactNoop).toMatchRenderedOutput(
62+
<divhidden={true}>Hello, Dave!</div>,
63+
);
64+
});
65+
});
‎packages/react-reconciler/src/__tests__/ViewTransitionReactServer-test.js‎
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
/**
2+
 * Copyright (c) Meta Platforms, Inc. and affiliates.
3+
 *
4+
 * This source code is licensed under the MIT license found in the
5+
 * LICENSE file in the root directory of this source tree.
6+
 *
7+
 * @emails react-core
8+
 * @jest-environment node
9+
 */
10+
11+
'use strict';
12+
13+
letact;
14+
letViewTransition;
15+
letReact;
16+
letReactServer;
17+
letReactNoop;
18+
letReactNoopFlightClient;
19+
letReactNoopFlightServer;
20+
21+
describe('ViewTransitionReactServer',()=>{
22+
beforeEach(()=>{
23+
jest.resetModules();
24+
jest.mock('react',()=>require('react/react.react-server'));
25+
ReactServer=require('react');
26+
ViewTransition=ReactServer.unstable_ViewTransition;
27+
ReactNoopFlightServer=require('react-noop-renderer/flight-server');
28+
29+
jest.resetModules();
30+
__unmockReact();
31+
React=require('react');
32+
ReactNoopFlightClient=require('react-noop-renderer/flight-client');
33+
ReactNoop=require('react-noop-renderer');
34+
constInternalTestUtils=require('internal-test-utils');
35+
act=InternalTestUtils.act;
36+
});
37+
38+
afterEach(()=>{
39+
jest.restoreAllMocks();
40+
});
41+
42+
// @gate enableViewTransition || fb
43+
it('can be rendered in React Server',async()=>{
44+
functionApp(){
45+
returnReactServer.createElement(
46+
ViewTransition,
47+
{},
48+
ReactServer.createElement('div',null,'Hello, Dave!'),
49+
);
50+
}
51+
52+
consttransport=ReactNoopFlightServer.render(
53+
ReactServer.createElement(App,null),
54+
);
55+
56+
awaitact(async()=>{
57+
constapp=awaitReactNoopFlightClient.read(transport);
58+
59+
ReactNoop.render(app);
60+
});
61+
62+
expect(ReactNoop).toMatchRenderedOutput(<div>Hello, Dave!</div>);
63+
});
64+
});
‎packages/react/src/ReactServer.experimental.development.js‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ export {
5858

5959
export{
6060
Children,
61+
REACT_ACTIVITY_TYPEasActivity,
6162
REACT_FRAGMENT_TYPEasFragment,
6263
REACT_PROFILER_TYPEasProfiler,
6364
REACT_STRICT_MODE_TYPEasStrictMode,
@@ -83,6 +84,5 @@ export {
8384
// Experimental
8485
REACT_SUSPENSE_LIST_TYPEasunstable_SuspenseList,
8586
REACT_VIEW_TRANSITION_TYPEasunstable_ViewTransition,
86-
REACT_ACTIVITY_TYPEasunstable_Activity,
8787
captureOwnerStack,// DEV-only
8888
};
‎packages/react/src/ReactServer.experimental.js‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ export {
5757

5858
export{
5959
Children,
60+
REACT_ACTIVITY_TYPEasActivity,
6061
REACT_FRAGMENT_TYPEasFragment,
6162
REACT_PROFILER_TYPEasProfiler,
6263
REACT_STRICT_MODE_TYPEasStrictMode,
@@ -82,5 +83,4 @@ export {
8283
// Experimental
8384
REACT_SUSPENSE_LIST_TYPEasunstable_SuspenseList,
8485
REACT_VIEW_TRANSITION_TYPEasunstable_ViewTransition,
85-
REACT_ACTIVITY_TYPEasActivity,
8686
};
‎packages/react/src/ReactServer.fb.js‎
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,13 @@ export {default as __SERVER_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRA
1212
import{forEach,map,count,toArray,only}from'./ReactChildren';
1313
import{captureOwnerStackascaptureOwnerStackImpl}from'./ReactOwnerStack';
1414
import{
15+
REACT_ACTIVITY_TYPE,
1516
REACT_FRAGMENT_TYPE,
1617
REACT_PROFILER_TYPE,
1718
REACT_STRICT_MODE_TYPE,
1819
REACT_SUSPENSE_TYPE,
20+
REACT_SUSPENSE_LIST_TYPE,
21+
REACT_VIEW_TRANSITION_TYPE,
1922
}from'shared/ReactSymbols';
2023
import{
2124
cloneElement,
@@ -45,6 +48,7 @@ if (__DEV__) {
4548

4649
export{
4750
Children,
51+
REACT_ACTIVITY_TYPEasActivity,
4852
REACT_FRAGMENT_TYPEasFragment,
4953
REACT_PROFILER_TYPEasProfiler,
5054
REACT_STRICT_MODE_TYPEasStrictMode,
@@ -65,4 +69,7 @@ export {
6569
useMemo,
6670
version,
6771
captureOwnerStack,// DEV-only
72+
// Experimental
73+
REACT_SUSPENSE_LIST_TYPEasunstable_SuspenseList,
74+
REACT_VIEW_TRANSITION_TYPEasunstable_ViewTransition,
6875
};
‎packages/react/src/ReactServer.js‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export {default as __SERVER_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRA
1111

1212
import{forEach,map,count,toArray,only}from'./ReactChildren';
1313
import{
14+
REACT_ACTIVITY_TYPE,
1415
REACT_FRAGMENT_TYPE,
1516
REACT_PROFILER_TYPE,
1617
REACT_STRICT_MODE_TYPE,
@@ -40,6 +41,7 @@ const Children = {
4041

4142
export{
4243
Children,
44+
REACT_ACTIVITY_TYPEasActivity,
4345
REACT_FRAGMENT_TYPEasFragment,
4446
REACT_PROFILER_TYPEasProfiler,
4547
REACT_STRICT_MODE_TYPEasStrictMode,
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] Add `<Activity>` (#34697) · react/react@6a8a8ef · GitHub
Skip to content
Commit 6a8a8ef
Browse files
eps1loneps1lon
authored
[Flight] Add <Activity> (#34697)
1 parent f89ed71 commit 6a8a8ef
6 files changed
Lines changed: 140 additions & 2 deletions
File tree
‎packages/react-reconciler/src/__tests__/ActivityReactServer-test.js‎
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
/**
2+
 * Copyright (c) Meta Platforms, Inc. and affiliates.
3+
 *
4+
 * This source code is licensed under the MIT license found in the
5+
 * LICENSE file in the root directory of this source tree.
6+
 *
7+
 * @emails react-core
8+
 * @jest-environment node
9+
 */
10+
11+
'use strict';
12+
13+
letact;
14+
letActivity;
15+
letReact;
16+
letReactServer;
17+
letReactNoop;
18+
letReactNoopFlightClient;
19+
letReactNoopFlightServer;
20+
21+
describe('ActivityReactServer',()=>{
22+
beforeEach(()=>{
23+
jest.resetModules();
24+
jest.mock('react',()=>require('react/react.react-server'));
25+
ReactServer=require('react');
26+
Activity=ReactServer.Activity;
27+
ReactNoopFlightServer=require('react-noop-renderer/flight-server');
28+
29+
jest.resetModules();
30+
__unmockReact();
31+
React=require('react');
32+
ReactNoopFlightClient=require('react-noop-renderer/flight-client');
33+
ReactNoop=require('react-noop-renderer');
34+
constInternalTestUtils=require('internal-test-utils');
35+
act=InternalTestUtils.act;
36+
});
37+
38+
afterEach(()=>{
39+
jest.restoreAllMocks();
40+
});
41+
42+
it('can be rendered in React Server',async()=>{
43+
functionApp(){
44+
returnReactServer.createElement(
45+
Activity,
46+
{mode: 'hidden'},
47+
ReactServer.createElement('div',null,'Hello, Dave!'),
48+
);
49+
}
50+
51+
consttransport=ReactNoopFlightServer.render(
52+
ReactServer.createElement(App,null),
53+
);
54+
55+
awaitact(async()=>{
56+
constapp=awaitReactNoopFlightClient.read(transport);
57+
58+
ReactNoop.render(app);
59+
});
60+
61+
expect(ReactNoop).toMatchRenderedOutput(
62+
<divhidden={true}>Hello, Dave!</div>,
63+
);
64+
});
65+
});
‎packages/react-reconciler/src/__tests__/ViewTransitionReactServer-test.js‎
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
/**
2+
 * Copyright (c) Meta Platforms, Inc. and affiliates.
3+
 *
4+
 * This source code is licensed under the MIT license found in the
5+
 * LICENSE file in the root directory of this source tree.
6+
 *
7+
 * @emails react-core
8+
 * @jest-environment node
9+
 */
10+
11+
'use strict';
12+
13+
letact;
14+
letViewTransition;
15+
letReact;
16+
letReactServer;
17+
letReactNoop;
18+
letReactNoopFlightClient;
19+
letReactNoopFlightServer;
20+
21+
describe('ViewTransitionReactServer',()=>{
22+
beforeEach(()=>{
23+
jest.resetModules();
24+
jest.mock('react',()=>require('react/react.react-server'));
25+
ReactServer=require('react');
26+
ViewTransition=ReactServer.unstable_ViewTransition;
27+
ReactNoopFlightServer=require('react-noop-renderer/flight-server');
28+
29+
jest.resetModules();
30+
__unmockReact();
31+
React=require('react');
32+
ReactNoopFlightClient=require('react-noop-renderer/flight-client');
33+
ReactNoop=require('react-noop-renderer');
34+
constInternalTestUtils=require('internal-test-utils');
35+
act=InternalTestUtils.act;
36+
});
37+
38+
afterEach(()=>{
39+
jest.restoreAllMocks();
40+
});
41+
42+
// @gate enableViewTransition || fb
43+
it('can be rendered in React Server',async()=>{
44+
functionApp(){
45+
returnReactServer.createElement(
46+
ViewTransition,
47+
{},
48+
ReactServer.createElement('div',null,'Hello, Dave!'),
49+
);
50+
}
51+
52+
consttransport=ReactNoopFlightServer.render(
53+
ReactServer.createElement(App,null),
54+
);
55+
56+
awaitact(async()=>{
57+
constapp=awaitReactNoopFlightClient.read(transport);
58+
59+
ReactNoop.render(app);
60+
});
61+
62+
expect(ReactNoop).toMatchRenderedOutput(<div>Hello, Dave!</div>);
63+
});
64+
});
‎packages/react/src/ReactServer.experimental.development.js‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ export {
5858

5959
export{
6060
Children,
61+
REACT_ACTIVITY_TYPEasActivity,
6162
REACT_FRAGMENT_TYPEasFragment,
6263
REACT_PROFILER_TYPEasProfiler,
6364
REACT_STRICT_MODE_TYPEasStrictMode,
@@ -83,6 +84,5 @@ export {
8384
// Experimental
8485
REACT_SUSPENSE_LIST_TYPEasunstable_SuspenseList,
8586
REACT_VIEW_TRANSITION_TYPEasunstable_ViewTransition,
86-
REACT_ACTIVITY_TYPEasunstable_Activity,
8787
captureOwnerStack,// DEV-only
8888
};
‎packages/react/src/ReactServer.experimental.js‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ export {
5757

5858
export{
5959
Children,
60+
REACT_ACTIVITY_TYPEasActivity,
6061
REACT_FRAGMENT_TYPEasFragment,
6162
REACT_PROFILER_TYPEasProfiler,
6263
REACT_STRICT_MODE_TYPEasStrictMode,
@@ -82,5 +83,4 @@ export {
8283
// Experimental
8384
REACT_SUSPENSE_LIST_TYPEasunstable_SuspenseList,
8485
REACT_VIEW_TRANSITION_TYPEasunstable_ViewTransition,
85-
REACT_ACTIVITY_TYPEasActivity,
8686
};
‎packages/react/src/ReactServer.fb.js‎
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,13 @@ export {default as __SERVER_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRA
1212
import{forEach,map,count,toArray,only}from'./ReactChildren';
1313
import{captureOwnerStackascaptureOwnerStackImpl}from'./ReactOwnerStack';
1414
import{
15+
REACT_ACTIVITY_TYPE,
1516
REACT_FRAGMENT_TYPE,
1617
REACT_PROFILER_TYPE,
1718
REACT_STRICT_MODE_TYPE,
1819
REACT_SUSPENSE_TYPE,
20+
REACT_SUSPENSE_LIST_TYPE,
21+
REACT_VIEW_TRANSITION_TYPE,
1922
}from'shared/ReactSymbols';
2023
import{
2124
cloneElement,
@@ -45,6 +48,7 @@ if (__DEV__) {
4548

4649
export{
4750
Children,
51+
REACT_ACTIVITY_TYPEasActivity,
4852
REACT_FRAGMENT_TYPEasFragment,
4953
REACT_PROFILER_TYPEasProfiler,
5054
REACT_STRICT_MODE_TYPEasStrictMode,
@@ -65,4 +69,7 @@ export {
6569
useMemo,
6670
version,
6771
captureOwnerStack,// DEV-only
72+
// Experimental
73+
REACT_SUSPENSE_LIST_TYPEasunstable_SuspenseList,
74+
REACT_VIEW_TRANSITION_TYPEasunstable_ViewTransition,
6875
};
‎packages/react/src/ReactServer.js‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export {default as __SERVER_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRA
1111

1212
import{forEach,map,count,toArray,only}from'./ReactChildren';
1313
import{
14+
REACT_ACTIVITY_TYPE,
1415
REACT_FRAGMENT_TYPE,
1516
REACT_PROFILER_TYPE,
1617
REACT_STRICT_MODE_TYPE,
@@ -40,6 +41,7 @@ const Children = {
4041

4142
export{
4243
Children,
44+
REACT_ACTIVITY_TYPEasActivity,
4345
REACT_FRAGMENT_TYPEasFragment,
4446
REACT_PROFILER_TYPEasProfiler,
4547
REACT_STRICT_MODE_TYPEasStrictMode,
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] Add `<Activity>` (#34697) · react/react@6a8a8ef · GitHub
Skip to content
Commit 6a8a8ef
Browse files
eps1loneps1lon
authored
[Flight] Add <Activity> (#34697)
1 parent f89ed71 commit 6a8a8ef
6 files changed
Lines changed: 140 additions & 2 deletions
File tree
‎packages/react-reconciler/src/__tests__/ActivityReactServer-test.js‎
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
/**
2+
 * Copyright (c) Meta Platforms, Inc. and affiliates.
3+
 *
4+
 * This source code is licensed under the MIT license found in the
5+
 * LICENSE file in the root directory of this source tree.
6+
 *
7+
 * @emails react-core
8+
 * @jest-environment node
9+
 */
10+
11+
'use strict';
12+
13+
letact;
14+
letActivity;
15+
letReact;
16+
letReactServer;
17+
letReactNoop;
18+
letReactNoopFlightClient;
19+
letReactNoopFlightServer;
20+
21+
describe('ActivityReactServer',()=>{
22+
beforeEach(()=>{
23+
jest.resetModules();
24+
jest.mock('react',()=>require('react/react.react-server'));
25+
ReactServer=require('react');
26+
Activity=ReactServer.Activity;
27+
ReactNoopFlightServer=require('react-noop-renderer/flight-server');
28+
29+
jest.resetModules();
30+
__unmockReact();
31+
React=require('react');
32+
ReactNoopFlightClient=require('react-noop-renderer/flight-client');
33+
ReactNoop=require('react-noop-renderer');
34+
constInternalTestUtils=require('internal-test-utils');
35+
act=InternalTestUtils.act;
36+
});
37+
38+
afterEach(()=>{
39+
jest.restoreAllMocks();
40+
});
41+
42+
it('can be rendered in React Server',async()=>{
43+
functionApp(){
44+
returnReactServer.createElement(
45+
Activity,
46+
{mode: 'hidden'},
47+
ReactServer.createElement('div',null,'Hello, Dave!'),
48+
);
49+
}
50+
51+
consttransport=ReactNoopFlightServer.render(
52+
ReactServer.createElement(App,null),
53+
);
54+
55+
awaitact(async()=>{
56+
constapp=awaitReactNoopFlightClient.read(transport);
57+
58+
ReactNoop.render(app);
59+
});
60+
61+
expect(ReactNoop).toMatchRenderedOutput(
62+
<divhidden={true}>Hello, Dave!</div>,
63+
);
64+
});
65+
});
‎packages/react-reconciler/src/__tests__/ViewTransitionReactServer-test.js‎
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
/**
2+
 * Copyright (c) Meta Platforms, Inc. and affiliates.
3+
 *
4+
 * This source code is licensed under the MIT license found in the
5+
 * LICENSE file in the root directory of this source tree.
6+
 *
7+
 * @emails react-core
8+
 * @jest-environment node
9+
 */
10+
11+
'use strict';
12+
13+
letact;
14+
letViewTransition;
15+
letReact;
16+
letReactServer;
17+
letReactNoop;
18+
letReactNoopFlightClient;
19+
letReactNoopFlightServer;
20+
21+
describe('ViewTransitionReactServer',()=>{
22+
beforeEach(()=>{
23+
jest.resetModules();
24+
jest.mock('react',()=>require('react/react.react-server'));
25+
ReactServer=require('react');
26+
ViewTransition=ReactServer.unstable_ViewTransition;
27+
ReactNoopFlightServer=require('react-noop-renderer/flight-server');
28+
29+
jest.resetModules();
30+
__unmockReact();
31+
React=require('react');
32+
ReactNoopFlightClient=require('react-noop-renderer/flight-client');
33+
ReactNoop=require('react-noop-renderer');
34+
constInternalTestUtils=require('internal-test-utils');
35+
act=InternalTestUtils.act;
36+
});
37+
38+
afterEach(()=>{
39+
jest.restoreAllMocks();
40+
});
41+
42+
// @gate enableViewTransition || fb
43+
it('can be rendered in React Server',async()=>{
44+
functionApp(){
45+
returnReactServer.createElement(
46+
ViewTransition,
47+
{},
48+
ReactServer.createElement('div',null,'Hello, Dave!'),
49+
);
50+
}
51+
52+
consttransport=ReactNoopFlightServer.render(
53+
ReactServer.createElement(App,null),
54+
);
55+
56+
awaitact(async()=>{
57+
constapp=awaitReactNoopFlightClient.read(transport);
58+
59+
ReactNoop.render(app);
60+
});
61+
62+
expect(ReactNoop).toMatchRenderedOutput(<div>Hello, Dave!</div>);
63+
});
64+
});
‎packages/react/src/ReactServer.experimental.development.js‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ export {
5858

5959
export{
6060
Children,
61+
REACT_ACTIVITY_TYPEasActivity,
6162
REACT_FRAGMENT_TYPEasFragment,
6263
REACT_PROFILER_TYPEasProfiler,
6364
REACT_STRICT_MODE_TYPEasStrictMode,
@@ -83,6 +84,5 @@ export {
8384
// Experimental
8485
REACT_SUSPENSE_LIST_TYPEasunstable_SuspenseList,
8586
REACT_VIEW_TRANSITION_TYPEasunstable_ViewTransition,
86-
REACT_ACTIVITY_TYPEasunstable_Activity,
8787
captureOwnerStack,// DEV-only
8888
};
‎packages/react/src/ReactServer.experimental.js‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ export {
5757

5858
export{
5959
Children,
60+
REACT_ACTIVITY_TYPEasActivity,
6061
REACT_FRAGMENT_TYPEasFragment,
6162
REACT_PROFILER_TYPEasProfiler,
6263
REACT_STRICT_MODE_TYPEasStrictMode,
@@ -82,5 +83,4 @@ export {
8283
// Experimental
8384
REACT_SUSPENSE_LIST_TYPEasunstable_SuspenseList,
8485
REACT_VIEW_TRANSITION_TYPEasunstable_ViewTransition,
85-
REACT_ACTIVITY_TYPEasActivity,
8686
};
‎packages/react/src/ReactServer.fb.js‎
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,13 @@ export {default as __SERVER_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRA
1212
import{forEach,map,count,toArray,only}from'./ReactChildren';
1313
import{captureOwnerStackascaptureOwnerStackImpl}from'./ReactOwnerStack';
1414
import{
15+
REACT_ACTIVITY_TYPE,
1516
REACT_FRAGMENT_TYPE,
1617
REACT_PROFILER_TYPE,
1718
REACT_STRICT_MODE_TYPE,
1819
REACT_SUSPENSE_TYPE,
20+
REACT_SUSPENSE_LIST_TYPE,
21+
REACT_VIEW_TRANSITION_TYPE,
1922
}from'shared/ReactSymbols';
2023
import{
2124
cloneElement,
@@ -45,6 +48,7 @@ if (__DEV__) {
4548

4649
export{
4750
Children,
51+
REACT_ACTIVITY_TYPEasActivity,
4852
REACT_FRAGMENT_TYPEasFragment,
4953
REACT_PROFILER_TYPEasProfiler,
5054
REACT_STRICT_MODE_TYPEasStrictMode,
@@ -65,4 +69,7 @@ export {
6569
useMemo,
6670
version,
6771
captureOwnerStack,// DEV-only
72+
// Experimental
73+
REACT_SUSPENSE_LIST_TYPEasunstable_SuspenseList,
74+
REACT_VIEW_TRANSITION_TYPEasunstable_ViewTransition,
6875
};
‎packages/react/src/ReactServer.js‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export {default as __SERVER_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRA
1111

1212
import{forEach,map,count,toArray,only}from'./ReactChildren';
1313
import{
14+
REACT_ACTIVITY_TYPE,
1415
REACT_FRAGMENT_TYPE,
1516
REACT_PROFILER_TYPE,
1617
REACT_STRICT_MODE_TYPE,
@@ -40,6 +41,7 @@ const Children = {
4041

4142
export{
4243
Children,
44+
REACT_ACTIVITY_TYPEasActivity,
4345
REACT_FRAGMENT_TYPEasFragment,
4446
REACT_PROFILER_TYPEasProfiler,
4547
REACT_STRICT_MODE_TYPEasStrictMode,
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] Add `<Activity>` (#34697) · react/react@6a8a8ef · GitHub
Skip to content
Commit 6a8a8ef
Browse files
eps1loneps1lon
authored
[Flight] Add <Activity> (#34697)
1 parent f89ed71 commit 6a8a8ef
6 files changed
Lines changed: 140 additions & 2 deletions
File tree
‎packages/react-reconciler/src/__tests__/ActivityReactServer-test.js‎
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
/**
2+
 * Copyright (c) Meta Platforms, Inc. and affiliates.
3+
 *
4+
 * This source code is licensed under the MIT license found in the
5+
 * LICENSE file in the root directory of this source tree.
6+
 *
7+
 * @emails react-core
8+
 * @jest-environment node
9+
 */
10+
11+
'use strict';
12+
13+
letact;
14+
letActivity;
15+
letReact;
16+
letReactServer;
17+
letReactNoop;
18+
letReactNoopFlightClient;
19+
letReactNoopFlightServer;
20+
21+
describe('ActivityReactServer',()=>{
22+
beforeEach(()=>{
23+
jest.resetModules();
24+
jest.mock('react',()=>require('react/react.react-server'));
25+
ReactServer=require('react');
26+
Activity=ReactServer.Activity;
27+
ReactNoopFlightServer=require('react-noop-renderer/flight-server');
28+
29+
jest.resetModules();
30+
__unmockReact();
31+
React=require('react');
32+
ReactNoopFlightClient=require('react-noop-renderer/flight-client');
33+
ReactNoop=require('react-noop-renderer');
34+
constInternalTestUtils=require('internal-test-utils');
35+
act=InternalTestUtils.act;
36+
});
37+
38+
afterEach(()=>{
39+
jest.restoreAllMocks();
40+
});
41+
42+
it('can be rendered in React Server',async()=>{
43+
functionApp(){
44+
returnReactServer.createElement(
45+
Activity,
46+
{mode: 'hidden'},
47+
ReactServer.createElement('div',null,'Hello, Dave!'),
48+
);
49+
}
50+
51+
consttransport=ReactNoopFlightServer.render(
52+
ReactServer.createElement(App,null),
53+
);
54+
55+
awaitact(async()=>{
56+
constapp=awaitReactNoopFlightClient.read(transport);
57+
58+
ReactNoop.render(app);
59+
});
60+
61+
expect(ReactNoop).toMatchRenderedOutput(
62+
<divhidden={true}>Hello, Dave!</div>,
63+
);
64+
});
65+
});
‎packages/react-reconciler/src/__tests__/ViewTransitionReactServer-test.js‎
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
/**
2+
 * Copyright (c) Meta Platforms, Inc. and affiliates.
3+
 *
4+
 * This source code is licensed under the MIT license found in the
5+
 * LICENSE file in the root directory of this source tree.
6+
 *
7+
 * @emails react-core
8+
 * @jest-environment node
9+
 */
10+
11+
'use strict';
12+
13+
letact;
14+
letViewTransition;
15+
letReact;
16+
letReactServer;
17+
letReactNoop;
18+
letReactNoopFlightClient;
19+
letReactNoopFlightServer;
20+
21+
describe('ViewTransitionReactServer',()=>{
22+
beforeEach(()=>{
23+
jest.resetModules();
24+
jest.mock('react',()=>require('react/react.react-server'));
25+
ReactServer=require('react');
26+
ViewTransition=ReactServer.unstable_ViewTransition;
27+
ReactNoopFlightServer=require('react-noop-renderer/flight-server');
28+
29+
jest.resetModules();
30+
__unmockReact();
31+
React=require('react');
32+
ReactNoopFlightClient=require('react-noop-renderer/flight-client');
33+
ReactNoop=require('react-noop-renderer');
34+
constInternalTestUtils=require('internal-test-utils');
35+
act=InternalTestUtils.act;
36+
});
37+
38+
afterEach(()=>{
39+
jest.restoreAllMocks();
40+
});
41+
42+
// @gate enableViewTransition || fb
43+
it('can be rendered in React Server',async()=>{
44+
functionApp(){
45+
returnReactServer.createElement(
46+
ViewTransition,
47+
{},
48+
ReactServer.createElement('div',null,'Hello, Dave!'),
49+
);
50+
}
51+
52+
consttransport=ReactNoopFlightServer.render(
53+
ReactServer.createElement(App,null),
54+
);
55+
56+
awaitact(async()=>{
57+
constapp=awaitReactNoopFlightClient.read(transport);
58+
59+
ReactNoop.render(app);
60+
});
61+
62+
expect(ReactNoop).toMatchRenderedOutput(<div>Hello, Dave!</div>);
63+
});
64+
});
‎packages/react/src/ReactServer.experimental.development.js‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ export {
5858

5959
export{
6060
Children,
61+
REACT_ACTIVITY_TYPEasActivity,
6162
REACT_FRAGMENT_TYPEasFragment,
6263
REACT_PROFILER_TYPEasProfiler,
6364
REACT_STRICT_MODE_TYPEasStrictMode,
@@ -83,6 +84,5 @@ export {
8384
// Experimental
8485
REACT_SUSPENSE_LIST_TYPEasunstable_SuspenseList,
8586
REACT_VIEW_TRANSITION_TYPEasunstable_ViewTransition,
86-
REACT_ACTIVITY_TYPEasunstable_Activity,
8787
captureOwnerStack,// DEV-only
8888
};
‎packages/react/src/ReactServer.experimental.js‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ export {
5757

5858
export{
5959
Children,
60+
REACT_ACTIVITY_TYPEasActivity,
6061
REACT_FRAGMENT_TYPEasFragment,
6162
REACT_PROFILER_TYPEasProfiler,
6263
REACT_STRICT_MODE_TYPEasStrictMode,
@@ -82,5 +83,4 @@ export {
8283
// Experimental
8384
REACT_SUSPENSE_LIST_TYPEasunstable_SuspenseList,
8485
REACT_VIEW_TRANSITION_TYPEasunstable_ViewTransition,
85-
REACT_ACTIVITY_TYPEasActivity,
8686
};
‎packages/react/src/ReactServer.fb.js‎
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,13 @@ export {default as __SERVER_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRA
1212
import{forEach,map,count,toArray,only}from'./ReactChildren';
1313
import{captureOwnerStackascaptureOwnerStackImpl}from'./ReactOwnerStack';
1414
import{
15+
REACT_ACTIVITY_TYPE,
1516
REACT_FRAGMENT_TYPE,
1617
REACT_PROFILER_TYPE,
1718
REACT_STRICT_MODE_TYPE,
1819
REACT_SUSPENSE_TYPE,
20+
REACT_SUSPENSE_LIST_TYPE,
21+
REACT_VIEW_TRANSITION_TYPE,
1922
}from'shared/ReactSymbols';
2023
import{
2124
cloneElement,
@@ -45,6 +48,7 @@ if (__DEV__) {
4548

4649
export{
4750
Children,
51+
REACT_ACTIVITY_TYPEasActivity,
4852
REACT_FRAGMENT_TYPEasFragment,
4953
REACT_PROFILER_TYPEasProfiler,
5054
REACT_STRICT_MODE_TYPEasStrictMode,
@@ -65,4 +69,7 @@ export {
6569
useMemo,
6670
version,
6771
captureOwnerStack,// DEV-only
72+
// Experimental
73+
REACT_SUSPENSE_LIST_TYPEasunstable_SuspenseList,
74+
REACT_VIEW_TRANSITION_TYPEasunstable_ViewTransition,
6875
};
‎packages/react/src/ReactServer.js‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export {default as __SERVER_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRA
1111

1212
import{forEach,map,count,toArray,only}from'./ReactChildren';
1313
import{
14+
REACT_ACTIVITY_TYPE,
1415
REACT_FRAGMENT_TYPE,
1516
REACT_PROFILER_TYPE,
1617
REACT_STRICT_MODE_TYPE,
@@ -40,6 +41,7 @@ const Children = {
4041

4142
export{
4243
Children,
44+
REACT_ACTIVITY_TYPEasActivity,
4345
REACT_FRAGMENT_TYPEasFragment,
4446
REACT_PROFILER_TYPEasProfiler,
4547
REACT_STRICT_MODE_TYPEasStrictMode,
0 commit comments
Comments
 (0)