Skip to content

Commit e7c5af4

Browse files
authored
Update cache() and use() to the canary aka next channel (#25502)
Testing what it would look like to move this to the `next` channel.
1 parent fa77f52 commit e7c5af4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+325
-279
lines changed

ReactVersions.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ const stablePackages = {
3030
react: ReactVersion,
3131
'react-art': ReactVersion,
3232
'react-dom': ReactVersion,
33+
'react-server-dom-webpack': ReactVersion,
3334
'react-is': ReactVersion,
3435
'react-reconciler': '0.30.0',
3536
'react-refresh': '0.15.0',
@@ -42,12 +43,7 @@ const stablePackages = {
4243
// These packages do not exist in the @next or @latest channel, only
4344
// @experimental. We don't use semver, just the commit sha, so this is just a
4445
// list of package names instead of a map.
45-
const experimentalPackages = [
46-
'react-fetch',
47-
'react-fs',
48-
'react-pg',
49-
'react-server-dom-webpack',
50-
];
46+
const experimentalPackages = ['react-fetch', 'react-fs', 'react-pg'];
5147

5248
module.exports = {
5349
ReactVersion,

fixtures/fizz-ssr-browser/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ <h1>Fizz Example</h1>
1717
</p>
1818
</div>
1919
<script src="../../build/node_modules/react/umd/react.development.js"></script>
20+
<script src="../../build/node_modules/react-dom/umd/react-dom.development.js"></script>
2021
<script src="../../build/node_modules/react-dom/umd/react-dom-server.browser.development.js"></script>
2122
<script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
2223
<script type="text/babel">

fixtures/flight-browser/index.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ <h1>Flight Example</h1>
8383
}
8484

8585
function Shell({ data }) {
86-
let model = React.experimental_use(data);
86+
let model = React.use(data);
8787
return <div>
8888
<Suspense fallback="...">
8989
<h1>{model.title}</h1>
@@ -94,11 +94,12 @@ <h1>{model.title}</h1>
9494

9595
function renderResult(data) {
9696
let container = document.getElementById('container');
97-
ReactDOM.render(
97+
ReactDOM.createRoot(
98+
container
99+
).render(
98100
<Suspense fallback="Loading...">
99101
<Shell data={data} />
100102
</Suspense>,
101-
container
102103
);
103104
}
104105
</script>

fixtures/flight/src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import ReactServerDOMReader from 'react-server-dom-webpack/client';
66
let data = ReactServerDOMReader.createFromFetch(fetch('http://localhost:3001'));
77

88
function Content() {
9-
return React.experimental_use(data);
9+
return React.use(data);
1010
}
1111

1212
ReactDOM.createRoot(document.getElementById('root')).render(

packages/react-client/src/__tests__/ReactFlight-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ describe('ReactFlight', () => {
2727

2828
React = require('react');
2929
startTransition = React.startTransition;
30-
use = React.experimental_use;
30+
use = React.use;
3131
ReactNoop = require('react-noop-renderer');
3232
ReactNoopFlightServer = require('react-noop-renderer/flight-server');
3333
ReactNoopFlightClient = require('react-noop-renderer/flight-client');

packages/react-dom/index.classic.fb.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ export {
3333
unstable_isNewReconciler,
3434
unstable_renderSubtreeIntoContainer,
3535
unstable_runWithPriority, // DO NOT USE: Temporarily exposed to migrate off of Scheduler.runWithPriority.
36+
preinit,
37+
preload,
3638
version,
3739
} from './src/client/ReactDOM';
3840

packages/react-dom/index.experimental.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export {
2020
unstable_batchedUpdates,
2121
unstable_renderSubtreeIntoContainer,
2222
unstable_runWithPriority, // DO NOT USE: Temporarily exposed to migrate off of Scheduler.runWithPriority.
23+
preinit,
24+
preload,
2325
version,
2426
} from './src/client/ReactDOM';
25-
26-
export {preinit, preload} from 'react-dom-bindings/src/shared/ReactDOMFloat';

packages/react-dom/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,7 @@ export {
2525
unstable_isNewReconciler,
2626
unstable_renderSubtreeIntoContainer,
2727
unstable_runWithPriority, // DO NOT USE: Temporarily exposed to migrate off of Scheduler.runWithPriority.
28+
preinit,
29+
preload,
2830
version,
2931
} from './src/client/ReactDOM';

packages/react-dom/index.modern.fb.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,7 @@ export {
1818
unstable_flushControlled,
1919
unstable_isNewReconciler,
2020
unstable_runWithPriority, // DO NOT USE: Temporarily exposed to migrate off of Scheduler.runWithPriority.
21+
preinit,
22+
preload,
2123
version,
2224
} from './src/client/ReactDOM';

packages/react-dom/index.stable.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,7 @@ export {
1919
unmountComponentAtNode,
2020
unstable_batchedUpdates,
2121
unstable_renderSubtreeIntoContainer,
22+
preinit,
23+
preload,
2224
version,
2325
} from './src/client/ReactDOM';

0 commit comments

Comments
 (0)