{"commit":{"authoredAt":"2021-05-03T16:57:03-04:00","subject":"createRoot API is no longer strict by default (#21417)","shortRevision":"15fb8c3045","authorEmail":"bvaughn@fb.com","revision":"15fb8c3045064e13e81706a36bf0e4e419803c97","authorName":"Brian Vaughn"},"parents":["aea7c2aab18f2c288a1fcab0cf7a14560b5db35e"],"files":[{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactTestUtilsAct-test.js"},{"status":"M","path":"packages\/react-dom\/src\/client\/ReactDOMRoot.js"},{"status":"M","path":"packages\/react-native-renderer\/src\/ReactFabric.js"},{"status":"M","path":"packages\/react-native-renderer\/src\/ReactNativeRenderer.js"},{"status":"M","path":"packages\/react-noop-renderer\/src\/createReactNoop.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiber.new.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiber.old.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberReconciler.new.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberReconciler.old.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberRoot.new.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberRoot.old.js"},{"status":"M","path":"packages\/react-reconciler\/src\/__tests__\/DebugTracing-test.internal.js"},{"status":"M","path":"packages\/react-reconciler\/src\/__tests__\/ReactHooksWithNoopRenderer-test.js"},{"status":"M","path":"packages\/react-reconciler\/src\/__tests__\/ReactIncremental-test.js"},{"status":"M","path":"packages\/react-reconciler\/src\/__tests__\/ReactIncrementalErrorHandling-test.internal.js"},{"status":"M","path":"packages\/react-reconciler\/src\/__tests__\/ReactIncrementalReflection-test.js"},{"status":"M","path":"packages\/react-reconciler\/src\/__tests__\/ReactIncrementalSideEffects-test.js"},{"status":"M","path":"packages\/react-reconciler\/src\/__tests__\/ReactIncrementalUpdates-test.js"},{"status":"M","path":"packages\/react-reconciler\/src\/__tests__\/ReactNewContext-test.js"},{"status":"M","path":"packages\/react-reconciler\/src\/__tests__\/useMutableSource-test.internal.js"},{"status":"M","path":"packages\/react-test-renderer\/src\/ReactTestRenderer.js"},{"status":"M","path":"packages\/react\/src\/__tests__\/ReactStrictMode-test.internal.js"},{"status":"M","path":"packages\/react\/src\/__tests__\/ReactStrictMode-test.js"},{"status":"M","path":"packages\/react\/src\/__tests__\/forwardRef-test.js"}],"patch":"diff --git a\/packages\/react-dom\/src\/__tests__\/ReactTestUtilsAct-test.js b\/packages\/react-dom\/src\/__tests__\/ReactTestUtilsAct-test.js\nindex 6ce9981fde..8419c93c38 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactTestUtilsAct-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactTestUtilsAct-test.js\n@@ -97,16 +97,10 @@ describe('ReactTestUtils.act()', () => {\n });\n \n \/\/ @gate experimental\n- it('warns in concurrent mode', () => {\n- expect(() => {\n- const root = ReactDOM.unstable_createRoot(\n- document.createElement('div'),\n- );\n- root.render();\n- Scheduler.unstable_flushAll();\n- }).toErrorDev([\n- 'An update to App ran an effect, but was not wrapped in act(...)',\n- ]);\n+ it('does not warn in concurrent mode', () => {\n+ const root = ReactDOM.unstable_createRoot(document.createElement('div'));\n+ root.render();\n+ Scheduler.unstable_flushAll();\n });\n });\n });\ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOMRoot.js b\/packages\/react-dom\/src\/client\/ReactDOMRoot.js\nindex 0a78f61ad0..73e96eb086 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOMRoot.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOMRoot.js\n@@ -27,7 +27,6 @@ export type RootOptions = {\n mutableSources?: Array>,\n ...\n },\n- unstable_strictModeLevel?: number,\n unstable_concurrentUpdatesByDefault?: boolean,\n ...\n };\n@@ -123,10 +122,6 @@ function createRootImpl(\n options.hydrationOptions != null &&\n options.hydrationOptions.mutableSources) ||\n null;\n- const strictModeLevelOverride =\n- options != null && options.unstable_strictModeLevel != null\n- ? options.unstable_strictModeLevel\n- : null;\n \n let concurrentUpdatesByDefaultOverride = null;\n if (allowConcurrentByDefault) {\n@@ -141,7 +136,6 @@ function createRootImpl(\n tag,\n hydrate,\n hydrationCallbacks,\n- strictModeLevelOverride,\n concurrentUpdatesByDefaultOverride,\n );\n markContainerAsRoot(root.current, container);\ndiff --git a\/packages\/react-native-renderer\/src\/ReactFabric.js b\/packages\/react-native-renderer\/src\/ReactFabric.js\nindex b319cb22c7..9f1f44f51c 100644\n--- a\/packages\/react-native-renderer\/src\/ReactFabric.js\n+++ b\/packages\/react-native-renderer\/src\/ReactFabric.js\n@@ -207,7 +207,7 @@ function render(\n if (!root) {\n \/\/ TODO (bvaughn): If we decide to keep the wrapper component,\n \/\/ We could create a wrapper for containerTag as well to reduce special casing.\n- root = createContainer(containerTag, LegacyRoot, false, null, null, null);\n+ root = createContainer(containerTag, LegacyRoot, false, null, null);\n roots.set(containerTag, root);\n }\n updateContainer(element, root, null, callback);\ndiff --git a\/packages\/react-native-renderer\/src\/ReactNativeRenderer.js b\/packages\/react-native-renderer\/src\/ReactNativeRenderer.js\nindex 4f73377320..de42c6e41a 100644\n--- a\/packages\/react-native-renderer\/src\/ReactNativeRenderer.js\n+++ b\/packages\/react-native-renderer\/src\/ReactNativeRenderer.js\n@@ -203,7 +203,7 @@ function render(\n if (!root) {\n \/\/ TODO (bvaughn): If we decide to keep the wrapper component,\n \/\/ We could create a wrapper for containerTag as well to reduce special casing.\n- root = createContainer(containerTag, LegacyRoot, false, null, null, null);\n+ root = createContainer(containerTag, LegacyRoot, false, null, null);\n roots.set(containerTag, root);\n }\n updateContainer(element, root, null, callback);\ndiff --git a\/packages\/react-noop-renderer\/src\/createReactNoop.js b\/packages\/react-noop-renderer\/src\/createReactNoop.js\nindex 9d2c87621b..659f4d63fc 100644\n--- a\/packages\/react-noop-renderer\/src\/createReactNoop.js\n+++ b\/packages\/react-noop-renderer\/src\/createReactNoop.js\n@@ -722,7 +722,7 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {\n if (!root) {\n const container = {rootID: rootID, pendingChildren: [], children: []};\n rootContainers.set(rootID, container);\n- root = NoopRenderer.createContainer(container, tag, false, null, null);\n+ root = NoopRenderer.createContainer(container, tag, false, null);\n roots.set(rootID, root);\n }\n return root.current.stateNode.containerInfo;\n@@ -740,7 +740,6 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {\n ConcurrentRoot,\n false,\n null,\n- null,\n );\n return {\n _Scheduler: Scheduler,\n@@ -767,7 +766,6 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {\n LegacyRoot,\n false,\n null,\n- null,\n );\n return {\n _Scheduler: Scheduler,\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiber.new.js b\/packages\/react-reconciler\/src\/ReactFiber.new.js\nindex c883079028..fcb757b96a 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiber.new.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiber.new.js\n@@ -422,27 +422,13 @@ export function resetWorkInProgress(workInProgress: Fiber, renderLanes: Lanes) {\n \n export function createHostRootFiber(\n tag: RootTag,\n- strictModeLevelOverride: null | number,\n concurrentUpdatesByDefaultOverride: null | boolean,\n ): Fiber {\n let mode;\n if (tag === ConcurrentRoot) {\n mode = ConcurrentMode;\n- if (strictModeLevelOverride !== null) {\n- if (strictModeLevelOverride >= 1) {\n- mode |= StrictLegacyMode;\n- }\n- if (enableStrictEffects) {\n- if (strictModeLevelOverride >= 2) {\n- mode |= StrictEffectsMode;\n- }\n- }\n- } else {\n- if (enableStrictEffects && createRootStrictEffectsByDefault) {\n- mode |= StrictLegacyMode | StrictEffectsMode;\n- } else {\n- mode |= StrictLegacyMode;\n- }\n+ if (enableStrictEffects && createRootStrictEffectsByDefault) {\n+ mode |= StrictLegacyMode | StrictEffectsMode;\n }\n if (\n \/\/ We only use this flag for our repo tests to check both behaviors.\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiber.old.js b\/packages\/react-reconciler\/src\/ReactFiber.old.js\nindex e33c0e7cd8..50947ff94c 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiber.old.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiber.old.js\n@@ -422,27 +422,13 @@ export function resetWorkInProgress(workInProgress: Fiber, renderLanes: Lanes) {\n \n export function createHostRootFiber(\n tag: RootTag,\n- strictModeLevelOverride: null | number,\n concurrentUpdatesByDefaultOverride: null | boolean,\n ): Fiber {\n let mode;\n if (tag === ConcurrentRoot) {\n mode = ConcurrentMode;\n- if (strictModeLevelOverride !== null) {\n- if (strictModeLevelOverride >= 1) {\n- mode |= StrictLegacyMode;\n- }\n- if (enableStrictEffects) {\n- if (strictModeLevelOverride >= 2) {\n- mode |= StrictEffectsMode;\n- }\n- }\n- } else {\n- if (enableStrictEffects && createRootStrictEffectsByDefault) {\n- mode |= StrictLegacyMode | StrictEffectsMode;\n- } else {\n- mode |= StrictLegacyMode;\n- }\n+ if (enableStrictEffects && createRootStrictEffectsByDefault) {\n+ mode |= StrictLegacyMode | StrictEffectsMode;\n }\n if (\n \/\/ We only use this flag for our repo tests to check both behaviors.\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberReconciler.new.js b\/packages\/react-reconciler\/src\/ReactFiberReconciler.new.js\nindex f53a24e86c..b19223db37 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberReconciler.new.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberReconciler.new.js\n@@ -248,7 +248,6 @@ export function createContainer(\n tag: RootTag,\n hydrate: boolean,\n hydrationCallbacks: null | SuspenseHydrationCallbacks,\n- strictModeLevelOverride: null | number,\n concurrentUpdatesByDefaultOverride: null | boolean,\n ): OpaqueRoot {\n return createFiberRoot(\n@@ -256,7 +255,6 @@ export function createContainer(\n tag,\n hydrate,\n hydrationCallbacks,\n- strictModeLevelOverride,\n concurrentUpdatesByDefaultOverride,\n );\n }\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberReconciler.old.js b\/packages\/react-reconciler\/src\/ReactFiberReconciler.old.js\nindex 00c12b3406..fe528b8316 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberReconciler.old.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberReconciler.old.js\n@@ -248,7 +248,6 @@ export function createContainer(\n tag: RootTag,\n hydrate: boolean,\n hydrationCallbacks: null | SuspenseHydrationCallbacks,\n- strictModeLevelOverride: null | number,\n concurrentUpdatesByDefaultOverride: null | boolean,\n ): OpaqueRoot {\n return createFiberRoot(\n@@ -256,7 +255,6 @@ export function createContainer(\n tag,\n hydrate,\n hydrationCallbacks,\n- strictModeLevelOverride,\n concurrentUpdatesByDefaultOverride,\n );\n }\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberRoot.new.js b\/packages\/react-reconciler\/src\/ReactFiberRoot.new.js\nindex d2efcc5851..ae62134de1 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberRoot.new.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberRoot.new.js\n@@ -98,7 +98,6 @@ export function createFiberRoot(\n tag: RootTag,\n hydrate: boolean,\n hydrationCallbacks: null | SuspenseHydrationCallbacks,\n- strictModeLevelOverride: null | number,\n concurrentUpdatesByDefaultOverride: null | boolean,\n ): FiberRoot {\n const root: FiberRoot = (new FiberRootNode(containerInfo, tag, hydrate): any);\n@@ -110,7 +109,6 @@ export function createFiberRoot(\n \/\/ stateNode is any.\n const uninitializedFiber = createHostRootFiber(\n tag,\n- strictModeLevelOverride,\n concurrentUpdatesByDefaultOverride,\n );\n root.current = uninitializedFiber;\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberRoot.old.js b\/packages\/react-reconciler\/src\/ReactFiberRoot.old.js\nindex 68d329492c..83d4de95b6 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberRoot.old.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberRoot.old.js\n@@ -98,7 +98,6 @@ export function createFiberRoot(\n tag: RootTag,\n hydrate: boolean,\n hydrationCallbacks: null | SuspenseHydrationCallbacks,\n- strictModeLevelOverride: null | number,\n concurrentUpdatesByDefaultOverride: null | boolean,\n ): FiberRoot {\n const root: FiberRoot = (new FiberRootNode(containerInfo, tag, hydrate): any);\n@@ -110,7 +109,6 @@ export function createFiberRoot(\n \/\/ stateNode is any.\n const uninitializedFiber = createHostRootFiber(\n tag,\n- strictModeLevelOverride,\n concurrentUpdatesByDefaultOverride,\n );\n root.current = uninitializedFiber;\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/DebugTracing-test.internal.js b\/packages\/react-reconciler\/src\/__tests__\/DebugTracing-test.internal.js\nindex 83fc6b2eba..c3dc4df1cf 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/DebugTracing-test.internal.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/DebugTracing-test.internal.js\n@@ -282,7 +282,6 @@ describe('DebugTracing', () => {\n expect(logs).toEqual([\n `group: ⚛️ render (${DEFAULT_LANE_STRING})`,\n `log: ⚛️ Example updated state (${DEFAULT_LANE_STRING})`,\n- `log: ⚛️ Example updated state (${DEFAULT_LANE_STRING})`,\n `groupEnd: ⚛️ render (${DEFAULT_LANE_STRING})`,\n ]);\n });\n@@ -366,7 +365,6 @@ describe('DebugTracing', () => {\n expect(logs).toEqual([\n `group: ⚛️ render (${DEFAULT_LANE_STRING})`,\n `log: ⚛️ Example updated state (${DEFAULT_LANE_STRING})`,\n- `log: ⚛️ Example updated state (${DEFAULT_LANE_STRING})`, \/\/ debugRenderPhaseSideEffectsForStrictMode\n `groupEnd: ⚛️ render (${DEFAULT_LANE_STRING})`,\n ]);\n });\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactHooksWithNoopRenderer-test.js b\/packages\/react-reconciler\/src\/__tests__\/ReactHooksWithNoopRenderer-test.js\nindex 27d09697fc..6758d9d4dc 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactHooksWithNoopRenderer-test.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactHooksWithNoopRenderer-test.js\n@@ -520,11 +520,7 @@ describe('ReactHooksWithNoopRenderer', () => {\n <\/>,\n );\n expect(() =>\n- expect(Scheduler).toFlushAndYield(\n- __DEV__\n- ? ['Foo [0]', 'Bar', 'Foo [2]']\n- : ['Foo [0]', 'Bar', 'Foo [1]'],\n- ),\n+ expect(Scheduler).toFlushAndYield(['Foo [0]', 'Bar', 'Foo [1]']),\n ).toErrorDev([\n 'Cannot update a component (`Foo`) while rendering a ' +\n 'different component (`Bar`). To locate the bad setState() call inside `Bar`',\n@@ -539,11 +535,7 @@ describe('ReactHooksWithNoopRenderer', () => {\n \n <\/>,\n );\n- expect(Scheduler).toFlushAndYield(\n- __DEV__\n- ? ['Foo [2]', 'Bar', 'Foo [4]']\n- : ['Foo [1]', 'Bar', 'Foo [2]'],\n- );\n+ expect(Scheduler).toFlushAndYield(['Foo [1]', 'Bar', 'Foo [2]']);\n });\n });\n \n@@ -1765,16 +1757,11 @@ describe('ReactHooksWithNoopRenderer', () => {\n return ;\n }\n \n- \/\/ we explicitly wait for missing act() warnings here since\n- \/\/ it's a lot harder to simulate this condition inside an act scope\n- expect(() => {\n- ReactNoop.render(, () =>\n- Scheduler.unstable_yieldValue('Sync effect'),\n- );\n- expect(Scheduler).toFlushAndYieldThrough(['Count: 0', 'Sync effect']);\n- expect(ReactNoop.getChildren()).toEqual([span('Count: 0')]);\n- }).toErrorDev(['An update to Counter ran an effect']);\n-\n+ ReactNoop.render(, () =>\n+ Scheduler.unstable_yieldValue('Sync effect'),\n+ );\n+ expect(Scheduler).toFlushAndYieldThrough(['Count: 0', 'Sync effect']);\n+ expect(ReactNoop.getChildren()).toEqual([span('Count: 0')]);\n \/\/ A flush sync doesn't cause the passive effects to fire.\n \/\/ So we haven't added the other update yet.\n act(() => {\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactIncremental-test.js b\/packages\/react-reconciler\/src\/__tests__\/ReactIncremental-test.js\nindex e505d1e243..efcb4d7288 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactIncremental-test.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactIncremental-test.js\n@@ -1863,18 +1863,11 @@ describe('ReactIncremental', () => {\n <\/div>\n <\/Intl>,\n );\n- expect(() =>\n- expect(Scheduler).toFlushAndYield([\n- 'Intl {}',\n- 'ShowLocale {\"locale\":\"fr\"}',\n- 'ShowBoth {\"locale\":\"fr\"}',\n- ]),\n- ).toErrorDev(\n- 'Legacy context API has been detected within a strict-mode tree.\\n\\n' +\n- 'The old API will be supported in all 16.x releases, but applications ' +\n- 'using it should migrate to the new version.\\n\\n' +\n- 'Please update the following components: Intl, ShowBoth, ShowLocale',\n- );\n+ expect(Scheduler).toFlushAndYield([\n+ 'Intl {}',\n+ 'ShowLocale {\"locale\":\"fr\"}',\n+ 'ShowBoth {\"locale\":\"fr\"}',\n+ ]);\n \n ReactNoop.render(\n \n@@ -1921,28 +1914,21 @@ describe('ReactIncremental', () => {\n \n <\/Intl>,\n );\n- expect(() =>\n- expect(Scheduler).toFlushAndYield([\n- 'ShowLocale {\"locale\":\"sv\"}',\n- 'ShowBoth {\"locale\":\"sv\"}',\n- 'Intl {}',\n- 'ShowLocale {\"locale\":\"en\"}',\n- 'Router {}',\n- 'Indirection {}',\n- 'ShowLocale {\"locale\":\"en\"}',\n- 'ShowRoute {\"route\":\"\/about\"}',\n- 'ShowNeither {}',\n- 'Intl {}',\n- 'ShowBoth {\"locale\":\"ru\",\"route\":\"\/about\"}',\n- 'ShowBoth {\"locale\":\"en\",\"route\":\"\/about\"}',\n- 'ShowBoth {\"locale\":\"en\"}',\n- ]),\n- ).toErrorDev(\n- 'Legacy context API has been detected within a strict-mode tree.\\n\\n' +\n- 'The old API will be supported in all 16.x releases, but applications ' +\n- 'using it should migrate to the new version.\\n\\n' +\n- 'Please update the following components: Router, ShowRoute',\n- );\n+ expect(Scheduler).toFlushAndYield([\n+ 'ShowLocale {\"locale\":\"sv\"}',\n+ 'ShowBoth {\"locale\":\"sv\"}',\n+ 'Intl {}',\n+ 'ShowLocale {\"locale\":\"en\"}',\n+ 'Router {}',\n+ 'Indirection {}',\n+ 'ShowLocale {\"locale\":\"en\"}',\n+ 'ShowRoute {\"route\":\"\/about\"}',\n+ 'ShowNeither {}',\n+ 'Intl {}',\n+ 'ShowBoth {\"locale\":\"ru\",\"route\":\"\/about\"}',\n+ 'ShowBoth {\"locale\":\"en\",\"route\":\"\/about\"}',\n+ 'ShowBoth {\"locale\":\"en\"}',\n+ ]);\n });\n \n it('does not leak own context into context provider', () => {\n@@ -1968,19 +1954,12 @@ describe('ReactIncremental', () => {\n }\n \n ReactNoop.render();\n- expect(() =>\n- expect(Scheduler).toFlushAndYield([\n- 'Recurse {}',\n- 'Recurse {\"n\":2}',\n- 'Recurse {\"n\":1}',\n- 'Recurse {\"n\":0}',\n- ]),\n- ).toErrorDev(\n- 'Legacy context API has been detected within a strict-mode tree.\\n\\n' +\n- 'The old API will be supported in all 16.x releases, but applications ' +\n- 'using it should migrate to the new version.\\n\\n' +\n- 'Please update the following components: Recurse',\n- );\n+ expect(Scheduler).toFlushAndYield([\n+ 'Recurse {}',\n+ 'Recurse {\"n\":2}',\n+ 'Recurse {\"n\":1}',\n+ 'Recurse {\"n\":0}',\n+ ]);\n });\n \n if (!require('shared\/ReactFeatureFlags').disableModulePatternComponents) {\n@@ -2020,10 +1999,6 @@ describe('ReactIncremental', () => {\n \"If you can't use a class try assigning the prototype on the function as a workaround. \" +\n '`Recurse.prototype = React.Component.prototype`. ' +\n \"Don't use an arrow function since it cannot be called with `new` by React.\",\n- 'Legacy context API has been detected within a strict-mode tree.\\n\\n' +\n- 'The old API will be supported in all 16.x releases, but applications ' +\n- 'using it should migrate to the new version.\\n\\n' +\n- 'Please update the following components: Recurse',\n ]);\n });\n }\n@@ -2092,18 +2067,11 @@ describe('ReactIncremental', () => {\n 'ShowLocale {\"locale\":\"fr\"}',\n ]);\n \n- expect(() =>\n- expect(Scheduler).toFlushAndYield([\n- 'ShowLocale {\"locale\":\"fr\"}',\n- 'Intl {}',\n- 'ShowLocale {\"locale\":\"ru\"}',\n- ]),\n- ).toErrorDev(\n- 'Legacy context API has been detected within a strict-mode tree.\\n\\n' +\n- 'The old API will be supported in all 16.x releases, but applications ' +\n- 'using it should migrate to the new version.\\n\\n' +\n- 'Please update the following components: Intl, ShowLocale',\n- );\n+ expect(Scheduler).toFlushAndYield([\n+ 'ShowLocale {\"locale\":\"fr\"}',\n+ 'Intl {}',\n+ 'ShowLocale {\"locale\":\"ru\"}',\n+ ]);\n });\n \n it('reads context when setState is below the provider', () => {\n@@ -2186,21 +2154,14 @@ describe('ReactIncremental', () => {\n <\/IndirectionFn>\n <\/Intl>,\n );\n- expect(() =>\n- expect(Scheduler).toFlushAndYield([\n- 'Intl:read {}',\n- 'Intl:provide {\"locale\":\"fr\"}',\n- 'IndirectionFn {}',\n- 'IndirectionClass {}',\n- 'ShowLocaleClass:read {\"locale\":\"fr\"}',\n- 'ShowLocaleFn:read {\"locale\":\"fr\"}',\n- ]),\n- ).toErrorDev(\n- 'Legacy context API has been detected within a strict-mode tree.\\n\\n' +\n- 'The old API will be supported in all 16.x releases, but applications ' +\n- 'using it should migrate to the new version.\\n\\n' +\n- 'Please update the following components: Intl, ShowLocaleClass, ShowLocaleFn',\n- );\n+ expect(Scheduler).toFlushAndYield([\n+ 'Intl:read {}',\n+ 'Intl:provide {\"locale\":\"fr\"}',\n+ 'IndirectionFn {}',\n+ 'IndirectionClass {}',\n+ 'ShowLocaleClass:read {\"locale\":\"fr\"}',\n+ 'ShowLocaleFn:read {\"locale\":\"fr\"}',\n+ ]);\n \n statefulInst.setState({x: 1});\n expect(Scheduler).toFlushWithoutYielding();\n@@ -2287,21 +2248,14 @@ describe('ReactIncremental', () => {\n <\/IndirectionFn>\n <\/Stateful>,\n );\n- expect(() =>\n- expect(Scheduler).toFlushAndYield([\n- 'Intl:read {}',\n- 'Intl:provide {\"locale\":\"fr\"}',\n- 'IndirectionFn {}',\n- 'IndirectionClass {}',\n- 'ShowLocaleClass:read {\"locale\":\"fr\"}',\n- 'ShowLocaleFn:read {\"locale\":\"fr\"}',\n- ]),\n- ).toErrorDev(\n- 'Legacy context API has been detected within a strict-mode tree.\\n\\n' +\n- 'The old API will be supported in all 16.x releases, but applications ' +\n- 'using it should migrate to the new version.\\n\\n' +\n- 'Please update the following components: Intl, ShowLocaleClass, ShowLocaleFn',\n- );\n+ expect(Scheduler).toFlushAndYield([\n+ 'Intl:read {}',\n+ 'Intl:provide {\"locale\":\"fr\"}',\n+ 'IndirectionFn {}',\n+ 'IndirectionClass {}',\n+ 'ShowLocaleClass:read {\"locale\":\"fr\"}',\n+ 'ShowLocaleFn:read {\"locale\":\"fr\"}',\n+ ]);\n \n statefulInst.setState({locale: 'gr'});\n expect(Scheduler).toFlushAndYield([\n@@ -2356,12 +2310,7 @@ describe('ReactIncremental', () => {\n \n \/\/ Init\n ReactNoop.render();\n- expect(() => expect(Scheduler).toFlushWithoutYielding()).toErrorDev(\n- 'Legacy context API has been detected within a strict-mode tree.\\n\\n' +\n- 'The old API will be supported in all 16.x releases, but applications ' +\n- 'using it should migrate to the new version.\\n\\n' +\n- 'Please update the following components: Child',\n- );\n+ expect(Scheduler).toFlushWithoutYielding();\n \n \/\/ Trigger an update in the middle of the tree\n instance.setState({});\n@@ -2407,12 +2356,7 @@ describe('ReactIncremental', () => {\n \n \/\/ Init\n ReactNoop.render();\n- expect(() => expect(Scheduler).toFlushWithoutYielding()).toErrorDev(\n- 'Legacy context API has been detected within a strict-mode tree.\\n\\n' +\n- 'The old API will be supported in all 16.x releases, but applications ' +\n- 'using it should migrate to the new version.\\n\\n' +\n- 'Please update the following components: ContextProvider',\n- );\n+ expect(Scheduler).toFlushWithoutYielding();\n \n \/\/ Trigger an update in the middle of the tree\n \/\/ This is necessary to reproduce the error as it currently exists.\n@@ -2454,27 +2398,16 @@ describe('ReactIncremental', () => {\n }\n \n ReactNoop.render();\n- expect(() =>\n- expect(Scheduler).toFlushAndYield([\n- 'render',\n- 'componentDidMount',\n- 'shouldComponentUpdate',\n- 'render',\n- 'componentDidUpdate',\n- 'shouldComponentUpdate',\n- 'render',\n- 'componentDidUpdate',\n- ]),\n- ).toErrorDev(\n- [\n- 'Using UNSAFE_componentWillReceiveProps in strict mode is not recommended',\n- 'Legacy context API has been detected within a strict-mode tree.\\n\\n' +\n- 'The old API will be supported in all 16.x releases, but applications ' +\n- 'using it should migrate to the new version.\\n\\n' +\n- 'Please update the following components: MyComponent',\n- ],\n- {withoutStack: 1},\n- );\n+ expect(Scheduler).toFlushAndYield([\n+ 'render',\n+ 'componentDidMount',\n+ 'shouldComponentUpdate',\n+ 'render',\n+ 'componentDidUpdate',\n+ 'shouldComponentUpdate',\n+ 'render',\n+ 'componentDidUpdate',\n+ ]);\n });\n \n xit('should reuse memoized work if pointers are updated before calling lifecycles', () => {\n@@ -2604,12 +2537,7 @@ describe('ReactIncremental', () => {\n <\/TopContextProvider>,\n );\n \n- expect(() => expect(Scheduler).toFlushAndYield(['count:0'])).toErrorDev(\n- 'Legacy context API has been detected within a strict-mode tree.\\n\\n' +\n- 'The old API will be supported in all 16.x releases, but applications ' +\n- 'using it should migrate to the new version.\\n\\n' +\n- 'Please update the following components: Child, TopContextProvider',\n- );\n+ expect(Scheduler).toFlushAndYield(['count:0']);\n instance.updateCount();\n expect(Scheduler).toFlushAndYield(['count:1']);\n });\n@@ -2664,12 +2592,7 @@ describe('ReactIncremental', () => {\n <\/TopContextProvider>,\n );\n \n- expect(() => expect(Scheduler).toFlushAndYield(['count:0'])).toErrorDev(\n- 'Legacy context API has been detected within a strict-mode tree.\\n\\n' +\n- 'The old API will be supported in all 16.x releases, but applications ' +\n- 'using it should migrate to the new version.\\n\\n' +\n- 'Please update the following components: Child, MiddleContextProvider, TopContextProvider',\n- );\n+ expect(Scheduler).toFlushAndYield(['count:0']);\n instance.updateCount();\n expect(Scheduler).toFlushAndYield(['count:1']);\n });\n@@ -2733,12 +2656,7 @@ describe('ReactIncremental', () => {\n <\/TopContextProvider>,\n );\n \n- expect(() => expect(Scheduler).toFlushAndYield(['count:0'])).toErrorDev(\n- 'Legacy context API has been detected within a strict-mode tree.\\n\\n' +\n- 'The old API will be supported in all 16.x releases, but applications ' +\n- 'using it should migrate to the new version.\\n\\n' +\n- 'Please update the following components: Child, MiddleContextProvider, TopContextProvider',\n- );\n+ expect(Scheduler).toFlushAndYield(['count:0']);\n instance.updateCount();\n expect(Scheduler).toFlushWithoutYielding();\n });\n@@ -2814,14 +2732,7 @@ describe('ReactIncremental', () => {\n <\/TopContextProvider>,\n );\n \n- expect(() =>\n- expect(Scheduler).toFlushAndYield(['count:0, name:brian']),\n- ).toErrorDev(\n- 'Legacy context API has been detected within a strict-mode tree.\\n\\n' +\n- 'The old API will be supported in all 16.x releases, but applications ' +\n- 'using it should migrate to the new version.\\n\\n' +\n- 'Please update the following components: Child, MiddleContextProvider, TopContextProvider',\n- );\n+ expect(Scheduler).toFlushAndYield(['count:0, name:brian']);\n topInstance.updateCount();\n expect(Scheduler).toFlushWithoutYielding();\n middleInstance.updateName('not brian');\n@@ -2933,7 +2844,11 @@ describe('ReactIncremental', () => {\n return this.state.didError ? null : ;\n }\n }\n- ReactNoop.render();\n+ ReactNoop.render(\n+ \n+ \n+ <\/React.StrictMode>,\n+ );\n expect(() => {\n expect(Scheduler).toFlushWithoutYielding();\n }).toErrorDev([\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalErrorHandling-test.internal.js b\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalErrorHandling-test.internal.js\nindex 186085c843..d26a433b6f 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalErrorHandling-test.internal.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalErrorHandling-test.internal.js\n@@ -1286,12 +1286,7 @@ describe('ReactIncrementalErrorHandling', () => {\n \n <\/Provider>,\n );\n- expect(() => expect(Scheduler).toFlushWithoutYielding()).toErrorDev(\n- 'Legacy context API has been detected within a strict-mode tree.\\n\\n' +\n- 'The old API will be supported in all 16.x releases, but ' +\n- 'applications using it should migrate to the new version.\\n\\n' +\n- 'Please update the following components: Connector, Provider',\n- );\n+ expect(Scheduler).toFlushWithoutYielding();\n \n \/\/ If the context stack does not unwind, span will get 'abcde'\n expect(ReactNoop.getChildren()).toEqual([span('a')]);\n@@ -1843,10 +1838,6 @@ describe('ReactIncrementalErrorHandling', () => {\n \"If you can't use a class try assigning the prototype on the function as a workaround. \" +\n '`Provider.prototype = React.Component.prototype`. ' +\n \"Don't use an arrow function since it cannot be called with `new` by React.\",\n- 'Legacy context API has been detected within a strict-mode tree.\\n\\n' +\n- 'The old API will be supported in all 16.x releases, but ' +\n- 'applications using it should migrate to the new version.\\n\\n' +\n- 'Please update the following components: Provider',\n ]);\n });\n }\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalReflection-test.js b\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalReflection-test.js\nindex b372bc8fce..def901c153 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalReflection-test.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalReflection-test.js\n@@ -78,12 +78,7 @@ describe('ReactIncrementalReflection', () => {\n expect(instances[0]._isMounted()).toBe(false);\n \n \/\/ Render the rest and commit the updates.\n- expect(() =>\n- expect(Scheduler).toFlushAndYield(['componentDidMount: true']),\n- ).toErrorDev(\n- 'Using UNSAFE_componentWillMount in strict mode is not recommended',\n- {withoutStack: true},\n- );\n+ expect(Scheduler).toFlushAndYield(['componentDidMount: true']);\n \n expect(instances[0]._isMounted()).toBe(true);\n });\n@@ -120,12 +115,7 @@ describe('ReactIncrementalReflection', () => {\n }\n \n ReactNoop.render();\n- expect(() =>\n- expect(Scheduler).toFlushAndYield(['Component']),\n- ).toErrorDev(\n- 'Using UNSAFE_componentWillMount in strict mode is not recommended',\n- {withoutStack: true},\n- );\n+ expect(Scheduler).toFlushAndYield(['Component']);\n \n expect(instances[0]._isMounted()).toBe(true);\n \n@@ -238,15 +228,7 @@ describe('ReactIncrementalReflection', () => {\n \/\/ not find any host nodes in it.\n expect(findInstance(classInstance)).toBe(null);\n \n- expect(() =>\n- expect(Scheduler).toFlushAndYield([['componentDidMount', span()]]),\n- ).toErrorDev(\n- [\n- 'Using UNSAFE_componentWillMount in strict mode is not recommended',\n- 'Using UNSAFE_componentWillUpdate in strict mode is not recommended',\n- ],\n- {withoutStack: true},\n- );\n+ expect(Scheduler).toFlushAndYield([['componentDidMount', span()]]);\n \n const hostSpan = classInstance.span;\n expect(hostSpan).toBeDefined();\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalSideEffects-test.js b\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalSideEffects-test.js\nindex 32d4699318..fd819eeb32 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalSideEffects-test.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalSideEffects-test.js\n@@ -1308,9 +1308,7 @@ describe('ReactIncrementalSideEffects', () => {\n }\n \n ReactNoop.render();\n- expect(() => expect(Scheduler).toFlushWithoutYielding()).toErrorDev(\n- 'Warning: A string ref, \"bar\", has been found within a strict mode tree.',\n- );\n+ expect(Scheduler).toFlushWithoutYielding();\n \n expect(fooInstance.refs.bar.test).toEqual('test');\n });\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalUpdates-test.js b\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalUpdates-test.js\nindex 991937ee37..a3fcf9dc70 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalUpdates-test.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalUpdates-test.js\n@@ -402,12 +402,7 @@ describe('ReactIncrementalUpdates', () => {\n }\n }\n ReactNoop.render();\n- expect(() =>\n- expect(Scheduler).toFlushAndYield(['render']),\n- ).toErrorDev(\n- 'Using UNSAFE_componentWillReceiveProps in strict mode is not recommended',\n- {withoutStack: true},\n- );\n+ expect(Scheduler).toFlushAndYield(['render']);\n \n ReactNoop.flushSync(() => {\n instance.setState({a: 'a'});\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactNewContext-test.js b\/packages\/react-reconciler\/src\/__tests__\/ReactNewContext-test.js\nindex 5c338f01db..f81a2131e0 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactNewContext-test.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactNewContext-test.js\n@@ -953,14 +953,7 @@ describe('ReactNewContext', () => {\n <\/App>\n <\/LegacyProvider>,\n );\n- expect(() => {\n- expect(Scheduler).toFlushAndYield(['LegacyProvider', 'App', 'Child']);\n- }).toErrorDev(\n- 'Legacy context API has been detected within a strict-mode tree.\\n\\n' +\n- 'The old API will be supported in all 16.x releases, but applications ' +\n- 'using it should migrate to the new version.\\n\\n' +\n- 'Please update the following components: LegacyProvider',\n- );\n+ expect(Scheduler).toFlushAndYield(['LegacyProvider', 'App', 'Child']);\n expect(ReactNoop.getChildren()).toEqual([span('Child')]);\n \n \/\/ Update App with same value (should bail out)\n@@ -1244,8 +1237,6 @@ describe('ReactNewContext', () => {\n \n ReactNoop.render();\n expect(() => expect(Scheduler).toFlushWithoutYielding()).toErrorDev([\n- 'Context can only be read while React is rendering',\n- \/\/ A second warning comes from to setStates being added to the queue.\n 'Context can only be read while React is rendering',\n 'Cannot update during an existing state transition',\n ]);\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/useMutableSource-test.internal.js b\/packages\/react-reconciler\/src\/__tests__\/useMutableSource-test.internal.js\nindex fbd81d9576..5cc884d57f 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/useMutableSource-test.internal.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/useMutableSource-test.internal.js\n@@ -1836,9 +1836,14 @@ describe('useMutableSource', () => {\n return null;\n }\n \n+ \/\/ TODO The mechanism for this type of detection relies on StrictMode double rendering.\n expect(() => {\n act(() => {\n- ReactNoop.render();\n+ ReactNoop.render(\n+ \n+ \n+ <\/React.StrictMode>,\n+ );\n });\n }).toThrow(\n 'A mutable source was mutated while the MutateDuringRead component ' +\ndiff --git a\/packages\/react-test-renderer\/src\/ReactTestRenderer.js b\/packages\/react-test-renderer\/src\/ReactTestRenderer.js\nindex 7c64a16936..bc46f1d6d1 100644\n--- a\/packages\/react-test-renderer\/src\/ReactTestRenderer.js\n+++ b\/packages\/react-test-renderer\/src\/ReactTestRenderer.js\n@@ -58,7 +58,6 @@ const {IsSomeRendererActing} = ReactSharedInternals;\n type TestRendererOptions = {\n createNodeMock: (element: React$Element) => any,\n unstable_isConcurrent: boolean,\n- unstable_strictModeLevel: number,\n unstable_concurrentUpdatesByDefault: boolean,\n ...\n };\n@@ -437,7 +436,6 @@ function propsMatch(props: Object, filter: Object): boolean {\n function create(element: React$Element, options: TestRendererOptions) {\n let createNodeMock = defaultTestOptions.createNodeMock;\n let isConcurrent = false;\n- let strictModeLevel = null;\n let concurrentUpdatesByDefault = null;\n if (typeof options === 'object' && options !== null) {\n if (typeof options.createNodeMock === 'function') {\n@@ -446,9 +444,6 @@ function create(element: React$Element, options: TestRendererOptions) {\n if (options.unstable_isConcurrent === true) {\n isConcurrent = true;\n }\n- if (options.unstable_strictModeLevel !== undefined) {\n- strictModeLevel = options.unstable_strictModeLevel;\n- }\n if (allowConcurrentByDefault) {\n if (options.unstable_concurrentUpdatesByDefault !== undefined) {\n concurrentUpdatesByDefault =\n@@ -466,7 +461,6 @@ function create(element: React$Element, options: TestRendererOptions) {\n isConcurrent ? ConcurrentRoot : LegacyRoot,\n false,\n null,\n- strictModeLevel,\n concurrentUpdatesByDefault,\n );\n invariant(root != null, 'something went wrong');\ndiff --git a\/packages\/react\/src\/__tests__\/ReactStrictMode-test.internal.js b\/packages\/react\/src\/__tests__\/ReactStrictMode-test.internal.js\nindex 20c83a46df..351ce098ef 100644\n--- a\/packages\/react\/src\/__tests__\/ReactStrictMode-test.internal.js\n+++ b\/packages\/react\/src\/__tests__\/ReactStrictMode-test.internal.js\n@@ -50,12 +50,10 @@ describe('ReactStrictMode', () => {\n }\n \n \/\/ @gate experimental\n- it('should support overriding default via createRoot option', () => {\n+ it('should default to not strict', () => {\n act(() => {\n const container = document.createElement('div');\n- const root = ReactDOM.createRoot(container, {\n- unstable_strictModeLevel: 0,\n- });\n+ const root = ReactDOM.createRoot(container);\n root.render();\n });\n \n@@ -66,27 +64,6 @@ describe('ReactStrictMode', () => {\n ]);\n });\n \n- \/\/ @gate experimental\n- it('should disable strict mode if level 0 is specified', () => {\n- act(() => {\n- const container = document.createElement('div');\n- const root = ReactDOM.createRoot(container, {\n- unstable_strictModeLevel: 0,\n- });\n- root.render(\n- \n- \n- <\/React.StrictMode>,\n- );\n- });\n-\n- expect(log).toEqual([\n- 'A: render',\n- 'A: useLayoutEffect mount',\n- 'A: useEffect mount',\n- ]);\n- });\n-\n if (__DEV__) {\n \/\/ @gate experimental\n it('should default to level 1 (legacy mode)', () => {\n@@ -156,9 +133,7 @@ describe('ReactStrictMode', () => {\n it('should allow level to be increased with nesting', () => {\n act(() => {\n const container = document.createElement('div');\n- const root = ReactDOM.createRoot(container, {\n- unstable_strictModeLevel: 0,\n- });\n+ const root = ReactDOM.createRoot(container);\n root.render(\n <>\n \n@@ -197,9 +172,7 @@ describe('ReactStrictMode', () => {\n it('should not allow level to be decreased with nesting', () => {\n act(() => {\n const container = document.createElement('div');\n- const root = ReactDOM.createRoot(container, {\n- unstable_strictModeLevel: 2,\n- });\n+ const root = ReactDOM.createRoot(container);\n root.render(\n <>\n \n@@ -216,7 +189,6 @@ describe('ReactStrictMode', () => {\n });\n \n expect(log).toEqual([\n- 'A: render',\n 'A: render',\n 'B: render',\n 'B: render',\n@@ -228,18 +200,6 @@ describe('ReactStrictMode', () => {\n 'A: useEffect mount',\n 'B: useEffect mount',\n 'C: useEffect mount',\n- 'A: useLayoutEffect unmount',\n- 'B: useLayoutEffect unmount',\n- 'C: useLayoutEffect unmount',\n- 'A: useEffect unmount',\n- 'B: useEffect unmount',\n- 'C: useEffect unmount',\n- 'A: useLayoutEffect mount',\n- 'B: useLayoutEffect mount',\n- 'C: useLayoutEffect mount',\n- 'A: useEffect mount',\n- 'B: useEffect mount',\n- 'C: useEffect mount',\n ]);\n });\n }\ndiff --git a\/packages\/react\/src\/__tests__\/ReactStrictMode-test.js b\/packages\/react\/src\/__tests__\/ReactStrictMode-test.js\nindex 60862d12a9..c6d1f7ee72 100644\n--- a\/packages\/react\/src\/__tests__\/ReactStrictMode-test.js\n+++ b\/packages\/react\/src\/__tests__\/ReactStrictMode-test.js\n@@ -363,8 +363,15 @@ describe('Concurrent Mode', () => {\n });\n \n \/\/ @gate experimental\n- it('should warn about unsafe legacy lifecycle methods anywhere in the tree', () => {\n- class AsyncRoot extends React.Component {\n+ it('should warn about unsafe legacy lifecycle methods anywhere in a StrictMode tree', () => {\n+ function StrictRoot() {\n+ return (\n+ \n+ \n+ <\/React.StrictMode>\n+ );\n+ }\n+ class App extends React.Component {\n UNSAFE_componentWillMount() {}\n UNSAFE_componentWillUpdate() {}\n render() {\n@@ -399,7 +406,7 @@ describe('Concurrent Mode', () => {\n \n const container = document.createElement('div');\n const root = ReactDOM.unstable_createRoot(container);\n- root.render();\n+ root.render();\n expect(() => Scheduler.unstable_flushAll()).toErrorDev(\n [\n \/* eslint-disable max-len *\/\n@@ -407,7 +414,7 @@ describe('Concurrent Mode', () => {\n \n * Move code with side effects to componentDidMount, and set initial state in the constructor.\n \n-Please update the following components: AsyncRoot`,\n+Please update the following components: App`,\n `Warning: Using UNSAFE_componentWillReceiveProps in strict mode is not recommended and may indicate bugs in your code. See https:\/\/reactjs.org\/link\/unsafe-component-lifecycles for details.\n \n * Move data fetching code or side effects to componentDidUpdate.\n@@ -418,20 +425,27 @@ Please update the following components: Bar, Foo`,\n \n * Move data fetching code or side effects to componentDidUpdate.\n \n-Please update the following components: AsyncRoot`,\n+Please update the following components: App`,\n \/* eslint-enable max-len *\/\n ],\n {withoutStack: true},\n );\n \n \/\/ Dedupe\n- root.render();\n+ root.render();\n Scheduler.unstable_flushAll();\n });\n \n \/\/ @gate experimental\n it('should coalesce warnings by lifecycle name', () => {\n- class AsyncRoot extends React.Component {\n+ function StrictRoot() {\n+ return (\n+ \n+ \n+ <\/React.StrictMode>\n+ );\n+ }\n+ class App extends React.Component {\n UNSAFE_componentWillMount() {}\n UNSAFE_componentWillUpdate() {}\n render() {\n@@ -455,7 +469,7 @@ Please update the following components: AsyncRoot`,\n \n const container = document.createElement('div');\n const root = ReactDOM.unstable_createRoot(container);\n- root.render();\n+ root.render();\n \n expect(() => {\n expect(() => Scheduler.unstable_flushAll()).toErrorDev(\n@@ -465,7 +479,7 @@ Please update the following components: AsyncRoot`,\n \n * Move code with side effects to componentDidMount, and set initial state in the constructor.\n \n-Please update the following components: AsyncRoot`,\n+Please update the following components: App`,\n `Warning: Using UNSAFE_componentWillReceiveProps in strict mode is not recommended and may indicate bugs in your code. See https:\/\/reactjs.org\/link\/unsafe-component-lifecycles for details.\n \n * Move data fetching code or side effects to componentDidUpdate.\n@@ -476,7 +490,7 @@ Please update the following components: Child`,\n \n * Move data fetching code or side effects to componentDidUpdate.\n \n-Please update the following components: AsyncRoot`,\n+Please update the following components: App`,\n \/* eslint-enable max-len *\/\n ],\n {withoutStack: true},\n@@ -508,16 +522,14 @@ Please update the following components: Parent`,\n {withoutStack: true},\n );\n \/\/ Dedupe\n- root.render();\n+ root.render();\n Scheduler.unstable_flushAll();\n });\n \n \/\/ @gate experimental\n it('should warn about components not present during the initial render', () => {\n- class AsyncRoot extends React.Component {\n- render() {\n- return this.props.foo ? : ;\n- }\n+ function StrictRoot({foo}) {\n+ return {foo ? : }<\/React.StrictMode>;\n }\n class Foo extends React.Component {\n UNSAFE_componentWillMount() {}\n@@ -534,7 +546,7 @@ Please update the following components: Parent`,\n \n const container = document.createElement('div');\n const root = ReactDOM.unstable_createRoot(container);\n- root.render();\n+ root.render();\n expect(() =>\n Scheduler.unstable_flushAll(),\n ).toErrorDev(\n@@ -542,7 +554,7 @@ Please update the following components: Parent`,\n {withoutStack: true},\n );\n \n- root.render();\n+ root.render();\n expect(() =>\n Scheduler.unstable_flushAll(),\n ).toErrorDev(\n@@ -551,9 +563,9 @@ Please update the following components: Parent`,\n );\n \n \/\/ Dedupe\n- root.render();\n+ root.render();\n Scheduler.unstable_flushAll();\n- root.render();\n+ root.render();\n Scheduler.unstable_flushAll();\n });\n \ndiff --git a\/packages\/react\/src\/__tests__\/forwardRef-test.js b\/packages\/react\/src\/__tests__\/forwardRef-test.js\nindex 9c59408241..4dfb4a3f9c 100644\n--- a\/packages\/react\/src\/__tests__\/forwardRef-test.js\n+++ b\/packages\/react\/src\/__tests__\/forwardRef-test.js\n@@ -287,11 +287,11 @@ describe('forwardRef', () => {\n \n ReactNoop.render();\n expect(Scheduler).toFlushWithoutYielding();\n- expect(renderCount).toBe(__DEV__ ? 2 : 1);\n+ expect(renderCount).toBe(1);\n \n ReactNoop.render();\n expect(Scheduler).toFlushWithoutYielding();\n- expect(renderCount).toBe(__DEV__ ? 4 : 2);\n+ expect(renderCount).toBe(2);\n });\n \n it('should bailout if forwardRef is wrapped in memo', () => {\n@@ -310,13 +310,13 @@ describe('forwardRef', () => {\n \n ReactNoop.render();\n expect(Scheduler).toFlushWithoutYielding();\n- expect(renderCount).toBe(__DEV__ ? 2 : 1);\n+ expect(renderCount).toBe(1);\n \n expect(ref.current.type).toBe('div');\n \n ReactNoop.render();\n expect(Scheduler).toFlushWithoutYielding();\n- expect(renderCount).toBe(__DEV__ ? 2 : 1);\n+ expect(renderCount).toBe(1);\n \n const differentRef = React.createRef();\n \n@@ -324,14 +324,14 @@ describe('forwardRef', () => {\n ,\n );\n expect(Scheduler).toFlushWithoutYielding();\n- expect(renderCount).toBe(__DEV__ ? 4 : 2);\n+ expect(renderCount).toBe(2);\n \n expect(ref.current).toBe(null);\n expect(differentRef.current.type).toBe('div');\n \n ReactNoop.render();\n expect(Scheduler).toFlushWithoutYielding();\n- expect(renderCount).toBe(__DEV__ ? 6 : 3);\n+ expect(renderCount).toBe(3);\n });\n \n it('should custom memo comparisons to compose', () => {\n@@ -351,19 +351,19 @@ describe('forwardRef', () => {\n \n ReactNoop.render();\n expect(Scheduler).toFlushWithoutYielding();\n- expect(renderCount).toBe(__DEV__ ? 2 : 1);\n+ expect(renderCount).toBe(1);\n \n expect(ref.current.type).toBe('div');\n \n \/\/ Changing either a or b rerenders\n ReactNoop.render();\n expect(Scheduler).toFlushWithoutYielding();\n- expect(renderCount).toBe(__DEV__ ? 4 : 2);\n+ expect(renderCount).toBe(2);\n \n \/\/ Changing c doesn't rerender\n ReactNoop.render();\n expect(Scheduler).toFlushWithoutYielding();\n- expect(renderCount).toBe(__DEV__ ? 4 : 2);\n+ expect(renderCount).toBe(2);\n \n const ComposedMemo = React.memo(\n RefForwardingComponent,\n@@ -372,29 +372,29 @@ describe('forwardRef', () => {\n \n ReactNoop.render();\n expect(Scheduler).toFlushWithoutYielding();\n- expect(renderCount).toBe(__DEV__ ? 6 : 3);\n+ expect(renderCount).toBe(3);\n \n \/\/ Changing just b no longer updates\n ReactNoop.render();\n expect(Scheduler).toFlushWithoutYielding();\n- expect(renderCount).toBe(__DEV__ ? 6 : 3);\n+ expect(renderCount).toBe(3);\n \n \/\/ Changing just a and c updates\n ReactNoop.render();\n expect(Scheduler).toFlushWithoutYielding();\n- expect(renderCount).toBe(__DEV__ ? 8 : 4);\n+ expect(renderCount).toBe(4);\n \n \/\/ Changing just c does not update\n ReactNoop.render();\n expect(Scheduler).toFlushWithoutYielding();\n- expect(renderCount).toBe(__DEV__ ? 8 : 4);\n+ expect(renderCount).toBe(4);\n \n \/\/ Changing ref still rerenders\n const differentRef = React.createRef();\n \n ReactNoop.render();\n expect(Scheduler).toFlushWithoutYielding();\n- expect(renderCount).toBe(__DEV__ ? 10 : 5);\n+ expect(renderCount).toBe(5);\n \n expect(ref.current).toBe(null);\n expect(differentRef.current.type).toBe('div');\n","body":""}

dillon1000/react

Files changed