{"files":[{"status":"M","path":"packages\/react-art\/src\/__tests__\/ReactART-test.js"},{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactDOMFiberAsync-test.internal.js"},{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactTestUtilsAct-test.js"},{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactUpdates-test.js"},{"status":"M","path":"packages\/react-dom\/src\/events\/__tests__\/DeprecatedDOMEventResponderSystem-test.internal.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberBeginWork.js"},{"status":"M","path":"packages\/react-reconciler\/src\/__tests__\/ErrorBoundaryReconciliation-test.internal.js"},{"status":"M","path":"packages\/react-reconciler\/src\/__tests__\/ReactHooks-test.internal.js"},{"status":"M","path":"packages\/react-reconciler\/src\/__tests__\/ReactNewContext-test.internal.js"},{"status":"R097","previousPath":"packages\/react-test-renderer\/src\/__tests__\/ReactTestRendererAsync-test.js","path":"packages\/react-test-renderer\/src\/__tests__\/ReactTestRendererAsync-test.internal.js"},{"status":"M","path":"packages\/react\/src\/__tests__\/ReactProfilerDevToolsIntegration-test.internal.js"},{"status":"M","path":"packages\/react\/src\/__tests__\/forwardRef-test.js"}],"patch":"diff --git a\/packages\/react-art\/src\/__tests__\/ReactART-test.js b\/packages\/react-art\/src\/__tests__\/ReactART-test.js\nindex 1613360ce6..6e25b0e25e 100644\n--- a\/packages\/react-art\/src\/__tests__\/ReactART-test.js\n+++ b\/packages\/react-art\/src\/__tests__\/ReactART-test.js\n@@ -391,7 +391,7 @@ describe('ReactART', () => {\n <\/CurrentRendererContext.Provider>,\n );\n \n- expect(Scheduler).toFlushAndYieldThrough(['A']);\n+ expect(Scheduler).toFlushAndYieldThrough(__DEV__ ? ['A', 'A'] : ['A']);\n \n ReactDOM.render(\n \n@@ -406,7 +406,9 @@ describe('ReactART', () => {\n expect(ops).toEqual([null, 'ART']);\n \n ops = [];\n- expect(Scheduler).toFlushAndYield(['B', 'C']);\n+ expect(Scheduler).toFlushAndYield(\n+ __DEV__ ? ['B', 'B', 'C', 'C'] : ['B', 'C'],\n+ );\n \n expect(ops).toEqual(['Test']);\n });\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMFiberAsync-test.internal.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMFiberAsync-test.internal.js\nindex 8cf28cc6ad..ed995df527 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMFiberAsync-test.internal.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMFiberAsync-test.internal.js\n@@ -639,7 +639,9 @@ describe('ReactDOMFiberAsync', () => {\n expect(container.textContent).toEqual('');\n \n \/\/ Everything should render immediately in the next event\n- expect(Scheduler).toFlushExpired(['A', 'B', 'C']);\n+ expect(Scheduler).toFlushExpired(\n+ __DEV__ ? ['A', 'A', 'B', 'B', 'C', 'C'] : ['A', 'B', 'C'],\n+ );\n expect(container.textContent).toEqual('ABC');\n });\n });\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactTestUtilsAct-test.js b\/packages\/react-dom\/src\/__tests__\/ReactTestUtilsAct-test.js\nindex 2f14259735..1e867e7b98 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactTestUtilsAct-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactTestUtilsAct-test.js\n@@ -607,7 +607,9 @@ function runActTests(label, render, unmount, rerender) {\n },\n );\n \n- expect(Component).toHaveBeenCalledTimes(4);\n+ expect(Component).toHaveBeenCalledTimes(\n+ label === 'legacy mode' ? 4 : 8,\n+ );\n unmount(secondContainer);\n });\n }\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactUpdates-test.js b\/packages\/react-dom\/src\/__tests__\/ReactUpdates-test.js\nindex 5d28562126..a9c3a4cf39 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactUpdates-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactUpdates-test.js\n@@ -1333,6 +1333,7 @@ describe('ReactUpdates', () => {\n 'Foo',\n 'Foo',\n 'Baz',\n+ 'Baz',\n 'Foo#effect',\n ]);\n } else {\ndiff --git a\/packages\/react-dom\/src\/events\/__tests__\/DeprecatedDOMEventResponderSystem-test.internal.js b\/packages\/react-dom\/src\/events\/__tests__\/DeprecatedDOMEventResponderSystem-test.internal.js\nindex d0232fef13..b04371da83 100644\n--- a\/packages\/react-dom\/src\/events\/__tests__\/DeprecatedDOMEventResponderSystem-test.internal.js\n+++ b\/packages\/react-dom\/src\/events\/__tests__\/DeprecatedDOMEventResponderSystem-test.internal.js\n@@ -813,7 +813,7 @@ describe('DOMEventResponderSystem', () => {\n \n let root = ReactDOM.createRoot(container);\n root.render();\n- expect(Scheduler).toFlushAndYield(['Test']);\n+ expect(Scheduler).toFlushAndYield(__DEV__ ? ['Test', 'Test'] : ['Test']);\n \n \/\/ Click the button\n dispatchClickEvent(ref.current);\n@@ -825,7 +825,9 @@ describe('DOMEventResponderSystem', () => {\n \/\/ Increase counter\n root.render();\n \/\/ Yield before committing\n- expect(Scheduler).toFlushAndYieldThrough(['Test']);\n+ expect(Scheduler).toFlushAndYieldThrough(\n+ __DEV__ ? ['Test', 'Test'] : ['Test'],\n+ );\n \n \/\/ Click the button again\n dispatchClickEvent(ref.current);\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js b\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js\nindex ba99ac80ab..8e3fe128aa 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js\n@@ -321,17 +321,14 @@ function updateForwardRef(\n debugRenderPhaseSideEffectsForStrictMode &&\n workInProgress.mode & StrictMode\n ) {\n- \/\/ Only double-render components with Hooks\n- if (workInProgress.memoizedState !== null) {\n- nextChildren = renderWithHooks(\n- current,\n- workInProgress,\n- render,\n- nextProps,\n- ref,\n- renderExpirationTime,\n- );\n- }\n+ nextChildren = renderWithHooks(\n+ current,\n+ workInProgress,\n+ render,\n+ nextProps,\n+ ref,\n+ renderExpirationTime,\n+ );\n }\n setIsRendering(false);\n } else {\n@@ -662,17 +659,14 @@ function updateFunctionComponent(\n debugRenderPhaseSideEffectsForStrictMode &&\n workInProgress.mode & StrictMode\n ) {\n- \/\/ Only double-render components with Hooks\n- if (workInProgress.memoizedState !== null) {\n- nextChildren = renderWithHooks(\n- current,\n- workInProgress,\n- Component,\n- nextProps,\n- context,\n- renderExpirationTime,\n- );\n- }\n+ nextChildren = renderWithHooks(\n+ current,\n+ workInProgress,\n+ Component,\n+ nextProps,\n+ context,\n+ renderExpirationTime,\n+ );\n }\n setIsRendering(false);\n } else {\n@@ -738,17 +732,14 @@ function updateBlock(\n debugRenderPhaseSideEffectsForStrictMode &&\n workInProgress.mode & StrictMode\n ) {\n- \/\/ Only double-render components with Hooks\n- if (workInProgress.memoizedState !== null) {\n- nextChildren = renderWithHooks(\n- current,\n- workInProgress,\n- render,\n- nextProps,\n- data,\n- renderExpirationTime,\n- );\n- }\n+ nextChildren = renderWithHooks(\n+ current,\n+ workInProgress,\n+ render,\n+ nextProps,\n+ data,\n+ renderExpirationTime,\n+ );\n }\n setIsRendering(false);\n } else {\n@@ -1471,17 +1462,14 @@ function mountIndeterminateComponent(\n debugRenderPhaseSideEffectsForStrictMode &&\n workInProgress.mode & StrictMode\n ) {\n- \/\/ Only double-render components with Hooks\n- if (workInProgress.memoizedState !== null) {\n- value = renderWithHooks(\n- null,\n- workInProgress,\n- Component,\n- props,\n- context,\n- renderExpirationTime,\n- );\n- }\n+ value = renderWithHooks(\n+ null,\n+ workInProgress,\n+ Component,\n+ props,\n+ context,\n+ renderExpirationTime,\n+ );\n }\n }\n reconcileChildren(null, workInProgress, value, renderExpirationTime);\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ErrorBoundaryReconciliation-test.internal.js b\/packages\/react-reconciler\/src\/__tests__\/ErrorBoundaryReconciliation-test.internal.js\nindex 084a93326a..64b9aa5921 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ErrorBoundaryReconciliation-test.internal.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ErrorBoundaryReconciliation-test.internal.js\n@@ -12,6 +12,7 @@ describe('ErrorBoundaryReconciliation', () => {\n jest.resetModules();\n \n ReactFeatureFlags = require('shared\/ReactFeatureFlags');\n+ ReactFeatureFlags.debugRenderPhaseSideEffectsForStrictMode = false;\n ReactFeatureFlags.replayFailedUnitOfWorkWithInvokeGuardedCallback = false;\n ReactTestRenderer = require('react-test-renderer');\n React = require('react');\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactHooks-test.internal.js b\/packages\/react-reconciler\/src\/__tests__\/ReactHooks-test.internal.js\nindex c1d0ea18f3..9c527fed58 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactHooks-test.internal.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactHooks-test.internal.js\n@@ -1300,14 +1300,14 @@ describe('ReactHooks', () => {\n \n <\/StrictMode>,\n );\n- expect(renderCount).toBe(1);\n+ expect(renderCount).toBe(__DEV__ ? 2 : 1);\n renderCount = 0;\n renderer.update(\n \n \n <\/StrictMode>,\n );\n- expect(renderCount).toBe(1);\n+ expect(renderCount).toBe(__DEV__ ? 2 : 1);\n \n renderCount = 0;\n renderer.update();\n@@ -1321,14 +1321,14 @@ describe('ReactHooks', () => {\n \n <\/StrictMode>,\n );\n- expect(renderCount).toBe(1);\n+ expect(renderCount).toBe(__DEV__ ? 2 : 1);\n renderCount = 0;\n renderer.update(\n \n \n <\/StrictMode>,\n );\n- expect(renderCount).toBe(1);\n+ expect(renderCount).toBe(__DEV__ ? 2 : 1);\n \n renderCount = 0;\n renderer.update();\n@@ -1342,14 +1342,14 @@ describe('ReactHooks', () => {\n \n <\/StrictMode>,\n );\n- expect(renderCount).toBe(1);\n+ expect(renderCount).toBe(__DEV__ ? 2 : 1);\n renderCount = 0;\n renderer.update(\n \n \n <\/StrictMode>,\n );\n- expect(renderCount).toBe(1);\n+ expect(renderCount).toBe(__DEV__ ? 2 : 1);\n \n renderCount = 0;\n expect(() => renderer.update()).toErrorDev(\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactNewContext-test.internal.js b\/packages\/react-reconciler\/src\/__tests__\/ReactNewContext-test.internal.js\nindex 34d854f78c..e4089fd110 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactNewContext-test.internal.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactNewContext-test.internal.js\n@@ -1103,7 +1103,9 @@ describe('ReactNewContext', () => {\n \n \/\/ Render the provider again using a different renderer\n ReactNoop.render();\n- expect(Scheduler).toFlushAndYield(['Foo', 'Foo']);\n+ expect(Scheduler).toFlushAndYield(\n+ __DEV__ ? ['Foo', 'Foo', 'Foo', 'Foo'] : ['Foo', 'Foo'],\n+ );\n \n if (__DEV__) {\n expect(console.error.calls.argsFor(0)[0]).toContain(\ndiff --git a\/packages\/react-test-renderer\/src\/__tests__\/ReactTestRendererAsync-test.js b\/packages\/react-test-renderer\/src\/__tests__\/ReactTestRendererAsync-test.internal.js\nsimilarity index 97%\nrename from packages\/react-test-renderer\/src\/__tests__\/ReactTestRendererAsync-test.js\nrename to packages\/react-test-renderer\/src\/__tests__\/ReactTestRendererAsync-test.internal.js\nindex 461490b096..ab2377f476 100644\n--- a\/packages\/react-test-renderer\/src\/__tests__\/ReactTestRendererAsync-test.js\n+++ b\/packages\/react-test-renderer\/src\/__tests__\/ReactTestRendererAsync-test.internal.js\n@@ -11,12 +11,15 @@\n 'use strict';\n \n let React;\n+let ReactFeatureFlags;\n let ReactTestRenderer;\n let Scheduler;\n \n describe('ReactTestRendererAsync', () => {\n beforeEach(() => {\n jest.resetModules();\n+ ReactFeatureFlags = require('shared\/ReactFeatureFlags');\n+ ReactFeatureFlags.debugRenderPhaseSideEffectsForStrictMode = false;\n React = require('react');\n ReactTestRenderer = require('react-test-renderer');\n Scheduler = require('scheduler');\ndiff --git a\/packages\/react\/src\/__tests__\/ReactProfilerDevToolsIntegration-test.internal.js b\/packages\/react\/src\/__tests__\/ReactProfilerDevToolsIntegration-test.internal.js\nindex d2f52dea1b..fa2650919c 100644\n--- a\/packages\/react\/src\/__tests__\/ReactProfilerDevToolsIntegration-test.internal.js\n+++ b\/packages\/react\/src\/__tests__\/ReactProfilerDevToolsIntegration-test.internal.js\n@@ -188,7 +188,7 @@ describe('ReactProfiler DevTools integration', () => {\n \n \/\/ Commit something\n root.update();\n- expect(Scheduler).toFlushAndYield(['A']);\n+ expect(Scheduler).toFlushAndYield(__DEV__ ? ['A', 'A'] : ['A']);\n expect(root).toMatchRenderedOutput('A');\n \n \/\/ Advance time by many seconds, larger than the default expiration time\n@@ -200,7 +200,7 @@ describe('ReactProfiler DevTools integration', () => {\n \/\/ Update B should not instantly expire.\n expect(Scheduler).toFlushExpired([]);\n \n- expect(Scheduler).toFlushAndYield(['B']);\n+ expect(Scheduler).toFlushAndYield(__DEV__ ? ['B', 'B'] : ['B']);\n expect(root).toMatchRenderedOutput('B');\n });\n });\ndiff --git a\/packages\/react\/src\/__tests__\/forwardRef-test.js b\/packages\/react\/src\/__tests__\/forwardRef-test.js\nindex 68f2065e4e..42b7d72fb7 100644\n--- a\/packages\/react\/src\/__tests__\/forwardRef-test.js\n+++ b\/packages\/react\/src\/__tests__\/forwardRef-test.js\n@@ -260,11 +260,11 @@ describe('forwardRef', () => {\n \n ReactNoop.render();\n expect(Scheduler).toFlushWithoutYielding();\n- expect(renderCount).toBe(1);\n+ expect(renderCount).toBe(__DEV__ ? 2 : 1);\n \n ReactNoop.render();\n expect(Scheduler).toFlushWithoutYielding();\n- expect(renderCount).toBe(2);\n+ expect(renderCount).toBe(__DEV__ ? 4 : 2);\n });\n \n it('should bailout if forwardRef is wrapped in memo', () => {\n@@ -283,13 +283,13 @@ describe('forwardRef', () => {\n \n ReactNoop.render();\n expect(Scheduler).toFlushWithoutYielding();\n- expect(renderCount).toBe(1);\n+ expect(renderCount).toBe(__DEV__ ? 2 : 1);\n \n expect(ref.current.type).toBe('div');\n \n ReactNoop.render();\n expect(Scheduler).toFlushWithoutYielding();\n- expect(renderCount).toBe(1);\n+ expect(renderCount).toBe(__DEV__ ? 2 : 1);\n \n const differentRef = React.createRef();\n \n@@ -297,14 +297,14 @@ describe('forwardRef', () => {\n ,\n );\n expect(Scheduler).toFlushWithoutYielding();\n- expect(renderCount).toBe(2);\n+ expect(renderCount).toBe(__DEV__ ? 4 : 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(3);\n+ expect(renderCount).toBe(__DEV__ ? 6 : 3);\n });\n \n it('should custom memo comparisons to compose', () => {\n@@ -324,19 +324,19 @@ describe('forwardRef', () => {\n \n ReactNoop.render();\n expect(Scheduler).toFlushWithoutYielding();\n- expect(renderCount).toBe(1);\n+ expect(renderCount).toBe(__DEV__ ? 2 : 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(2);\n+ expect(renderCount).toBe(__DEV__ ? 4 : 2);\n \n \/\/ Changing c doesn't rerender\n ReactNoop.render();\n expect(Scheduler).toFlushWithoutYielding();\n- expect(renderCount).toBe(2);\n+ expect(renderCount).toBe(__DEV__ ? 4 : 2);\n \n const ComposedMemo = React.memo(\n RefForwardingComponent,\n@@ -345,29 +345,29 @@ describe('forwardRef', () => {\n \n ReactNoop.render();\n expect(Scheduler).toFlushWithoutYielding();\n- expect(renderCount).toBe(3);\n+ expect(renderCount).toBe(__DEV__ ? 6 : 3);\n \n \/\/ Changing just b no longer updates\n ReactNoop.render();\n expect(Scheduler).toFlushWithoutYielding();\n- expect(renderCount).toBe(3);\n+ expect(renderCount).toBe(__DEV__ ? 6 : 3);\n \n \/\/ Changing just a and c updates\n ReactNoop.render();\n expect(Scheduler).toFlushWithoutYielding();\n- expect(renderCount).toBe(4);\n+ expect(renderCount).toBe(__DEV__ ? 8 : 4);\n \n \/\/ Changing just c does not update\n ReactNoop.render();\n expect(Scheduler).toFlushWithoutYielding();\n- expect(renderCount).toBe(4);\n+ expect(renderCount).toBe(__DEV__ ? 8 : 4);\n \n \/\/ Changing ref still rerenders\n const differentRef = React.createRef();\n \n ReactNoop.render();\n expect(Scheduler).toFlushWithoutYielding();\n- expect(renderCount).toBe(5);\n+ expect(renderCount).toBe(__DEV__ ? 10 : 5);\n \n expect(ref.current).toBe(null);\n expect(differentRef.current.type).toBe('div');\n","commit":{"shortRevision":"ba31ad40a9","authorName":"Sebastian Silbermann","authorEmail":"silbermann.sebastian@gmail.com","revision":"ba31ad40a9c6495e0d42def270178a7a74990c27","authoredAt":"2020-03-30T00:13:46+02:00","subject":"feat(StrictMode): Double-invoke render for every component (#18430)"},"body":"* feat(StrictMode): Double-invoke render for every component\r\n\r\n* fix: Mark ReactTestRendererAsync as internal","parents":["689d27586e30f94be1b7a7bb634b82633c2baf42"]}

dillon1000/react

Files changed