{"files":[{"path":"packages\/react-dom\/src\/__tests__\/ReactCompositeComponent-test.js","status":"M"},{"path":"packages\/react-dom\/src\/__tests__\/ReactDOMComponent-test.js","status":"M"},{"path":"packages\/react-dom\/src\/client\/ReactDOMComponent.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactCurrentFiber.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberBeginWork.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberContext.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberReconciler.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberWorkLoop.js","status":"M"},{"path":"packages\/react-reconciler\/src\/__tests__\/ReactSuspenseWithNoopRenderer-test.internal.js","status":"M"}],"patch":"diff --git a\/packages\/react-dom\/src\/__tests__\/ReactCompositeComponent-test.js b\/packages\/react-dom\/src\/__tests__\/ReactCompositeComponent-test.js\nindex 908d418cac..49e107f877 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactCompositeComponent-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactCompositeComponent-test.js\n@@ -493,43 +493,6 @@ describe('ReactCompositeComponent', () => {\n ReactDOM.render(, container);\n });\n \n- it('should warn about `setState` in getChildContext', () => {\n- const container = document.createElement('div');\n-\n- let renderPasses = 0;\n-\n- class Component extends React.Component {\n- state = {value: 0};\n-\n- getChildContext() {\n- if (this.state.value === 0) {\n- this.setState({value: 1});\n- }\n- }\n-\n- render() {\n- renderPasses++;\n- return

;\n- }\n- }\n- Component.childContextTypes = {};\n-\n- let instance;\n-\n- expect(() => {\n- instance = ReactDOM.render(, container);\n- }).toErrorDev(\n- 'Warning: setState(...): Cannot call setState() inside getChildContext()',\n- );\n-\n- expect(renderPasses).toBe(2);\n- expect(instance.state.value).toBe(1);\n-\n- \/\/ Test deduplication; (no additional warnings are expected).\n- ReactDOM.unmountComponentAtNode(container);\n- ReactDOM.render(, container);\n- });\n-\n it('should cleanup even if render() fatals', () => {\n class BadComponent extends React.Component {\n render() {\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMComponent-test.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMComponent-test.js\nindex 7a0e286399..1b9e644848 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMComponent-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMComponent-test.js\n@@ -1242,53 +1242,6 @@ describe('ReactDOMComponent', () => {\n );\n });\n \n- it('should emit a warning once for a named custom component using shady DOM', () => {\n- const defaultCreateElement = document.createElement.bind(document);\n-\n- try {\n- document.createElement = element => {\n- const container = defaultCreateElement(element);\n- container.shadyRoot = {};\n- return container;\n- };\n- class ShadyComponent extends React.Component {\n- render() {\n- return ;\n- }\n- }\n- const node = document.createElement('div');\n- expect(() => ReactDOM.render(, node)).toErrorDev(\n- 'ShadyComponent is using shady DOM. Using shady DOM with React can ' +\n- 'cause things to break subtly.',\n- );\n- mountComponent({is: 'custom-shady-div2'});\n- } finally {\n- document.createElement = defaultCreateElement;\n- }\n- });\n-\n- it('should emit a warning once for an unnamed custom component using shady DOM', () => {\n- const defaultCreateElement = document.createElement.bind(document);\n-\n- try {\n- document.createElement = element => {\n- const container = defaultCreateElement(element);\n- container.shadyRoot = {};\n- return container;\n- };\n-\n- expect(() => mountComponent({is: 'custom-shady-div'})).toErrorDev(\n- 'A component is using shady DOM. Using shady DOM with React can ' +\n- 'cause things to break subtly.',\n- );\n-\n- \/\/ No additional warnings are expected\n- mountComponent({is: 'custom-shady-div2'});\n- } finally {\n- document.createElement = defaultCreateElement;\n- }\n- });\n-\n it('should treat menuitem as a void element but still create the closing tag', () => {\n \/\/ menuitem is not implemented in jsdom, so this triggers the unknown warning error\n const container = document.createElement('div');\ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOMComponent.js b\/packages\/react-dom\/src\/client\/ReactDOMComponent.js\nindex 854137dec6..cdf953207d 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOMComponent.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOMComponent.js\n@@ -7,8 +7,6 @@\n * @flow\n *\/\n \n-\/\/ TODO: direct imports like some-package\/src\/* are bad. Fix me.\n-import {getCurrentFiberOwnerNameInDevOrNull} from 'react-reconciler\/src\/ReactCurrentFiber';\n import {registrationNameModules} from 'legacy-events\/EventPluginRegistry';\n import {canUseDOM} from 'shared\/ExecutionEnvironment';\n import endsWith from 'shared\/endsWith';\n@@ -90,7 +88,6 @@ import {\n import {legacyListenToEvent} from '..\/events\/DOMLegacyEventPluginSystem';\n \n let didWarnInvalidHydration = false;\n-let didWarnShadyDOM = false;\n let didWarnScriptTags = false;\n \n const DANGEROUSLY_SET_INNER_HTML = 'dangerouslySetInnerHTML';\n@@ -509,18 +506,6 @@ export function setInitialProperties(\n const isCustomComponentTag = isCustomComponent(tag, rawProps);\n if (__DEV__) {\n validatePropertiesInDevelopment(tag, rawProps);\n- if (\n- isCustomComponentTag &&\n- !didWarnShadyDOM &&\n- (domElement: any).shadyRoot\n- ) {\n- console.error(\n- '%s is using shady DOM. Using shady DOM with React can ' +\n- 'cause things to break subtly.',\n- getCurrentFiberOwnerNameInDevOrNull() || 'A component',\n- );\n- didWarnShadyDOM = true;\n- }\n }\n \n \/\/ TODO: Make sure that we check isMounted before firing any of these events.\n@@ -906,18 +891,6 @@ export function diffHydratedProperties(\n suppressHydrationWarning = rawProps[SUPPRESS_HYDRATION_WARNING] === true;\n isCustomComponentTag = isCustomComponent(tag, rawProps);\n validatePropertiesInDevelopment(tag, rawProps);\n- if (\n- isCustomComponentTag &&\n- !didWarnShadyDOM &&\n- (domElement: any).shadyRoot\n- ) {\n- console.error(\n- '%s is using shady DOM. Using shady DOM with React can ' +\n- 'cause things to break subtly.',\n- getCurrentFiberOwnerNameInDevOrNull() || 'A component',\n- );\n- didWarnShadyDOM = true;\n- }\n }\n \n \/\/ TODO: Make sure that we check isMounted before firing any of these events.\ndiff --git a\/packages\/react-reconciler\/src\/ReactCurrentFiber.js b\/packages\/react-reconciler\/src\/ReactCurrentFiber.js\nindex 47baa167eb..d6096791b6 100644\n--- a\/packages\/react-reconciler\/src\/ReactCurrentFiber.js\n+++ b\/packages\/react-reconciler\/src\/ReactCurrentFiber.js\n@@ -23,8 +23,6 @@ import getComponentName from 'shared\/getComponentName';\n \n const ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;\n \n-type LifeCyclePhase = 'render' | 'getChildContext';\n-\n function describeFiber(fiber: Fiber): string {\n switch (fiber.tag) {\n case HostRoot:\n@@ -57,7 +55,7 @@ export function getStackByFiberInDevAndProd(workInProgress: Fiber): string {\n }\n \n export let current: Fiber | null = null;\n-export let phase: LifeCyclePhase | null = null;\n+export let isRendering: boolean = false;\n \n export function getCurrentFiberOwnerNameInDevOrNull(): string | null {\n if (__DEV__) {\n@@ -88,7 +86,7 @@ export function resetCurrentFiber() {\n if (__DEV__) {\n ReactDebugCurrentFrame.getCurrentStack = null;\n current = null;\n- phase = null;\n+ isRendering = false;\n }\n }\n \n@@ -96,12 +94,12 @@ export function setCurrentFiber(fiber: Fiber) {\n if (__DEV__) {\n ReactDebugCurrentFrame.getCurrentStack = getCurrentFiberStackInDev;\n current = fiber;\n- phase = null;\n+ isRendering = false;\n }\n }\n \n-export function setCurrentPhase(lifeCyclePhase: LifeCyclePhase | null) {\n+export function setIsRendering(rendering: boolean) {\n if (__DEV__) {\n- phase = lifeCyclePhase;\n+ isRendering = rendering;\n }\n }\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js b\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js\nindex 8eb9f9ffb9..ddbdacd61a 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js\n@@ -74,9 +74,9 @@ import ReactStrictModeWarnings from '.\/ReactStrictModeWarnings';\n import {refineResolvedLazyComponent} from 'shared\/ReactLazyComponent';\n import {REACT_LAZY_TYPE, getIteratorFn} from 'shared\/ReactSymbols';\n import {\n- setCurrentPhase,\n getCurrentFiberOwnerNameInDevOrNull,\n getCurrentFiberStackInDev,\n+ setIsRendering,\n } from '.\/ReactCurrentFiber';\n import {startWorkTimer, cancelWorkTimer} from '.\/ReactDebugFiberPerf';\n import {\n@@ -193,7 +193,6 @@ let didWarnAboutContextTypeOnFunctionComponent;\n let didWarnAboutGetDerivedStateOnFunctionComponent;\n let didWarnAboutFunctionRefs;\n export let didWarnAboutReassigningProps;\n-let didWarnAboutMaxDuration;\n let didWarnAboutRevealOrder;\n let didWarnAboutTailOptions;\n let didWarnAboutDefaultPropsOnFunctionComponent;\n@@ -205,7 +204,6 @@ if (__DEV__) {\n didWarnAboutGetDerivedStateOnFunctionComponent = {};\n didWarnAboutFunctionRefs = {};\n didWarnAboutReassigningProps = false;\n- didWarnAboutMaxDuration = false;\n didWarnAboutRevealOrder = {};\n didWarnAboutTailOptions = {};\n didWarnAboutDefaultPropsOnFunctionComponent = {};\n@@ -312,7 +310,7 @@ function updateForwardRef(\n prepareToReadContext(workInProgress, renderExpirationTime);\n if (__DEV__) {\n ReactCurrentOwner.current = workInProgress;\n- setCurrentPhase('render');\n+ setIsRendering(true);\n nextChildren = renderWithHooks(\n current,\n workInProgress,\n@@ -337,7 +335,7 @@ function updateForwardRef(\n );\n }\n }\n- setCurrentPhase(null);\n+ setIsRendering(false);\n } else {\n nextChildren = renderWithHooks(\n current,\n@@ -644,7 +642,7 @@ function updateFunctionComponent(\n prepareToReadContext(workInProgress, renderExpirationTime);\n if (__DEV__) {\n ReactCurrentOwner.current = workInProgress;\n- setCurrentPhase('render');\n+ setIsRendering(true);\n nextChildren = renderWithHooks(\n current,\n workInProgress,\n@@ -669,7 +667,7 @@ function updateFunctionComponent(\n );\n }\n }\n- setCurrentPhase(null);\n+ setIsRendering(false);\n } else {\n nextChildren = renderWithHooks(\n current,\n@@ -720,7 +718,7 @@ function updateBlock(\n prepareToReadContext(workInProgress, renderExpirationTime);\n if (__DEV__) {\n ReactCurrentOwner.current = workInProgress;\n- setCurrentPhase('render');\n+ setIsRendering(true);\n nextChildren = renderWithHooks(\n current,\n workInProgress,\n@@ -745,7 +743,7 @@ function updateBlock(\n );\n }\n }\n- setCurrentPhase(null);\n+ setIsRendering(false);\n } else {\n nextChildren = renderWithHooks(\n current,\n@@ -923,7 +921,7 @@ function finishClassComponent(\n }\n } else {\n if (__DEV__) {\n- setCurrentPhase('render');\n+ setIsRendering(true);\n nextChildren = instance.render();\n if (\n debugRenderPhaseSideEffectsForStrictMode &&\n@@ -931,7 +929,7 @@ function finishClassComponent(\n ) {\n instance.render();\n }\n- setCurrentPhase(null);\n+ setIsRendering(false);\n } else {\n nextChildren = instance.render();\n }\n@@ -1637,18 +1635,6 @@ function updateSuspenseComponent(\n \n pushSuspenseContext(workInProgress, suspenseContext);\n \n- if (__DEV__) {\n- if ('maxDuration' in nextProps) {\n- if (!didWarnAboutMaxDuration) {\n- didWarnAboutMaxDuration = true;\n- console.error(\n- 'maxDuration has been removed from React. ' +\n- 'Remove the maxDuration prop.',\n- );\n- }\n- }\n- }\n-\n \/\/ This next part is a bit confusing. If the children timeout, we switch to\n \/\/ showing the fallback children in place of the \"primary\" children.\n \/\/ However, we don't want to delete the primary children because then their\n@@ -2732,9 +2718,9 @@ function updateContextConsumer(\n let newChildren;\n if (__DEV__) {\n ReactCurrentOwner.current = workInProgress;\n- setCurrentPhase('render');\n+ setIsRendering(true);\n newChildren = render(newValue);\n- setCurrentPhase(null);\n+ setIsRendering(false);\n } else {\n newChildren = render(newValue);\n }\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberContext.js b\/packages\/react-reconciler\/src\/ReactFiberContext.js\nindex 946d33606c..5f4375b4c5 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberContext.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberContext.js\n@@ -17,7 +17,7 @@ import getComponentName from 'shared\/getComponentName';\n import invariant from 'shared\/invariant';\n import checkPropTypes from 'prop-types\/checkPropTypes';\n \n-import {setCurrentPhase, getCurrentFiberStackInDev} from '.\/ReactCurrentFiber';\n+import {getCurrentFiberStackInDev} from '.\/ReactCurrentFiber';\n import {startPhaseTimer, stopPhaseTimer} from '.\/ReactDebugFiberPerf';\n import {createCursor, push, pop} from '.\/ReactFiberStack';\n \n@@ -210,15 +210,9 @@ function processChildContext(\n }\n \n let childContext;\n- if (__DEV__) {\n- setCurrentPhase('getChildContext');\n- }\n startPhaseTimer(fiber, 'getChildContext');\n childContext = instance.getChildContext();\n stopPhaseTimer();\n- if (__DEV__) {\n- setCurrentPhase(null);\n- }\n for (let contextKey in childContext) {\n invariant(\n contextKey in childContextTypes,\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberReconciler.js b\/packages\/react-reconciler\/src\/ReactFiberReconciler.js\nindex 8102f66c25..816a394656 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberReconciler.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberReconciler.js\n@@ -70,7 +70,7 @@ import {\n import {createUpdate, enqueueUpdate} from '.\/ReactUpdateQueue';\n import {\n getStackByFiberInDevAndProd,\n- phase as ReactCurrentFiberPhase,\n+ isRendering as ReactCurrentFiberIsRendering,\n current as ReactCurrentFiberCurrent,\n } from '.\/ReactCurrentFiber';\n import {StrictMode} from '.\/ReactTypeOfMode';\n@@ -259,7 +259,7 @@ export function updateContainer(\n \n if (__DEV__) {\n if (\n- ReactCurrentFiberPhase === 'render' &&\n+ ReactCurrentFiberIsRendering &&\n ReactCurrentFiberCurrent !== null &&\n !didWarnAboutNestedUpdates\n ) {\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.js b\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.js\nindex 3c2427594a..1272338f75 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.js\n@@ -156,7 +156,7 @@ import {\n import getComponentName from 'shared\/getComponentName';\n import ReactStrictModeWarnings from '.\/ReactStrictModeWarnings';\n import {\n- phase as ReactCurrentDebugFiberPhaseInDEV,\n+ isRendering as ReactCurrentDebugFiberIsRenderingInDEV,\n resetCurrentFiber as resetCurrentDebugFiberInDEV,\n setCurrentFiber as setCurrentDebugFiberInDEV,\n getStackByFiberInDevAndProd,\n@@ -2793,7 +2793,6 @@ if (__DEV__ && replayFailedUnitOfWorkWithInvokeGuardedCallback) {\n }\n \n let didWarnAboutUpdateInRender = false;\n-let didWarnAboutUpdateInGetChildContext = false;\n function warnAboutRenderPhaseUpdatesInDEV(fiber) {\n if (__DEV__) {\n if ((executionContext & RenderContext) !== NoContext) {\n@@ -2808,29 +2807,18 @@ function warnAboutRenderPhaseUpdatesInDEV(fiber) {\n break;\n }\n case ClassComponent: {\n- switch (ReactCurrentDebugFiberPhaseInDEV) {\n- case 'getChildContext':\n- if (didWarnAboutUpdateInGetChildContext) {\n- return;\n- }\n- console.error(\n- 'setState(...): Cannot call setState() inside getChildContext()',\n- );\n- didWarnAboutUpdateInGetChildContext = true;\n- break;\n- case 'render':\n- if (didWarnAboutUpdateInRender) {\n- return;\n- }\n- console.error(\n- 'Cannot update during an existing state transition (such as ' +\n- 'within `render`). Render methods should be a pure ' +\n- 'function of props and state.',\n- );\n- didWarnAboutUpdateInRender = true;\n- break;\n+ if (\n+ ReactCurrentDebugFiberIsRenderingInDEV &&\n+ !didWarnAboutUpdateInRender\n+ ) {\n+ console.error(\n+ 'Cannot update during an existing state transition (such as ' +\n+ 'within `render`). Render methods should be a pure ' +\n+ 'function of props and state.',\n+ );\n+ didWarnAboutUpdateInRender = true;\n+ break;\n }\n- break;\n }\n }\n }\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactSuspenseWithNoopRenderer-test.internal.js b\/packages\/react-reconciler\/src\/__tests__\/ReactSuspenseWithNoopRenderer-test.internal.js\nindex 0cca771b1d..0df7431977 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactSuspenseWithNoopRenderer-test.internal.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactSuspenseWithNoopRenderer-test.internal.js\n@@ -110,25 +110,6 @@ function loadModules({\n }\n }\n \n- it('warns if the deprecated maxDuration option is used', () => {\n- function Foo() {\n- return (\n- \n-

;\n- <\/Suspense>\n- );\n- }\n-\n- ReactNoop.render();\n-\n- expect(() => Scheduler.unstable_flushAll()).toErrorDev([\n- 'Warning: maxDuration has been removed from React. ' +\n- 'Remove the maxDuration prop.' +\n- '\\n in Suspense (at **)' +\n- '\\n in Foo (at **)',\n- ]);\n- });\n-\n it('does not restart rendering for initial render', async () => {\n function Bar(props) {\n Scheduler.unstable_yieldValue('Bar');\n","parents":["f9c0a454415172433b8b94eec94fc36b2461065c"],"commit":{"authoredAt":"2020-02-27T02:14:30+00:00","authorEmail":"dan.abramov@gmail.com","revision":"849e8328b596ce67720f33d73a1d57108e6de504","authorName":"Dan Abramov","subject":"Remove unnecessary warnings (#18135)","shortRevision":"849e8328b5"},"body":""}

dillon1000/react

Files changed