{"patch":"diff --git a\/packages\/react-devtools-shared\/src\/__tests__\/store-test.js b\/packages\/react-devtools-shared\/src\/__tests__\/store-test.js\nindex 417158ce3a..658227841a 100644\n--- a\/packages\/react-devtools-shared\/src\/__tests__\/store-test.js\n+++ b\/packages\/react-devtools-shared\/src\/__tests__\/store-test.js\n@@ -1575,7 +1575,6 @@ describe('Store', () => {\n \n \n \n- \n \n \n <\/React.Fragment>\n@@ -1603,7 +1602,6 @@ describe('Store', () => {\n [withFoo][withBar]\n [Memo][withFoo][withBar]\n [ForwardRef][withFoo][withBar]\n- \n \n \n `);\ndiff --git a\/packages\/react-devtools-shell\/src\/app\/ElementTypes\/index.js b\/packages\/react-devtools-shell\/src\/app\/ElementTypes\/index.js\nindex 4450c5682d..b53bb9d2d1 100644\n--- a\/packages\/react-devtools-shell\/src\/app\/ElementTypes\/index.js\n+++ b\/packages\/react-devtools-shell\/src\/app\/ElementTypes\/index.js\n@@ -18,7 +18,6 @@ import {\n Profiler,\n StrictMode,\n Suspense,\n- unstable_Cache as Cache,\n } from 'react';\n \n const Context = createContext('abc');\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiber.js b\/packages\/react-reconciler\/src\/ReactFiber.js\nindex ce909b8025..5b8dc06fb5 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiber.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiber.js\n@@ -28,7 +28,6 @@ import {\n isHostSingletonType,\n } from '.\/ReactFiberConfig';\n import {\n- enableCache,\n enableProfilerTimer,\n enableScopeAPI,\n enableLegacyHidden,\n@@ -66,7 +65,6 @@ import {\n ScopeComponent,\n OffscreenComponent,\n LegacyHiddenComponent,\n- CacheComponent,\n TracingMarkerComponent,\n } from '.\/ReactWorkTags';\n import {OffscreenVisible} from '.\/ReactFiberActivityComponent';\n@@ -104,7 +102,6 @@ import {\n REACT_SCOPE_TYPE,\n REACT_OFFSCREEN_TYPE,\n REACT_LEGACY_HIDDEN_TYPE,\n- REACT_CACHE_TYPE,\n REACT_TRACING_MARKER_TYPE,\n } from 'shared\/ReactSymbols';\n import {TransitionTracingMarker} from '.\/ReactFiberTracingMarkerComponent';\n@@ -560,11 +557,6 @@ export function createFiberFromTypeAndProps(\n return createFiberFromScope(type, pendingProps, mode, lanes, key);\n }\n \/\/ Fall through\n- case REACT_CACHE_TYPE:\n- if (enableCache) {\n- return createFiberFromCache(pendingProps, mode, lanes, key);\n- }\n- \/\/ Fall through\n case REACT_TRACING_MARKER_TYPE:\n if (enableTransitionTracing) {\n return createFiberFromTracingMarker(pendingProps, mode, lanes, key);\n@@ -807,18 +799,6 @@ export function createFiberFromLegacyHidden(\n return fiber;\n }\n \n-export function createFiberFromCache(\n- pendingProps: any,\n- mode: TypeOfMode,\n- lanes: Lanes,\n- key: null | string,\n-): Fiber {\n- const fiber = createFiber(CacheComponent, pendingProps, key, mode);\n- fiber.elementType = REACT_CACHE_TYPE;\n- fiber.lanes = lanes;\n- return fiber;\n-}\n-\n export function createFiberFromTracingMarker(\n pendingProps: any,\n mode: TypeOfMode,\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactCacheElement-test.js b\/packages\/react-reconciler\/src\/__tests__\/ReactCacheElement-test.js\ndeleted file mode 100644\nindex 19d3180af6..0000000000\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactCacheElement-test.js\n+++ \/dev\/null\n@@ -1,1597 +0,0 @@\n-let React;\n-let ReactNoop;\n-let Cache;\n-let getCacheSignal;\n-let getCacheForType;\n-let Scheduler;\n-let assertLog;\n-let act;\n-let Suspense;\n-let Activity;\n-let useCacheRefresh;\n-let startTransition;\n-let useState;\n-\n-let textCaches;\n-let seededCache;\n-\n-describe('ReactCacheElement', () => {\n- beforeEach(() => {\n- jest.resetModules();\n-\n- React = require('react');\n- ReactNoop = require('react-noop-renderer');\n- Cache = React.unstable_Cache;\n- Scheduler = require('scheduler');\n- act = require('internal-test-utils').act;\n- Suspense = React.Suspense;\n- Activity = React.unstable_Activity;\n- getCacheSignal = React.unstable_getCacheSignal;\n- getCacheForType = React.unstable_getCacheForType;\n- useCacheRefresh = React.unstable_useCacheRefresh;\n- startTransition = React.startTransition;\n- useState = React.useState;\n-\n- const InternalTestUtils = require('internal-test-utils');\n- assertLog = InternalTestUtils.assertLog;\n-\n- textCaches = [];\n- seededCache = null;\n- });\n-\n- function createTextCache() {\n- if (seededCache !== null) {\n- \/\/ Trick to seed a cache before it exists.\n- \/\/ TODO: Need a built-in API to seed data before the initial render (i.e.\n- \/\/ not a refresh because nothing has mounted yet).\n- const textCache = seededCache;\n- seededCache = null;\n- return textCache;\n- }\n-\n- const data = new Map();\n- const version = textCaches.length + 1;\n- const textCache = {\n- version,\n- data,\n- resolve(text) {\n- const record = data.get(text);\n- if (record === undefined) {\n- const newRecord = {\n- status: 'resolved',\n- value: text,\n- cleanupScheduled: false,\n- };\n- data.set(text, newRecord);\n- } else if (record.status === 'pending') {\n- record.value.resolve();\n- }\n- },\n- reject(text, error) {\n- const record = data.get(text);\n- if (record === undefined) {\n- const newRecord = {\n- status: 'rejected',\n- value: error,\n- cleanupScheduled: false,\n- };\n- data.set(text, newRecord);\n- } else if (record.status === 'pending') {\n- record.value.reject();\n- }\n- },\n- };\n- textCaches.push(textCache);\n- return textCache;\n- }\n-\n- function readText(text) {\n- const signal = getCacheSignal ? getCacheSignal() : null;\n- const textCache = getCacheForType(createTextCache);\n- const record = textCache.data.get(text);\n- if (record !== undefined) {\n- if (!record.cleanupScheduled) {\n- \/\/ This record was seeded prior to the abort signal being available:\n- \/\/ schedule a cleanup function for it.\n- \/\/ TODO: Add ability to cleanup entries seeded w useCacheRefresh()\n- record.cleanupScheduled = true;\n- if (getCacheSignal) {\n- signal.addEventListener('abort', () => {\n- Scheduler.log(`Cache cleanup: ${text} [v${textCache.version}]`);\n- });\n- }\n- }\n- switch (record.status) {\n- case 'pending':\n- throw record.value;\n- case 'rejected':\n- throw record.value;\n- case 'resolved':\n- return textCache.version;\n- }\n- } else {\n- Scheduler.log(`Cache miss! [${text}]`);\n-\n- let resolve;\n- let reject;\n- const thenable = new Promise((res, rej) => {\n- resolve = res;\n- reject = rej;\n- }).then(\n- value => {\n- if (newRecord.status === 'pending') {\n- newRecord.status = 'resolved';\n- newRecord.value = value;\n- }\n- },\n- error => {\n- if (newRecord.status === 'pending') {\n- newRecord.status = 'rejected';\n- newRecord.value = error;\n- }\n- },\n- );\n- thenable.resolve = resolve;\n- thenable.reject = reject;\n-\n- const newRecord = {\n- status: 'pending',\n- value: thenable,\n- cleanupScheduled: true,\n- };\n- textCache.data.set(text, newRecord);\n-\n- if (getCacheSignal) {\n- signal.addEventListener('abort', () => {\n- Scheduler.log(`Cache cleanup: ${text} [v${textCache.version}]`);\n- });\n- }\n- throw thenable;\n- }\n- }\n-\n- function Text({text}) {\n- Scheduler.log(text);\n- return text;\n- }\n-\n- function AsyncText({text, showVersion}) {\n- const version = readText(text);\n- const fullText = showVersion ? `${text} [v${version}]` : text;\n- Scheduler.log(fullText);\n- return fullText;\n- }\n-\n- function seedNextTextCache(text) {\n- if (seededCache === null) {\n- seededCache = createTextCache();\n- }\n- seededCache.resolve(text);\n- }\n-\n- function resolveMostRecentTextCache(text) {\n- if (textCaches.length === 0) {\n- throw Error('Cache does not exist.');\n- } else {\n- \/\/ Resolve the most recently created cache. An older cache can by\n- \/\/ resolved with `textCaches[index].resolve(text)`.\n- textCaches[textCaches.length - 1].resolve(text);\n- }\n- }\n-\n- \/\/ @gate enableCacheElement\n- test('render Cache component', async () => {\n- const root = ReactNoop.createRoot();\n- await act(() => {\n- root.render(Hi<\/Cache>);\n- });\n- expect(root).toMatchRenderedOutput('Hi');\n- });\n-\n- \/\/ @gate enableCacheElement\n- test('mount new data', async () => {\n- const root = ReactNoop.createRoot();\n- await act(() => {\n- root.render(\n- \n- }>\n- \n- <\/Suspense>\n- <\/Cache>,\n- );\n- });\n- assertLog(['Cache miss! [A]', 'Loading...']);\n- expect(root).toMatchRenderedOutput('Loading...');\n-\n- await act(() => {\n- resolveMostRecentTextCache('A');\n- });\n- assertLog(['A']);\n- expect(root).toMatchRenderedOutput('A');\n-\n- await act(() => {\n- root.render('Bye');\n- });\n- \/\/ no cleanup: cache is still retained at the root\n- assertLog([]);\n- expect(root).toMatchRenderedOutput('Bye');\n- });\n-\n- \/\/ @gate enableCacheElement\n- test('root acts as implicit cache boundary', async () => {\n- const root = ReactNoop.createRoot();\n- await act(() => {\n- root.render(\n- }>\n- \n- <\/Suspense>,\n- );\n- });\n- assertLog(['Cache miss! [A]', 'Loading...']);\n- expect(root).toMatchRenderedOutput('Loading...');\n-\n- await act(() => {\n- resolveMostRecentTextCache('A');\n- });\n- assertLog(['A']);\n- expect(root).toMatchRenderedOutput('A');\n-\n- await act(() => {\n- root.render('Bye');\n- });\n- \/\/ no cleanup: cache is still retained at the root\n- assertLog([]);\n- expect(root).toMatchRenderedOutput('Bye');\n- });\n-\n- \/\/ @gate enableCacheElement\n- test('multiple new Cache boundaries in the same mount share the same, fresh root cache', async () => {\n- function App() {\n- return (\n- <>\n- \n- }>\n- \n- <\/Suspense>\n- <\/Cache>\n- \n- }>\n- \n- <\/Suspense>\n- <\/Cache>\n- <\/>\n- );\n- }\n-\n- const root = ReactNoop.createRoot();\n- await act(() => {\n- root.render();\n- });\n-\n- \/\/ Even though there are two new trees, they should share the same\n- \/\/ data cache. So there should be only a single cache miss for A.\n- assertLog(['Cache miss! [A]', 'Loading...', 'Loading...']);\n- expect(root).toMatchRenderedOutput('Loading...Loading...');\n-\n- await act(() => {\n- resolveMostRecentTextCache('A');\n- });\n- assertLog(['A', 'A']);\n- expect(root).toMatchRenderedOutput('AA');\n-\n- await act(() => {\n- root.render('Bye');\n- });\n- \/\/ no cleanup: cache is still retained at the root\n- assertLog([]);\n- expect(root).toMatchRenderedOutput('Bye');\n- });\n-\n- \/\/ @gate enableCacheElement\n- test('multiple new Cache boundaries in the same update share the same, fresh cache', async () => {\n- function App({showMore}) {\n- return showMore ? (\n- <>\n- \n- }>\n- \n- <\/Suspense>\n- <\/Cache>\n- \n- }>\n- \n- <\/Suspense>\n- <\/Cache>\n- <\/>\n- ) : (\n- '(empty)'\n- );\n- }\n-\n- const root = ReactNoop.createRoot();\n- await act(() => {\n- root.render();\n- });\n- assertLog([]);\n- expect(root).toMatchRenderedOutput('(empty)');\n-\n- await act(() => {\n- root.render();\n- });\n- \/\/ Even though there are two new trees, they should share the same\n- \/\/ data cache. So there should be only a single cache miss for A.\n- assertLog(['Cache miss! [A]', 'Loading...', 'Loading...']);\n- expect(root).toMatchRenderedOutput('Loading...Loading...');\n-\n- await act(() => {\n- resolveMostRecentTextCache('A');\n- });\n- assertLog(['A', 'A']);\n- expect(root).toMatchRenderedOutput('AA');\n-\n- await act(() => {\n- root.render('Bye');\n- });\n- \/\/ cleanup occurs for the cache shared by the inner cache boundaries (which\n- \/\/ are not shared w the root because they were added in an update)\n- \/\/ note that no cache is created for the root since the cache is never accessed\n- assertLog(['Cache cleanup: A [v1]']);\n- expect(root).toMatchRenderedOutput('Bye');\n- });\n-\n- \/\/ @gate enableCacheElement\n- test(\n- 'nested cache boundaries share the same cache as the root during ' +\n- 'the initial render',\n- async () => {\n- function App() {\n- return (\n- }>\n- \n- \n- \n- <\/Cache>\n- <\/Suspense>\n- );\n- }\n-\n- const root = ReactNoop.createRoot();\n- await act(() => {\n- root.render();\n- });\n- \/\/ Even though there is a nested boundary, it should share the same\n- \/\/ data cache as the root. So there should be only a single cache miss for A.\n- assertLog(['Cache miss! [A]', 'Loading...']);\n- expect(root).toMatchRenderedOutput('Loading...');\n-\n- await act(() => {\n- resolveMostRecentTextCache('A');\n- });\n- assertLog(['A', 'A']);\n- expect(root).toMatchRenderedOutput('AA');\n-\n- await act(() => {\n- root.render('Bye');\n- });\n- \/\/ no cleanup: cache is still retained at the root\n- assertLog([]);\n- expect(root).toMatchRenderedOutput('Bye');\n- },\n- );\n-\n- \/\/ @gate enableCacheElement\n- test('new content inside an existing Cache boundary should re-use already cached data', async () => {\n- function App({showMore}) {\n- return (\n- \n- }>\n- \n- <\/Suspense>\n- {showMore ? (\n- }>\n- \n- <\/Suspense>\n- ) : null}\n- <\/Cache>\n- );\n- }\n-\n- const root = ReactNoop.createRoot();\n- await act(() => {\n- seedNextTextCache('A');\n- root.render();\n- });\n- assertLog(['A [v1]']);\n- expect(root).toMatchRenderedOutput('A [v1]');\n-\n- \/\/ Add a new cache boundary\n- await act(() => {\n- root.render();\n- });\n- assertLog([\n- 'A [v1]',\n- \/\/ New tree should use already cached data\n- 'A [v1]',\n- ]);\n- expect(root).toMatchRenderedOutput('A [v1]A [v1]');\n-\n- await act(() => {\n- root.render('Bye');\n- });\n- \/\/ no cleanup: cache is still retained at the root\n- assertLog([]);\n- expect(root).toMatchRenderedOutput('Bye');\n- });\n-\n- \/\/ @gate enableCacheElement\n- test('a new Cache boundary uses fresh cache', async () => {\n- \/\/ The only difference from the previous test is that the \"Show More\"\n- \/\/ content is wrapped in a nested boundary\n- function App({showMore}) {\n- return (\n- \n- }>\n- \n- <\/Suspense>\n- {showMore ? (\n- \n- }>\n- \n- <\/Suspense>\n- <\/Cache>\n- ) : null}\n- <\/Cache>\n- );\n- }\n-\n- const root = ReactNoop.createRoot();\n- await act(() => {\n- seedNextTextCache('A');\n- root.render();\n- });\n- assertLog(['A [v1]']);\n- expect(root).toMatchRenderedOutput('A [v1]');\n-\n- \/\/ Add a new cache boundary\n- await act(() => {\n- root.render();\n- });\n- assertLog([\n- 'A [v1]',\n- \/\/ New tree should load fresh data.\n- 'Cache miss! [A]',\n- 'Loading...',\n- ]);\n- expect(root).toMatchRenderedOutput('A [v1]Loading...');\n- await act(() => {\n- resolveMostRecentTextCache('A');\n- });\n- assertLog(['A [v2]']);\n- expect(root).toMatchRenderedOutput('A [v1]A [v2]');\n-\n- \/\/ Replace all the children: this should retain the root Cache instance,\n- \/\/ but cleanup the separate cache instance created for the fresh cache\n- \/\/ boundary\n- await act(() => {\n- root.render('Bye!');\n- });\n- \/\/ Cleanup occurs for the *second* cache instance: the first is still\n- \/\/ referenced by the root\n- assertLog(['Cache cleanup: A [v2]']);\n- expect(root).toMatchRenderedOutput('Bye!');\n- });\n-\n- \/\/ @gate enableCacheElement\n- test('inner\/outer cache boundaries uses the same cache instance on initial render', async () => {\n- const root = ReactNoop.createRoot();\n-\n- function App() {\n- return (\n- \n- }>\n- {\/* The shell reads A *\/}\n- \n- {\/* The inner content reads both A and B *\/}\n- }>\n- \n- \n- <\/Cache>\n- <\/Suspense>\n- <\/Shell>\n- <\/Suspense>\n- <\/Cache>\n- );\n- }\n-\n- function Shell({children}) {\n- readText('A');\n- return (\n- <>\n-

\n- \n- <\/div>\n-

{children}<\/div>\n- <\/>\n- );\n- }\n-\n- function Content() {\n- readText('A');\n- readText('B');\n- return ;\n- }\n-\n- await act(() => {\n- root.render();\n- });\n- assertLog(['Cache miss! [A]', 'Loading shell...']);\n- expect(root).toMatchRenderedOutput('Loading shell...');\n-\n- await act(() => {\n- resolveMostRecentTextCache('A');\n- });\n- assertLog([\n- 'Shell',\n- \/\/ There's a cache miss for B, because it hasn't been read yet. But not\n- \/\/ A, because it was cached when we rendered the shell.\n- 'Cache miss! [B]',\n- 'Loading content...',\n- ]);\n- expect(root).toMatchRenderedOutput(\n- <>\n-

Shell<\/div>\n-

Loading content...<\/div>\n- <\/>,\n- );\n-\n- await act(() => {\n- resolveMostRecentTextCache('B');\n- });\n- assertLog(['Content']);\n- expect(root).toMatchRenderedOutput(\n- <>\n-

Shell<\/div>\n-

Content<\/div>\n- <\/>,\n- );\n-\n- await act(() => {\n- root.render('Bye');\n- });\n- \/\/ no cleanup: cache is still retained at the root\n- assertLog([]);\n- expect(root).toMatchRenderedOutput('Bye');\n- });\n-\n- \/\/ @gate enableCacheElement\n- test('inner\/ outer cache boundaries added in the same update use the same cache instance', async () => {\n- const root = ReactNoop.createRoot();\n-\n- function App({showMore}) {\n- return showMore ? (\n- \n- }>\n- {\/* The shell reads A *\/}\n- \n- {\/* The inner content reads both A and B *\/}\n- }>\n- \n- \n- <\/Cache>\n- <\/Suspense>\n- <\/Shell>\n- <\/Suspense>\n- <\/Cache>\n- ) : (\n- '(empty)'\n- );\n- }\n-\n- function Shell({children}) {\n- readText('A');\n- return (\n- <>\n-

\n- \n- <\/div>\n-

{children}<\/div>\n- <\/>\n- );\n- }\n-\n- function Content() {\n- readText('A');\n- readText('B');\n- return ;\n- }\n-\n- await act(() => {\n- root.render();\n- });\n- assertLog([]);\n- expect(root).toMatchRenderedOutput('(empty)');\n-\n- await act(() => {\n- root.render();\n- });\n- assertLog(['Cache miss! [A]', 'Loading shell...']);\n- expect(root).toMatchRenderedOutput('Loading shell...');\n-\n- await act(() => {\n- resolveMostRecentTextCache('A');\n- });\n- assertLog([\n- 'Shell',\n- \/\/ There's a cache miss for B, because it hasn't been read yet. But not\n- \/\/ A, because it was cached when we rendered the shell.\n- 'Cache miss! [B]',\n- 'Loading content...',\n- ]);\n- expect(root).toMatchRenderedOutput(\n- <>\n-

Shell<\/div>\n-

Loading content...<\/div>\n- <\/>,\n- );\n-\n- await act(() => {\n- resolveMostRecentTextCache('B');\n- });\n- assertLog(['Content']);\n- expect(root).toMatchRenderedOutput(\n- <>\n-

Shell<\/div>\n-

Content<\/div>\n- <\/>,\n- );\n-\n- await act(() => {\n- root.render('Bye');\n- });\n- assertLog(['Cache cleanup: A [v1]', 'Cache cleanup: B [v1]']);\n- expect(root).toMatchRenderedOutput('Bye');\n- });\n-\n- \/\/ @gate enableCacheElement\n- test('refresh a cache boundary', async () => {\n- let refresh;\n- function App() {\n- refresh = useCacheRefresh();\n- return ;\n- }\n-\n- \/\/ Mount initial data\n- const root = ReactNoop.createRoot();\n- await act(() => {\n- root.render(\n- }>\n- \n- <\/Suspense>,\n- );\n- });\n- assertLog(['Cache miss! [A]', 'Loading...']);\n- expect(root).toMatchRenderedOutput('Loading...');\n-\n- await act(() => {\n- resolveMostRecentTextCache('A');\n- });\n- assertLog(['A [v1]']);\n- expect(root).toMatchRenderedOutput('A [v1]');\n-\n- \/\/ Refresh for new data.\n- await act(() => {\n- startTransition(() => refresh());\n- });\n- assertLog(['Cache miss! [A]', 'Loading...']);\n- expect(root).toMatchRenderedOutput('A [v1]');\n-\n- await act(() => {\n- resolveMostRecentTextCache('A');\n- });\n- \/\/ Note that the version has updated\n- if (getCacheSignal) {\n- assertLog(['A [v2]', 'Cache cleanup: A [v1]']);\n- } else {\n- assertLog(['A [v2]']);\n- }\n- expect(root).toMatchRenderedOutput('A [v2]');\n-\n- await act(() => {\n- root.render('Bye');\n- });\n- expect(root).toMatchRenderedOutput('Bye');\n- });\n-\n- \/\/ @gate enableCacheElement\n- test('refresh the root cache', async () => {\n- let refresh;\n- function App() {\n- refresh = useCacheRefresh();\n- return ;\n- }\n-\n- \/\/ Mount initial data\n- const root = ReactNoop.createRoot();\n- await act(() => {\n- root.render(\n- }>\n- \n- <\/Suspense>,\n- );\n- });\n- assertLog(['Cache miss! [A]', 'Loading...']);\n- expect(root).toMatchRenderedOutput('Loading...');\n-\n- await act(() => {\n- resolveMostRecentTextCache('A');\n- });\n- assertLog(['A [v1]']);\n- expect(root).toMatchRenderedOutput('A [v1]');\n-\n- \/\/ Refresh for new data.\n- await act(() => {\n- startTransition(() => refresh());\n- });\n- assertLog(['Cache miss! [A]', 'Loading...']);\n- expect(root).toMatchRenderedOutput('A [v1]');\n-\n- await act(() => {\n- resolveMostRecentTextCache('A');\n- });\n- \/\/ Note that the version has updated, and the previous cache is cleared\n- assertLog(['A [v2]', 'Cache cleanup: A [v1]']);\n- expect(root).toMatchRenderedOutput('A [v2]');\n-\n- await act(() => {\n- root.render('Bye');\n- });\n- \/\/ the original root cache already cleaned up when the refresh completed\n- assertLog([]);\n- expect(root).toMatchRenderedOutput('Bye');\n- });\n-\n- \/\/ @gate enableCacheElement\n- test('refresh the root cache without a transition', async () => {\n- let refresh;\n- function App() {\n- refresh = useCacheRefresh();\n- return ;\n- }\n-\n- \/\/ Mount initial data\n- const root = ReactNoop.createRoot();\n- await act(() => {\n- root.render(\n- }>\n- \n- <\/Suspense>,\n- );\n- });\n- assertLog(['Cache miss! [A]', 'Loading...']);\n- expect(root).toMatchRenderedOutput('Loading...');\n-\n- await act(() => {\n- resolveMostRecentTextCache('A');\n- });\n- assertLog(['A [v1]']);\n- expect(root).toMatchRenderedOutput('A [v1]');\n-\n- \/\/ Refresh for new data.\n- await act(() => {\n- refresh();\n- });\n- assertLog([\n- 'Cache miss! [A]',\n- 'Loading...',\n- \/\/ The v1 cache can be cleaned up since everything that references it has\n- \/\/ been replaced by a fallback. When the boundary switches back to visible\n- \/\/ it will use the v2 cache.\n- 'Cache cleanup: A [v1]',\n- ]);\n- expect(root).toMatchRenderedOutput('Loading...');\n-\n- await act(() => {\n- resolveMostRecentTextCache('A');\n- });\n- \/\/ Note that the version has updated, and the previous cache is cleared\n- assertLog(['A [v2]']);\n- expect(root).toMatchRenderedOutput('A [v2]');\n-\n- await act(() => {\n- root.render('Bye');\n- });\n- \/\/ the original root cache already cleaned up when the refresh completed\n- assertLog([]);\n- expect(root).toMatchRenderedOutput('Bye');\n- });\n-\n- \/\/ @gate enableCacheElement\n- test('refresh a cache with seed data', async () => {\n- let refresh;\n- function App() {\n- refresh = useCacheRefresh();\n- return ;\n- }\n-\n- \/\/ Mount initial data\n- const root = ReactNoop.createRoot();\n- await act(() => {\n- root.render(\n- \n- }>\n- \n- <\/Suspense>\n- <\/Cache>,\n- );\n- });\n- assertLog(['Cache miss! [A]', 'Loading...']);\n- expect(root).toMatchRenderedOutput('Loading...');\n-\n- await act(() => {\n- resolveMostRecentTextCache('A');\n- });\n- assertLog(['A [v1]']);\n- expect(root).toMatchRenderedOutput('A [v1]');\n-\n- \/\/ Refresh for new data.\n- await act(() => {\n- \/\/ Refresh the cache with seeded data, like you would receive from a\n- \/\/ server mutation.\n- \/\/ TODO: Seeding multiple typed textCaches. Should work by calling `refresh`\n- \/\/ multiple times with different key\/value pairs\n- startTransition(() => {\n- const textCache = createTextCache();\n- textCache.resolve('A');\n- startTransition(() => refresh(createTextCache, textCache));\n- });\n- });\n- \/\/ The root should re-render without a cache miss.\n- \/\/ The cache is not cleared up yet, since it's still reference by the root\n- assertLog(['A [v2]']);\n- expect(root).toMatchRenderedOutput('A [v2]');\n-\n- await act(() => {\n- root.render('Bye');\n- });\n- \/\/ the refreshed cache boundary is unmounted and cleans up\n- assertLog(['Cache cleanup: A [v2]']);\n- expect(root).toMatchRenderedOutput('Bye');\n- });\n-\n- \/\/ @gate enableCacheElement\n- test('refreshing a parent cache also refreshes its children', async () => {\n- let refreshShell;\n- function RefreshShell() {\n- refreshShell = useCacheRefresh();\n- return null;\n- }\n-\n- function App({showMore}) {\n- return (\n- \n- \n- }>\n- \n- <\/Suspense>\n- {showMore ? (\n- \n- }>\n- \n- <\/Suspense>\n- <\/Cache>\n- ) : null}\n- <\/Cache>\n- );\n- }\n-\n- const root = ReactNoop.createRoot();\n- await act(() => {\n- seedNextTextCache('A');\n- root.render();\n- });\n- assertLog(['A [v1]']);\n- expect(root).toMatchRenderedOutput('A [v1]');\n-\n- \/\/ Add a new cache boundary\n- await act(() => {\n- seedNextTextCache('A');\n- root.render();\n- });\n- assertLog([\n- 'A [v1]',\n- \/\/ New tree should load fresh data.\n- 'A [v2]',\n- ]);\n- expect(root).toMatchRenderedOutput('A [v1]A [v2]');\n-\n- \/\/ Now refresh the shell. This should also cause the \"Show More\" contents to\n- \/\/ refresh, since its cache is nested inside the outer one.\n- await act(() => {\n- startTransition(() => refreshShell());\n- });\n- assertLog(['Cache miss! [A]', 'Loading...', 'Loading...']);\n- expect(root).toMatchRenderedOutput('A [v1]A [v2]');\n-\n- await act(() => {\n- resolveMostRecentTextCache('A');\n- });\n- assertLog([\n- 'A [v3]',\n- 'A [v3]',\n- \/\/ once the refresh completes the inner showMore boundary frees its previous\n- \/\/ cache instance, since it is now using the refreshed parent instance.\n- 'Cache cleanup: A [v2]',\n- ]);\n- expect(root).toMatchRenderedOutput('A [v3]A [v3]');\n-\n- await act(() => {\n- root.render('Bye!');\n- });\n- \/\/ Unmounting children releases the refreshed cache instance only; the root\n- \/\/ still retains the original cache instance used for the first render\n- assertLog(['Cache cleanup: A [v3]']);\n- expect(root).toMatchRenderedOutput('Bye!');\n- });\n-\n- \/\/ @gate enableCacheElement\n- test(\n- 'refreshing a cache boundary does not refresh the other boundaries ' +\n- 'that mounted at the same time (i.e. the ones that share the same cache)',\n- async () => {\n- let refreshFirstBoundary;\n- function RefreshFirstBoundary() {\n- refreshFirstBoundary = useCacheRefresh();\n- return null;\n- }\n-\n- function App({showMore}) {\n- return showMore ? (\n- <>\n- \n- }>\n- \n- \n- <\/Suspense>\n- <\/Cache>\n- \n- }>\n- \n- <\/Suspense>\n- <\/Cache>\n- <\/>\n- ) : null;\n- }\n-\n- \/\/ First mount the initial shell without the nested boundaries. This is\n- \/\/ necessary for this test because we want the two inner boundaries to be\n- \/\/ treated like sibling providers that happen to share an underlying\n- \/\/ cache, as opposed to consumers of the root-level cache.\n- const root = ReactNoop.createRoot();\n- await act(() => {\n- root.render();\n- });\n-\n- \/\/ Now reveal the boundaries. In a real app this would be a navigation.\n- await act(() => {\n- root.render();\n- });\n-\n- \/\/ Even though there are two new trees, they should share the same\n- \/\/ data cache. So there should be only a single cache miss for A.\n- assertLog(['Cache miss! [A]', 'Loading...', 'Loading...']);\n- expect(root).toMatchRenderedOutput('Loading...Loading...');\n-\n- await act(() => {\n- resolveMostRecentTextCache('A');\n- });\n- assertLog(['A [v1]', 'A [v1]']);\n- expect(root).toMatchRenderedOutput('A [v1]A [v1]');\n-\n- \/\/ Refresh the first boundary. It should not refresh the second boundary,\n- \/\/ even though they previously shared the same underlying cache.\n- await act(async () => {\n- await refreshFirstBoundary();\n- });\n- assertLog(['Cache miss! [A]', 'Loading...']);\n-\n- await act(() => {\n- resolveMostRecentTextCache('A');\n- });\n- assertLog(['A [v2]']);\n- expect(root).toMatchRenderedOutput('A [v2]A [v1]');\n-\n- \/\/ Unmount children: this should clear *both* cache instances:\n- \/\/ the root doesn't have a cache instance (since it wasn't accessed\n- \/\/ during the initial render, and all subsequent cache accesses were within\n- \/\/ a fresh boundary). Therefore this causes cleanup for both the fresh cache\n- \/\/ instance in the refreshed first boundary and cleanup for the non-refreshed\n- \/\/ sibling boundary.\n- await act(() => {\n- root.render('Bye!');\n- });\n- assertLog(['Cache cleanup: A [v2]', 'Cache cleanup: A [v1]']);\n- expect(root).toMatchRenderedOutput('Bye!');\n- },\n- );\n-\n- \/\/ @gate enableCacheElement\n- test(\n- 'mount a new Cache boundary in a sibling while simultaneously ' +\n- 'resolving a Suspense boundary',\n- async () => {\n- function App({showMore}) {\n- return (\n- <>\n- {showMore ? (\n- }>\n- \n- \n- <\/Cache>\n- <\/Suspense>\n- ) : null}\n- }>\n- \n- {' '}\n- {' '}\n- \n- <\/Cache>\n- <\/Suspense>\n- <\/>\n- );\n- }\n-\n- const root = ReactNoop.createRoot();\n- await act(() => {\n- root.render();\n- });\n- assertLog(['Cache miss! [A]', 'Loading...']);\n- expect(root).toMatchRenderedOutput('Loading...');\n-\n- await act(() => {\n- \/\/ This will resolve the content in the first cache\n- resolveMostRecentTextCache('A');\n- resolveMostRecentTextCache('B');\n- \/\/ And mount the second tree, which includes new content\n- root.render();\n- });\n- assertLog([\n- \/\/ The new tree should use a fresh cache\n- 'Cache miss! [A]',\n- 'Loading...',\n- \/\/ The other tree uses the cached responses. This demonstrates that the\n- \/\/ requests are not dropped.\n- 'A [v1]',\n- 'B [v1]',\n- ]);\n- expect(root).toMatchRenderedOutput('Loading... A [v1] B [v1]');\n-\n- \/\/ Now resolve the second tree\n- await act(() => {\n- resolveMostRecentTextCache('A');\n- });\n- assertLog(['A [v2]']);\n- expect(root).toMatchRenderedOutput('A [v2] A [v1] B [v1]');\n-\n- await act(() => {\n- root.render('Bye!');\n- });\n- \/\/ Unmounting children releases both cache boundaries, but the original\n- \/\/ cache instance (used by second boundary) is still referenced by the root.\n- \/\/ only the second cache instance is freed.\n- assertLog(['Cache cleanup: A [v2]']);\n- expect(root).toMatchRenderedOutput('Bye!');\n- },\n- );\n-\n- \/\/ @gate enableCacheElement\n- test('cache pool is cleared once transitions that depend on it commit their shell', async () => {\n- function Child({text}) {\n- return (\n- \n- \n- <\/Cache>\n- );\n- }\n-\n- const root = ReactNoop.createRoot();\n- await act(() => {\n- root.render(\n- }>(empty)<\/Suspense>,\n- );\n- });\n- assertLog([]);\n- expect(root).toMatchRenderedOutput('(empty)');\n-\n- await act(() => {\n- startTransition(() => {\n- root.render(\n- }>\n- \n- <\/Suspense>,\n- );\n- });\n- });\n- assertLog(['Cache miss! [A]', 'Loading...']);\n- expect(root).toMatchRenderedOutput('(empty)');\n-\n- await act(() => {\n- startTransition(() => {\n- root.render(\n- }>\n- \n- \n- <\/Suspense>,\n- );\n- });\n- });\n- assertLog([\n- \/\/ No cache miss, because it uses the pooled cache\n- 'Loading...',\n- ]);\n- expect(root).toMatchRenderedOutput('(empty)');\n-\n- \/\/ Resolve the request\n- await act(() => {\n- resolveMostRecentTextCache('A');\n- });\n- assertLog(['A [v1]', 'A [v1]']);\n- expect(root).toMatchRenderedOutput('A [v1]A [v1]');\n-\n- \/\/ Now do another transition\n- await act(() => {\n- startTransition(() => {\n- root.render(\n- }>\n- \n- \n- \n- <\/Suspense>,\n- );\n- });\n- });\n- assertLog([\n- \/\/ First two children use the old cache because they already finished\n- 'A [v1]',\n- 'A [v1]',\n- \/\/ The new child uses a fresh cache\n- 'Cache miss! [A]',\n- 'Loading...',\n- ]);\n- expect(root).toMatchRenderedOutput('A [v1]A [v1]');\n-\n- await act(() => {\n- resolveMostRecentTextCache('A');\n- });\n- assertLog(['A [v1]', 'A [v1]', 'A [v2]']);\n- expect(root).toMatchRenderedOutput('A [v1]A [v1]A [v2]');\n-\n- \/\/ Unmount children: the first text cache instance is created only after the root\n- \/\/ commits, so both fresh cache instances are released by their cache boundaries,\n- \/\/ cleaning up v1 (used for the first two children which render together) and\n- \/\/ v2 (used for the third boundary added later).\n- await act(() => {\n- root.render('Bye!');\n- });\n- assertLog(['Cache cleanup: A [v1]', 'Cache cleanup: A [v2]']);\n- expect(root).toMatchRenderedOutput('Bye!');\n- });\n-\n- \/\/ @gate enableCacheElement\n- test('cache pool is not cleared by arbitrary commits', async () => {\n- function App() {\n- return (\n- <>\n- \n- \n- <\/>\n- );\n- }\n-\n- let showMore;\n- function ShowMore() {\n- const [shouldShow, _showMore] = useState(false);\n- showMore = () => _showMore(true);\n- return (\n- <>\n- }>\n- {shouldShow ? (\n- \n- \n- <\/Cache>\n- ) : null}\n- <\/Suspense>\n- <\/>\n- );\n- }\n-\n- let updateUnrelated;\n- function Unrelated() {\n- const [count, _updateUnrelated] = useState(0);\n- updateUnrelated = _updateUnrelated;\n- return ;\n- }\n-\n- const root = ReactNoop.createRoot();\n- await act(() => {\n- root.render();\n- });\n- assertLog(['0']);\n- expect(root).toMatchRenderedOutput('0');\n-\n- await act(() => {\n- startTransition(() => {\n- showMore();\n- });\n- });\n- assertLog(['Cache miss! [A]', 'Loading...']);\n- expect(root).toMatchRenderedOutput('0');\n-\n- await act(() => {\n- updateUnrelated(1);\n- });\n- assertLog([\n- '1',\n-\n- \/\/ Happens to re-render the fallback. Doesn't need to, but not relevant\n- \/\/ to this test.\n- 'Loading...',\n- ]);\n- expect(root).toMatchRenderedOutput('1');\n-\n- await act(() => {\n- resolveMostRecentTextCache('A');\n- });\n- assertLog(['A [v1]']);\n- expect(root).toMatchRenderedOutput('A [v1]1');\n-\n- \/\/ Unmount children: the first text cache instance is created only after initial\n- \/\/ render after calling showMore(). This instance is cleaned up when that boundary\n- \/\/ is unmounted. Bc root cache instance is never accessed, the inner cache\n- \/\/ boundary ends up at v1.\n- await act(() => {\n- root.render('Bye!');\n- });\n- assertLog(['Cache cleanup: A [v1]']);\n- expect(root).toMatchRenderedOutput('Bye!');\n- });\n-\n- \/\/ @gate enableCacheElement\n- test('cache boundary uses a fresh cache when its key changes', async () => {\n- const root = ReactNoop.createRoot();\n- seedNextTextCache('A');\n- await act(() => {\n- root.render(\n- \n- \n- \n- <\/Cache>\n- <\/Suspense>,\n- );\n- });\n- assertLog(['A [v1]']);\n- expect(root).toMatchRenderedOutput('A [v1]');\n-\n- seedNextTextCache('B');\n- await act(() => {\n- root.render(\n- \n- \n- \n- <\/Cache>\n- <\/Suspense>,\n- );\n- });\n- assertLog(['B [v2]']);\n- expect(root).toMatchRenderedOutput('B [v2]');\n-\n- \/\/ Unmount children: the fresh cache instance for B cleans up since the cache boundary\n- \/\/ is the only owner, while the original cache instance (for A) is still retained by\n- \/\/ the root.\n- await act(() => {\n- root.render('Bye!');\n- });\n- assertLog(['Cache cleanup: B [v2]']);\n- expect(root).toMatchRenderedOutput('Bye!');\n- });\n-\n- \/\/ @gate enableCacheElement\n- test('overlapping transitions after an initial mount use the same fresh cache', async () => {\n- const root = ReactNoop.createRoot();\n- await act(() => {\n- root.render(\n- \n- \n- \n- <\/Cache>\n- <\/Suspense>,\n- );\n- });\n- assertLog(['Cache miss! [A]']);\n- expect(root).toMatchRenderedOutput('Loading...');\n-\n- await act(() => {\n- resolveMostRecentTextCache('A');\n- });\n- assertLog(['A [v1]']);\n- expect(root).toMatchRenderedOutput('A [v1]');\n-\n- \/\/ After a mount, subsequent transitions use a fresh cache\n- await act(() => {\n- startTransition(() => {\n- root.render(\n- \n- \n- \n- <\/Cache>\n- <\/Suspense>,\n- );\n- });\n- });\n- assertLog(['Cache miss! [B]']);\n- expect(root).toMatchRenderedOutput('A [v1]');\n-\n- \/\/ Update to a different text and with a different key for the cache\n- \/\/ boundary: this should still use the fresh cache instance created\n- \/\/ for the earlier transition\n- await act(() => {\n- startTransition(() => {\n- root.render(\n- \n- \n- \n- <\/Cache>\n- <\/Suspense>,\n- );\n- });\n- });\n- assertLog(['Cache miss! [C]']);\n- expect(root).toMatchRenderedOutput('A [v1]');\n-\n- await act(() => {\n- resolveMostRecentTextCache('C');\n- });\n- assertLog(['C [v2]']);\n- expect(root).toMatchRenderedOutput('C [v2]');\n-\n- \/\/ Unmount children: the fresh cache used for the updates is freed, while the\n- \/\/ original cache (with A) is still retained at the root.\n- await act(() => {\n- root.render('Bye!');\n- });\n- assertLog(['Cache cleanup: B [v2]', 'Cache cleanup: C [v2]']);\n- expect(root).toMatchRenderedOutput('Bye!');\n- });\n-\n- \/\/ @gate enableCacheElement\n- test('overlapping updates after an initial mount use the same fresh cache', async () => {\n- const root = ReactNoop.createRoot();\n- await act(() => {\n- root.render(\n- \n- \n- \n- <\/Cache>\n- <\/Suspense>,\n- );\n- });\n- assertLog(['Cache miss! [A]']);\n- expect(root).toMatchRenderedOutput('Loading...');\n-\n- await act(() => {\n- resolveMostRecentTextCache('A');\n- });\n- assertLog(['A [v1]']);\n- expect(root).toMatchRenderedOutput('A [v1]');\n-\n- \/\/ After a mount, subsequent updates use a fresh cache\n- await act(() => {\n- root.render(\n- \n- \n- \n- <\/Cache>\n- <\/Suspense>,\n- );\n- });\n- assertLog(['Cache miss! [B]']);\n- expect(root).toMatchRenderedOutput('Loading...');\n-\n- \/\/ A second update uses the same fresh cache: even though this is a new\n- \/\/ Cache boundary, the render uses the fresh cache from the pending update.\n- await act(() => {\n- root.render(\n- \n- \n- \n- <\/Cache>\n- <\/Suspense>,\n- );\n- });\n- assertLog(['Cache miss! [C]']);\n- expect(root).toMatchRenderedOutput('Loading...');\n-\n- await act(() => {\n- resolveMostRecentTextCache('C');\n- });\n- assertLog(['C [v2]']);\n- expect(root).toMatchRenderedOutput('C [v2]');\n-\n- \/\/ Unmount children: the fresh cache used for the updates is freed, while the\n- \/\/ original cache (with A) is still retained at the root.\n- await act(() => {\n- root.render('Bye!');\n- });\n- assertLog(['Cache cleanup: B [v2]', 'Cache cleanup: C [v2]']);\n- expect(root).toMatchRenderedOutput('Bye!');\n- });\n-\n- \/\/ @gate enableCacheElement\n- test('cleans up cache only used in an aborted transition', async () => {\n- const root = ReactNoop.createRoot();\n- seedNextTextCache('A');\n- await act(() => {\n- root.render(\n- \n- \n- \n- <\/Cache>\n- <\/Suspense>,\n- );\n- });\n- assertLog(['A [v1]']);\n- expect(root).toMatchRenderedOutput('A [v1]');\n-\n- \/\/ Start a transition from A -> B..., which should create a fresh cache\n- \/\/ for the new cache boundary (bc of the different key)\n- await act(() => {\n- startTransition(() => {\n- root.render(\n- \n- \n- \n- <\/Cache>\n- <\/Suspense>,\n- );\n- });\n- });\n- assertLog(['Cache miss! [B]']);\n- expect(root).toMatchRenderedOutput('A [v1]');\n-\n- \/\/ ...but cancel by transitioning \"back\" to A (which we never really left)\n- await act(() => {\n- startTransition(() => {\n- root.render(\n- \n- \n- \n- <\/Cache>\n- <\/Suspense>,\n- );\n- });\n- });\n- assertLog(['A [v1]', 'Cache cleanup: B [v2]']);\n- expect(root).toMatchRenderedOutput('A [v1]');\n-\n- \/\/ Unmount children: ...\n- await act(() => {\n- root.render('Bye!');\n- });\n- assertLog([]);\n- expect(root).toMatchRenderedOutput('Bye!');\n- });\n-\n- \/\/ @gate enableCacheElement\n- test.skip('if a root cache refresh never commits its fresh cache is released', async () => {\n- const root = ReactNoop.createRoot();\n- let refresh;\n- function Example({text}) {\n- refresh = useCacheRefresh();\n- return ;\n- }\n- seedNextTextCache('A');\n- await act(() => {\n- root.render(\n- \n- \n- <\/Suspense>,\n- );\n- });\n- assertLog(['A [v1]']);\n- expect(root).toMatchRenderedOutput('A [v1]');\n-\n- await act(() => {\n- startTransition(() => {\n- refresh();\n- });\n- });\n- assertLog(['Cache miss! [A]']);\n- expect(root).toMatchRenderedOutput('A [v1]');\n-\n- await act(() => {\n- root.render('Bye!');\n- });\n- assertLog([\n- \/\/ TODO: the v1 cache should *not* be cleaned up, it is still retained by the root\n- \/\/ The following line is presently yielded but should not be:\n- \/\/ 'Cache cleanup: A [v1]',\n-\n- \/\/ TODO: the v2 cache *should* be cleaned up, it was created for the abandoned refresh\n- \/\/ The following line is presently not yielded but should be:\n- 'Cache cleanup: A [v2]',\n- ]);\n- expect(root).toMatchRenderedOutput('Bye!');\n- });\n-\n- \/\/ @gate enableCacheElement\n- test.skip('if a cache boundary refresh never commits its fresh cache is released', async () => {\n- const root = ReactNoop.createRoot();\n- let refresh;\n- function Example({text}) {\n- refresh = useCacheRefresh();\n- return ;\n- }\n- seedNextTextCache('A');\n- await act(() => {\n- root.render(\n- \n- \n- \n- <\/Cache>\n- <\/Suspense>,\n- );\n- });\n- assertLog(['A [v1]']);\n- expect(root).toMatchRenderedOutput('A [v1]');\n-\n- await act(() => {\n- startTransition(() => {\n- refresh();\n- });\n- });\n- assertLog(['Cache miss! [A]']);\n- expect(root).toMatchRenderedOutput('A [v1]');\n-\n- \/\/ Unmount the boundary before the refresh can complete\n- await act(() => {\n- root.render('Bye!');\n- });\n- assertLog([\n- \/\/ TODO: the v2 cache *should* be cleaned up, it was created for the abandoned refresh\n- \/\/ The following line is presently not yielded but should be:\n- 'Cache cleanup: A [v2]',\n- ]);\n- expect(root).toMatchRenderedOutput('Bye!');\n- });\n-\n- \/\/ @gate enableActivity\n- \/\/ @gate enableCache\n- test('prerender a new cache boundary inside an Activity tree', async () => {\n- function App({prerenderMore}) {\n- return (\n- \n-

\n- {prerenderMore ? (\n- \n- \n- <\/Cache>\n- ) : null}\n- <\/div>\n- <\/Activity>\n- );\n- }\n-\n- const root = ReactNoop.createRoot();\n- await act(() => {\n- root.render();\n- });\n- assertLog([]);\n- expect(root).toMatchRenderedOutput(

);\n-\n- seedNextTextCache('More');\n- await act(() => {\n- root.render();\n- });\n- assertLog(['More']);\n- expect(root).toMatchRenderedOutput(

More<\/div>);\n- });\n-});\ndiff --git a\/packages\/react\/index.classic.fb.js b\/packages\/react\/index.classic.fb.js\nindex c8a3a6012a..8c670383b6 100644\n--- a\/packages\/react\/index.classic.fb.js\n+++ b\/packages\/react\/index.classic.fb.js\n@@ -29,7 +29,6 @@ export {\n cache,\n startTransition,\n unstable_Activity,\n- unstable_Cache,\n unstable_TracingMarker,\n unstable_DebugTracingMode,\n unstable_LegacyHidden,\ndiff --git a\/packages\/react\/index.experimental.js b\/packages\/react\/index.experimental.js\nindex 1adaed959e..e62e7853c5 100644\n--- a\/packages\/react\/index.experimental.js\n+++ b\/packages\/react\/index.experimental.js\n@@ -28,7 +28,6 @@ export {\n memo,\n cache,\n startTransition,\n- unstable_Cache,\n unstable_DebugTracingMode,\n unstable_Activity,\n unstable_postpone,\ndiff --git a\/packages\/react\/index.js b\/packages\/react\/index.js\nindex 2f267f6eeb..e8f7b10788 100644\n--- a\/packages\/react\/index.js\n+++ b\/packages\/react\/index.js\n@@ -49,7 +49,6 @@ export {\n memo,\n cache,\n startTransition,\n- unstable_Cache,\n unstable_DebugTracingMode,\n unstable_LegacyHidden,\n unstable_Activity,\ndiff --git a\/packages\/react\/index.modern.fb.js b\/packages\/react\/index.modern.fb.js\nindex d5d9a10f4c..671b156214 100644\n--- a\/packages\/react\/index.modern.fb.js\n+++ b\/packages\/react\/index.modern.fb.js\n@@ -28,7 +28,6 @@ export {\n memo,\n cache,\n startTransition,\n- unstable_Cache,\n unstable_DebugTracingMode,\n unstable_LegacyHidden,\n unstable_Activity,\ndiff --git a\/packages\/react\/src\/ReactClient.js b\/packages\/react\/src\/ReactClient.js\nindex 83bcdcc822..4f9e7cbc0a 100644\n--- a\/packages\/react\/src\/ReactClient.js\n+++ b\/packages\/react\/src\/ReactClient.js\n@@ -18,7 +18,6 @@ import {\n REACT_LEGACY_HIDDEN_TYPE,\n REACT_OFFSCREEN_TYPE,\n REACT_SCOPE_TYPE,\n- REACT_CACHE_TYPE,\n REACT_TRACING_MARKER_TYPE,\n } from 'shared\/ReactSymbols';\n \n@@ -119,7 +118,6 @@ export {\n getCacheSignal as unstable_getCacheSignal,\n getCacheForType as unstable_getCacheForType,\n useCacheRefresh as unstable_useCacheRefresh,\n- REACT_CACHE_TYPE as unstable_Cache,\n use,\n useMemoCache as unstable_useMemoCache,\n \/\/ enableScopeAPI\ndiff --git a\/packages\/shared\/ReactFeatureFlags.js b\/packages\/shared\/ReactFeatureFlags.js\nindex 4d4fc361f4..7113757b66 100644\n--- a\/packages\/shared\/ReactFeatureFlags.js\n+++ b\/packages\/shared\/ReactFeatureFlags.js\n@@ -75,7 +75,6 @@ export const enableLegacyFBSupport = false;\n \n export const enableCache = true;\n export const enableLegacyCache = __EXPERIMENTAL__;\n-export const enableCacheElement = __EXPERIMENTAL__;\n export const enableFetchInstrumentation = true;\n \n export const enableBinaryFlight = __EXPERIMENTAL__;\ndiff --git a\/packages\/shared\/ReactSymbols.js b\/packages\/shared\/ReactSymbols.js\nindex 6dca3476be..32f3ef6540 100644\n--- a\/packages\/shared\/ReactSymbols.js\n+++ b\/packages\/shared\/ReactSymbols.js\n@@ -35,7 +35,6 @@ export const REACT_OFFSCREEN_TYPE: symbol = Symbol.for('react.offscreen');\n export const REACT_LEGACY_HIDDEN_TYPE: symbol = Symbol.for(\n 'react.legacy_hidden',\n );\n-export const REACT_CACHE_TYPE: symbol = Symbol.for('react.cache');\n export const REACT_TRACING_MARKER_TYPE: symbol = Symbol.for(\n 'react.tracing_marker',\n );\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js b\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\nindex 13e8d00c5b..1a5636531f 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\n@@ -43,7 +43,6 @@ export const enableProfilerNestedUpdatePhase = __PROFILE__;\n export const enableUpdaterTracking = __PROFILE__;\n export const enableCache = true;\n export const enableLegacyCache = false;\n-export const enableCacheElement = true;\n export const enableFetchInstrumentation = false;\n export const enableBinaryFlight = true;\n export const enableTaint = true;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js b\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\nindex 904f165c21..4287a6afba 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\n@@ -48,7 +48,6 @@ export const enableRenderableContext = __TODO_NEXT_RN_MAJOR__;\n const __NEXT_RN_MAJOR__ = true;\n export const disableClientCache = __NEXT_RN_MAJOR__;\n export const disableLegacyContext = __NEXT_RN_MAJOR__;\n-export const enableCacheElement = __NEXT_RN_MAJOR__;\n export const enableTaint = __NEXT_RN_MAJOR__;\n export const enableUnifiedSyncLane = __NEXT_RN_MAJOR__;\n export const enableFizzExternalRuntime = __NEXT_RN_MAJOR__; \/\/ DOM-only\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\nindex df84dd4d4c..67ef3589ca 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\n@@ -20,7 +20,6 @@ export const enableProfilerNestedUpdatePhase = __PROFILE__;\n export const enableUpdaterTracking = false;\n export const enableCache = true;\n export const enableLegacyCache = __EXPERIMENTAL__;\n-export const enableCacheElement = __EXPERIMENTAL__;\n export const enableFetchInstrumentation = true;\n export const enableBinaryFlight = true;\n export const enableTaint = true;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js\nindex 879806d751..4a860268d0 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js\n@@ -20,7 +20,6 @@ export const enableProfilerNestedUpdatePhase = __PROFILE__;\n export const enableUpdaterTracking = false;\n export const enableCache = true;\n export const enableLegacyCache = false;\n-export const enableCacheElement = true;\n export const enableFetchInstrumentation = false;\n export const enableBinaryFlight = true;\n export const enableTaint = true;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\nindex 137852fad7..9f95dacd7a 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\n@@ -20,7 +20,6 @@ export const enableProfilerNestedUpdatePhase = __PROFILE__;\n export const enableUpdaterTracking = false;\n export const enableCache = true;\n export const enableLegacyCache = true;\n-export const enableCacheElement = true;\n export const enableFetchInstrumentation = false;\n export const enableBinaryFlight = true;\n export const enableTaint = true;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.www.js\nindex 4a4fa99aba..688fa5bc77 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.www.js\n@@ -67,7 +67,6 @@ export const enableGetInspectorDataForInstanceInProduction = false;\n \n export const enableCache = true;\n export const enableLegacyCache = true;\n-export const enableCacheElement = true;\n export const enableFetchInstrumentation = false;\n \n export const enableBinaryFlight = false;\ndiff --git a\/packages\/shared\/getComponentNameFromType.js b\/packages\/shared\/getComponentNameFromType.js\nindex fb63ff465a..b0e2a0f782 100644\n--- a\/packages\/shared\/getComponentNameFromType.js\n+++ b\/packages\/shared\/getComponentNameFromType.js\n@@ -23,13 +23,11 @@ import {\n REACT_SUSPENSE_TYPE,\n REACT_SUSPENSE_LIST_TYPE,\n REACT_LAZY_TYPE,\n- REACT_CACHE_TYPE,\n REACT_TRACING_MARKER_TYPE,\n } from 'shared\/ReactSymbols';\n \n import {\n enableTransitionTracing,\n- enableCache,\n enableRenderableContext,\n } from '.\/ReactFeatureFlags';\n \n@@ -83,10 +81,6 @@ export default function getComponentNameFromType(type: mixed): string | null {\n return 'Suspense';\n case REACT_SUSPENSE_LIST_TYPE:\n return 'SuspenseList';\n- case REACT_CACHE_TYPE:\n- if (enableCache) {\n- return 'Cache';\n- }\n \/\/ Fall through\n case REACT_TRACING_MARKER_TYPE:\n if (enableTransitionTracing) {\ndiff --git a\/packages\/shared\/isValidElementType.js b\/packages\/shared\/isValidElementType.js\nindex aa2092a923..6f0edaf8ea 100644\n--- a\/packages\/shared\/isValidElementType.js\n+++ b\/packages\/shared\/isValidElementType.js\n@@ -23,12 +23,10 @@ import {\n REACT_SCOPE_TYPE,\n REACT_LEGACY_HIDDEN_TYPE,\n REACT_OFFSCREEN_TYPE,\n- REACT_CACHE_TYPE,\n REACT_TRACING_MARKER_TYPE,\n } from 'shared\/ReactSymbols';\n import {\n enableScopeAPI,\n- enableCacheElement,\n enableTransitionTracing,\n enableDebugTracing,\n enableLegacyHidden,\n@@ -53,7 +51,6 @@ export default function isValidElementType(type: mixed): boolean {\n (enableLegacyHidden && type === REACT_LEGACY_HIDDEN_TYPE) ||\n type === REACT_OFFSCREEN_TYPE ||\n (enableScopeAPI && type === REACT_SCOPE_TYPE) ||\n- (enableCacheElement && type === REACT_CACHE_TYPE) ||\n (enableTransitionTracing && type === REACT_TRACING_MARKER_TYPE)\n ) {\n return true;\n","commit":{"authorName":"Joseph Savona","authorEmail":"josephsavona@users.noreply.github.com","subject":"[be] Remove unshipped experimental element type (#28698)","shortRevision":"7319c61b18","revision":"7319c61b18274ee7e7c20bd2e533b93c922d8fe0","authoredAt":"2024-04-02T07:57:08-07:00"},"body":"Removes the `` element type since we're going with a simpler\r\ncaching strategy.","parents":["c97564d7ac3b8ee344719d78e6a28e81854dd7a2"],"files":[{"status":"M","path":"packages\/react-devtools-shared\/src\/__tests__\/store-test.js"},{"status":"M","path":"packages\/react-devtools-shell\/src\/app\/ElementTypes\/index.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiber.js"},{"status":"D","path":"packages\/react-reconciler\/src\/__tests__\/ReactCacheElement-test.js"},{"status":"M","path":"packages\/react\/index.classic.fb.js"},{"status":"M","path":"packages\/react\/index.experimental.js"},{"status":"M","path":"packages\/react\/index.js"},{"status":"M","path":"packages\/react\/index.modern.fb.js"},{"status":"M","path":"packages\/react\/src\/ReactClient.js"},{"status":"M","path":"packages\/shared\/ReactFeatureFlags.js"},{"status":"M","path":"packages\/shared\/ReactSymbols.js"},{"status":"M","path":"packages\/shared\/forks\/ReactFeatureFlags.native-fb.js"},{"status":"M","path":"packages\/shared\/forks\/ReactFeatureFlags.native-oss.js"},{"status":"M","path":"packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js"},{"status":"M","path":"packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js"},{"status":"M","path":"packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js"},{"status":"M","path":"packages\/shared\/forks\/ReactFeatureFlags.www.js"},{"status":"M","path":"packages\/shared\/getComponentNameFromType.js"},{"status":"M","path":"packages\/shared\/isValidElementType.js"}]}

dillon1000/react

Files changed