{"patch":"diff --git a\/packages\/react-dom\/src\/__tests__\/ReactComponentLifeCycle-test.internal.js b\/packages\/react-dom\/src\/__tests__\/ReactComponentLifeCycle-test.internal.js\ndeleted file mode 100644\nindex ed65a16f01..0000000000\n--- a\/packages\/react-dom\/src\/__tests__\/ReactComponentLifeCycle-test.internal.js\n+++ \/dev\/null\n@@ -1,115 +0,0 @@\n-\/**\n- * Copyright (c) Facebook, Inc. and its affiliates.\n- *\n- * This source code is licensed under the MIT license found in the\n- * LICENSE file in the root directory of this source tree.\n- *\n- * @emails react-core\n- *\/\n-\n-'use strict';\n-\n-let React;\n-let ReactDOM;\n-let ReactFeatureFlags;\n-\n-describe('ReactComponentLifeCycle', () => {\n- beforeEach(() => {\n- jest.resetModules();\n-\n- ReactFeatureFlags = require('shared\/ReactFeatureFlags');\n- ReactFeatureFlags.warnAboutDeprecatedLifecycles = true;\n-\n- React = require('react');\n- ReactDOM = require('react-dom');\n- });\n-\n- afterEach(() => {\n- jest.resetModules();\n- });\n-\n- \/\/ TODO (RFC #6) Merge this back into ReactComponentLifeCycles-test once\n- \/\/ the 'warnAboutDeprecatedLifecycles' feature flag has been removed.\n- it('warns about deprecated unsafe lifecycles', function() {\n- class MyComponent extends React.Component {\n- componentWillMount() {}\n- componentWillReceiveProps() {}\n- componentWillUpdate() {}\n- render() {\n- return null;\n- }\n- }\n-\n- const container = document.createElement('div');\n- expect(() =>\n- ReactDOM.render(, container),\n- ).toLowPriorityWarnDev(\n- [\n- 'componentWillMount is deprecated and will be removed in the next major version. ' +\n- 'Use componentDidMount instead. As a temporary workaround, ' +\n- 'you can rename to UNSAFE_componentWillMount.' +\n- '\\n\\nPlease update the following components: MyComponent',\n- 'componentWillReceiveProps is deprecated and will be removed in the next major version. ' +\n- 'Use static getDerivedStateFromProps instead.' +\n- '\\n\\nPlease update the following components: MyComponent',\n- 'componentWillUpdate is deprecated and will be removed in the next major version. ' +\n- 'Use componentDidUpdate instead. As a temporary workaround, ' +\n- 'you can rename to UNSAFE_componentWillUpdate.' +\n- '\\n\\nPlease update the following components: MyComponent',\n- ],\n- {withoutStack: true},\n- );\n-\n- \/\/ Dedupe check (update and instantiate new\n- ReactDOM.render(, container);\n- ReactDOM.render(, container);\n- });\n-\n- describe('react-lifecycles-compat', () => {\n- const {polyfill} = require('react-lifecycles-compat');\n-\n- it('should not warn for components with polyfilled getDerivedStateFromProps', () => {\n- class PolyfilledComponent extends React.Component {\n- state = {};\n- static getDerivedStateFromProps() {\n- return null;\n- }\n- render() {\n- return null;\n- }\n- }\n-\n- polyfill(PolyfilledComponent);\n-\n- const container = document.createElement('div');\n- ReactDOM.render(\n- \n- \n- <\/React.StrictMode>,\n- container,\n- );\n- });\n-\n- it('should not warn for components with polyfilled getSnapshotBeforeUpdate', () => {\n- class PolyfilledComponent extends React.Component {\n- getSnapshotBeforeUpdate() {\n- return null;\n- }\n- componentDidUpdate() {}\n- render() {\n- return null;\n- }\n- }\n-\n- polyfill(PolyfilledComponent);\n-\n- const container = document.createElement('div');\n- ReactDOM.render(\n- \n- \n- <\/React.StrictMode>,\n- container,\n- );\n- });\n- });\n-});\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactComponentLifeCycle-test.js b\/packages\/react-dom\/src\/__tests__\/ReactComponentLifeCycle-test.js\nindex 05c70bac3c..fd286f1e68 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactComponentLifeCycle-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactComponentLifeCycle-test.js\n@@ -702,8 +702,17 @@ describe('ReactComponentLifeCycle', () => {\n }\n \n const container = document.createElement('div');\n- expect(() => ReactDOM.render(, container)).toWarnDev(\n- 'Unsafe legacy lifecycles will not be called for components using new component APIs.',\n+ expect(() => {\n+ expect(() => ReactDOM.render(, container)).toWarnDev(\n+ 'Unsafe legacy lifecycles will not be called for components using new component APIs.',\n+ {withoutStack: true},\n+ );\n+ }).toLowPriorityWarnDev(\n+ [\n+ 'componentWillMount is deprecated',\n+ 'componentWillReceiveProps is deprecated',\n+ 'componentWillUpdate is deprecated',\n+ ],\n {withoutStack: true},\n );\n });\n@@ -730,8 +739,19 @@ describe('ReactComponentLifeCycle', () => {\n }\n \n const container = document.createElement('div');\n- expect(() => ReactDOM.render(, container)).toWarnDev(\n- 'Unsafe legacy lifecycles will not be called for components using new component APIs.',\n+ expect(() => {\n+ expect(() =>\n+ ReactDOM.render(, container),\n+ ).toWarnDev(\n+ 'Unsafe legacy lifecycles will not be called for components using new component APIs.',\n+ {withoutStack: true},\n+ );\n+ }).toLowPriorityWarnDev(\n+ [\n+ 'componentWillMount is deprecated',\n+ 'componentWillReceiveProps is deprecated',\n+ 'componentWillUpdate is deprecated',\n+ ],\n {withoutStack: true},\n );\n ReactDOM.render(, container);\n@@ -781,14 +801,21 @@ describe('ReactComponentLifeCycle', () => {\n }\n }\n \n- expect(() => ReactDOM.render(, container)).toWarnDev(\n- 'Unsafe legacy lifecycles will not be called for components using new component APIs.\\n\\n' +\n- 'AllLegacyLifecycles uses getDerivedStateFromProps() but also contains the following legacy lifecycles:\\n' +\n- ' componentWillMount\\n' +\n- ' UNSAFE_componentWillReceiveProps\\n' +\n- ' componentWillUpdate\\n\\n' +\n- 'The above lifecycles should be removed. Learn more about this warning here:\\n' +\n- 'https:\/\/fb.me\/react-async-component-lifecycle-hooks',\n+ expect(() => {\n+ expect(() =>\n+ ReactDOM.render(, container),\n+ ).toWarnDev(\n+ 'Unsafe legacy lifecycles will not be called for components using new component APIs.\\n\\n' +\n+ 'AllLegacyLifecycles uses getDerivedStateFromProps() but also contains the following legacy lifecycles:\\n' +\n+ ' componentWillMount\\n' +\n+ ' UNSAFE_componentWillReceiveProps\\n' +\n+ ' componentWillUpdate\\n\\n' +\n+ 'The above lifecycles should be removed. Learn more about this warning here:\\n' +\n+ 'https:\/\/fb.me\/react-async-component-lifecycle-hooks',\n+ {withoutStack: true},\n+ );\n+ }).toLowPriorityWarnDev(\n+ ['componentWillMount is deprecated', 'componentWillUpdate is deprecated'],\n {withoutStack: true},\n );\n \n@@ -824,15 +851,21 @@ describe('ReactComponentLifeCycle', () => {\n }\n }\n \n- expect(() => ReactDOM.render(, container)).toWarnDev(\n- 'Unsafe legacy lifecycles will not be called for components using new component APIs.\\n\\n' +\n- 'WillMountAndUpdate uses getDerivedStateFromProps() but also contains the following legacy lifecycles:\\n' +\n- ' componentWillMount\\n' +\n- ' UNSAFE_componentWillUpdate\\n\\n' +\n- 'The above lifecycles should be removed. Learn more about this warning here:\\n' +\n- 'https:\/\/fb.me\/react-async-component-lifecycle-hooks',\n- {withoutStack: true},\n- );\n+ expect(() => {\n+ expect(() =>\n+ ReactDOM.render(, container),\n+ ).toWarnDev(\n+ 'Unsafe legacy lifecycles will not be called for components using new component APIs.\\n\\n' +\n+ 'WillMountAndUpdate uses getDerivedStateFromProps() but also contains the following legacy lifecycles:\\n' +\n+ ' componentWillMount\\n' +\n+ ' UNSAFE_componentWillUpdate\\n\\n' +\n+ 'The above lifecycles should be removed. Learn more about this warning here:\\n' +\n+ 'https:\/\/fb.me\/react-async-component-lifecycle-hooks',\n+ {withoutStack: true},\n+ );\n+ }).toLowPriorityWarnDev(['componentWillMount is deprecated'], {\n+ withoutStack: true,\n+ });\n \n class WillReceiveProps extends React.Component {\n state = {};\n@@ -845,14 +878,18 @@ describe('ReactComponentLifeCycle', () => {\n }\n }\n \n- expect(() => ReactDOM.render(, container)).toWarnDev(\n- 'Unsafe legacy lifecycles will not be called for components using new component APIs.\\n\\n' +\n- 'WillReceiveProps uses getDerivedStateFromProps() but also contains the following legacy lifecycles:\\n' +\n- ' componentWillReceiveProps\\n\\n' +\n- 'The above lifecycles should be removed. Learn more about this warning here:\\n' +\n- 'https:\/\/fb.me\/react-async-component-lifecycle-hooks',\n- {withoutStack: true},\n- );\n+ expect(() => {\n+ expect(() => ReactDOM.render(, container)).toWarnDev(\n+ 'Unsafe legacy lifecycles will not be called for components using new component APIs.\\n\\n' +\n+ 'WillReceiveProps uses getDerivedStateFromProps() but also contains the following legacy lifecycles:\\n' +\n+ ' componentWillReceiveProps\\n\\n' +\n+ 'The above lifecycles should be removed. Learn more about this warning here:\\n' +\n+ 'https:\/\/fb.me\/react-async-component-lifecycle-hooks',\n+ {withoutStack: true},\n+ );\n+ }).toLowPriorityWarnDev(['componentWillReceiveProps is deprecated'], {\n+ withoutStack: true,\n+ });\n });\n \n it('should warn about deprecated lifecycles (cWM\/cWRP\/cWU) if new getSnapshotBeforeUpdate is present', () => {\n@@ -870,14 +907,21 @@ describe('ReactComponentLifeCycle', () => {\n }\n }\n \n- expect(() => ReactDOM.render(, container)).toWarnDev(\n- 'Unsafe legacy lifecycles will not be called for components using new component APIs.\\n\\n' +\n- 'AllLegacyLifecycles uses getSnapshotBeforeUpdate() but also contains the following legacy lifecycles:\\n' +\n- ' componentWillMount\\n' +\n- ' UNSAFE_componentWillReceiveProps\\n' +\n- ' componentWillUpdate\\n\\n' +\n- 'The above lifecycles should be removed. Learn more about this warning here:\\n' +\n- 'https:\/\/fb.me\/react-async-component-lifecycle-hooks',\n+ expect(() => {\n+ expect(() =>\n+ ReactDOM.render(, container),\n+ ).toWarnDev(\n+ 'Unsafe legacy lifecycles will not be called for components using new component APIs.\\n\\n' +\n+ 'AllLegacyLifecycles uses getSnapshotBeforeUpdate() but also contains the following legacy lifecycles:\\n' +\n+ ' componentWillMount\\n' +\n+ ' UNSAFE_componentWillReceiveProps\\n' +\n+ ' componentWillUpdate\\n\\n' +\n+ 'The above lifecycles should be removed. Learn more about this warning here:\\n' +\n+ 'https:\/\/fb.me\/react-async-component-lifecycle-hooks',\n+ {withoutStack: true},\n+ );\n+ }).toLowPriorityWarnDev(\n+ ['componentWillMount is deprecated', 'componentWillUpdate is deprecated'],\n {withoutStack: true},\n );\n \n@@ -911,15 +955,21 @@ describe('ReactComponentLifeCycle', () => {\n }\n }\n \n- expect(() => ReactDOM.render(, container)).toWarnDev(\n- 'Unsafe legacy lifecycles will not be called for components using new component APIs.\\n\\n' +\n- 'WillMountAndUpdate uses getSnapshotBeforeUpdate() but also contains the following legacy lifecycles:\\n' +\n- ' componentWillMount\\n' +\n- ' UNSAFE_componentWillUpdate\\n\\n' +\n- 'The above lifecycles should be removed. Learn more about this warning here:\\n' +\n- 'https:\/\/fb.me\/react-async-component-lifecycle-hooks',\n- {withoutStack: true},\n- );\n+ expect(() => {\n+ expect(() =>\n+ ReactDOM.render(, container),\n+ ).toWarnDev(\n+ 'Unsafe legacy lifecycles will not be called for components using new component APIs.\\n\\n' +\n+ 'WillMountAndUpdate uses getSnapshotBeforeUpdate() but also contains the following legacy lifecycles:\\n' +\n+ ' componentWillMount\\n' +\n+ ' UNSAFE_componentWillUpdate\\n\\n' +\n+ 'The above lifecycles should be removed. Learn more about this warning here:\\n' +\n+ 'https:\/\/fb.me\/react-async-component-lifecycle-hooks',\n+ {withoutStack: true},\n+ );\n+ }).toLowPriorityWarnDev(['componentWillMount is deprecated'], {\n+ withoutStack: true,\n+ });\n \n class WillReceiveProps extends React.Component {\n state = {};\n@@ -931,14 +981,18 @@ describe('ReactComponentLifeCycle', () => {\n }\n }\n \n- expect(() => ReactDOM.render(, container)).toWarnDev(\n- 'Unsafe legacy lifecycles will not be called for components using new component APIs.\\n\\n' +\n- 'WillReceiveProps uses getSnapshotBeforeUpdate() but also contains the following legacy lifecycles:\\n' +\n- ' componentWillReceiveProps\\n\\n' +\n- 'The above lifecycles should be removed. Learn more about this warning here:\\n' +\n- 'https:\/\/fb.me\/react-async-component-lifecycle-hooks',\n- {withoutStack: true},\n- );\n+ expect(() => {\n+ expect(() => ReactDOM.render(, container)).toWarnDev(\n+ 'Unsafe legacy lifecycles will not be called for components using new component APIs.\\n\\n' +\n+ 'WillReceiveProps uses getSnapshotBeforeUpdate() but also contains the following legacy lifecycles:\\n' +\n+ ' componentWillReceiveProps\\n\\n' +\n+ 'The above lifecycles should be removed. Learn more about this warning here:\\n' +\n+ 'https:\/\/fb.me\/react-async-component-lifecycle-hooks',\n+ {withoutStack: true},\n+ );\n+ }).toLowPriorityWarnDev(['componentWillReceiveProps is deprecated'], {\n+ withoutStack: true,\n+ });\n });\n \n it('calls effects on module-pattern component', function() {\n@@ -1072,7 +1126,16 @@ describe('ReactComponentLifeCycle', () => {\n }\n \n const div = document.createElement('div');\n- ReactDOM.render(, div);\n+ expect(() =>\n+ ReactDOM.render(, div),\n+ ).toLowPriorityWarnDev(\n+ [\n+ 'componentWillMount is deprecated',\n+ 'componentWillReceiveProps is deprecated',\n+ 'componentWillUpdate is deprecated',\n+ ],\n+ {withoutStack: true},\n+ );\n expect(log).toEqual(['componentWillMount', 'UNSAFE_componentWillMount']);\n \n log.length = 0;\n@@ -1324,4 +1387,87 @@ describe('ReactComponentLifeCycle', () => {\n \/\/ De-duped\n ReactDOM.render(, div);\n });\n+\n+ it('warns about deprecated unsafe lifecycles', function() {\n+ class MyComponent extends React.Component {\n+ componentWillMount() {}\n+ componentWillReceiveProps() {}\n+ componentWillUpdate() {}\n+ render() {\n+ return null;\n+ }\n+ }\n+\n+ const container = document.createElement('div');\n+ expect(() =>\n+ ReactDOM.render(, container),\n+ ).toLowPriorityWarnDev(\n+ [\n+ 'componentWillMount is deprecated and will be removed in the next major version. ' +\n+ 'Use componentDidMount instead. As a temporary workaround, ' +\n+ 'you can rename to UNSAFE_componentWillMount.' +\n+ '\\n\\nPlease update the following components: MyComponent',\n+ 'componentWillReceiveProps is deprecated and will be removed in the next major version. ' +\n+ 'Use static getDerivedStateFromProps instead.' +\n+ '\\n\\nPlease update the following components: MyComponent',\n+ 'componentWillUpdate is deprecated and will be removed in the next major version. ' +\n+ 'Use componentDidUpdate instead. As a temporary workaround, ' +\n+ 'you can rename to UNSAFE_componentWillUpdate.' +\n+ '\\n\\nPlease update the following components: MyComponent',\n+ ],\n+ {withoutStack: true},\n+ );\n+\n+ \/\/ Dedupe check (update and instantiate new\n+ ReactDOM.render(, container);\n+ ReactDOM.render(, container);\n+ });\n+\n+ describe('react-lifecycles-compat', () => {\n+ const {polyfill} = require('react-lifecycles-compat');\n+\n+ it('should not warn for components with polyfilled getDerivedStateFromProps', () => {\n+ class PolyfilledComponent extends React.Component {\n+ state = {};\n+ static getDerivedStateFromProps() {\n+ return null;\n+ }\n+ render() {\n+ return null;\n+ }\n+ }\n+\n+ polyfill(PolyfilledComponent);\n+\n+ const container = document.createElement('div');\n+ ReactDOM.render(\n+ \n+ \n+ <\/React.StrictMode>,\n+ container,\n+ );\n+ });\n+\n+ it('should not warn for components with polyfilled getSnapshotBeforeUpdate', () => {\n+ class PolyfilledComponent extends React.Component {\n+ getSnapshotBeforeUpdate() {\n+ return null;\n+ }\n+ componentDidUpdate() {}\n+ render() {\n+ return null;\n+ }\n+ }\n+\n+ polyfill(PolyfilledComponent);\n+\n+ const container = document.createElement('div');\n+ ReactDOM.render(\n+ \n+ \n+ <\/React.StrictMode>,\n+ container,\n+ );\n+ });\n+ });\n });\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMServerLifecycles-test.internal.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMServerLifecycles-test.internal.js\ndeleted file mode 100644\nindex 0e3f2a70ff..0000000000\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMServerLifecycles-test.internal.js\n+++ \/dev\/null\n@@ -1,120 +0,0 @@\n-\/**\n- * Copyright (c) Facebook, Inc. and its affiliates.\n- *\n- * This source code is licensed under the MIT license found in the\n- * LICENSE file in the root directory of this source tree.\n- *\n- * @emails react-core\n- *\/\n-\n-'use strict';\n-\n-let React;\n-let ReactFeatureFlags;\n-let ReactDOMServer;\n-\n-describe('ReactDOMServerLifecycles', () => {\n- beforeEach(() => {\n- ReactFeatureFlags = require('shared\/ReactFeatureFlags');\n- ReactFeatureFlags.warnAboutDeprecatedLifecycles = true;\n-\n- React = require('react');\n- ReactDOMServer = require('react-dom\/server');\n- });\n-\n- afterEach(() => {\n- jest.resetModules();\n- });\n-\n- it('should not invoke cWM if static gDSFP is present', () => {\n- class Component extends React.Component {\n- state = {};\n- static getDerivedStateFromProps() {\n- return null;\n- }\n- componentWillMount() {\n- throw Error('unexpected');\n- }\n- render() {\n- return null;\n- }\n- }\n-\n- expect(() =>\n- ReactDOMServer.renderToString(),\n- ).toLowPriorityWarnDev(\n- 'Component: componentWillMount() is deprecated and will be removed in the next major version.',\n- {withoutStack: true},\n- );\n- });\n-\n- \/\/ TODO (RFC #6) Merge this back into ReactDOMServerLifecycles-test once\n- \/\/ the 'warnAboutDeprecatedLifecycles' feature flag has been removed.\n- it('should warn about deprecated lifecycle hooks', () => {\n- class Component extends React.Component {\n- componentWillMount() {}\n- render() {\n- return null;\n- }\n- }\n-\n- expect(() =>\n- ReactDOMServer.renderToString(),\n- ).toLowPriorityWarnDev(\n- 'Warning: Component: componentWillMount() is deprecated and will be removed ' +\n- 'in the next major version.',\n- {withoutStack: true},\n- );\n-\n- \/\/ De-duped\n- ReactDOMServer.renderToString();\n- });\n-\n- describe('react-lifecycles-compat', () => {\n- const {polyfill} = require('react-lifecycles-compat');\n-\n- it('should not warn for components with polyfilled getDerivedStateFromProps', () => {\n- class PolyfilledComponent extends React.Component {\n- state = {};\n- static getDerivedStateFromProps() {\n- return null;\n- }\n- render() {\n- return null;\n- }\n- }\n-\n- polyfill(PolyfilledComponent);\n-\n- const container = document.createElement('div');\n- ReactDOMServer.renderToString(\n- \n- \n- <\/React.StrictMode>,\n- container,\n- );\n- });\n-\n- it('should not warn for components with polyfilled getSnapshotBeforeUpdate', () => {\n- class PolyfilledComponent extends React.Component {\n- getSnapshotBeforeUpdate() {\n- return null;\n- }\n- componentDidUpdate() {}\n- render() {\n- return null;\n- }\n- }\n-\n- polyfill(PolyfilledComponent);\n-\n- const container = document.createElement('div');\n- ReactDOMServer.renderToString(\n- \n- \n- <\/React.StrictMode>,\n- container,\n- );\n- });\n- });\n-});\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMServerLifecycles-test.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMServerLifecycles-test.js\nindex ad748e84e3..76230a3230 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMServerLifecycles-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMServerLifecycles-test.js\n@@ -227,7 +227,11 @@ describe('ReactDOMServerLifecycles', () => {\n }\n }\n \n- ReactDOMServer.renderToString();\n+ expect(() =>\n+ ReactDOMServer.renderToString(),\n+ ).toLowPriorityWarnDev('componentWillMount() is deprecated', {\n+ withoutStack: true,\n+ });\n expect(log).toEqual(['componentWillMount', 'UNSAFE_componentWillMount']);\n });\n \n@@ -265,4 +269,94 @@ describe('ReactDOMServerLifecycles', () => {\n {withoutStack: true},\n );\n });\n+\n+ it('should not invoke cWM if static gDSFP is present', () => {\n+ class Component extends React.Component {\n+ state = {};\n+ static getDerivedStateFromProps() {\n+ return null;\n+ }\n+ componentWillMount() {\n+ throw Error('unexpected');\n+ }\n+ render() {\n+ return null;\n+ }\n+ }\n+\n+ expect(() =>\n+ ReactDOMServer.renderToString(),\n+ ).toLowPriorityWarnDev(\n+ 'Component: componentWillMount() is deprecated and will be removed in the next major version.',\n+ {withoutStack: true},\n+ );\n+ });\n+\n+ it('should warn about deprecated lifecycle hooks', () => {\n+ class Component extends React.Component {\n+ componentWillMount() {}\n+ render() {\n+ return null;\n+ }\n+ }\n+\n+ expect(() =>\n+ ReactDOMServer.renderToString(),\n+ ).toLowPriorityWarnDev(\n+ 'Warning: Component: componentWillMount() is deprecated and will be removed ' +\n+ 'in the next major version.',\n+ {withoutStack: true},\n+ );\n+\n+ \/\/ De-duped\n+ ReactDOMServer.renderToString();\n+ });\n+\n+ describe('react-lifecycles-compat', () => {\n+ const {polyfill} = require('react-lifecycles-compat');\n+\n+ it('should not warn for components with polyfilled getDerivedStateFromProps', () => {\n+ class PolyfilledComponent extends React.Component {\n+ state = {};\n+ static getDerivedStateFromProps() {\n+ return null;\n+ }\n+ render() {\n+ return null;\n+ }\n+ }\n+\n+ polyfill(PolyfilledComponent);\n+\n+ const container = document.createElement('div');\n+ ReactDOMServer.renderToString(\n+ \n+ \n+ <\/React.StrictMode>,\n+ container,\n+ );\n+ });\n+\n+ it('should not warn for components with polyfilled getSnapshotBeforeUpdate', () => {\n+ class PolyfilledComponent extends React.Component {\n+ getSnapshotBeforeUpdate() {\n+ return null;\n+ }\n+ componentDidUpdate() {}\n+ render() {\n+ return null;\n+ }\n+ }\n+\n+ polyfill(PolyfilledComponent);\n+\n+ const container = document.createElement('div');\n+ ReactDOMServer.renderToString(\n+ \n+ \n+ <\/React.StrictMode>,\n+ container,\n+ );\n+ });\n+ });\n });\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactServerRenderingHydration-test.js b\/packages\/react-dom\/src\/__tests__\/ReactServerRenderingHydration-test.js\nindex c135cb221a..e28183e1b3 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactServerRenderingHydration-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactServerRenderingHydration-test.js\n@@ -358,11 +358,21 @@ describe('ReactDOMServerHydration', () => {\n );\n \n const element = document.createElement('div');\n- element.innerHTML = ReactDOMServer.renderToString(markup);\n+ expect(() => {\n+ element.innerHTML = ReactDOMServer.renderToString(markup);\n+ }).toLowPriorityWarnDev(\n+ ['componentWillMount() is deprecated and will be removed'],\n+ {withoutStack: true},\n+ );\n expect(element.textContent).toBe('Hi');\n \n- expect(() => ReactDOM.hydrate(markup, element)).toWarnDev(\n- 'Please update the following components to use componentDidMount instead: ComponentWithWarning',\n+ expect(() => {\n+ expect(() => ReactDOM.hydrate(markup, element)).toWarnDev(\n+ 'Please update the following components to use componentDidMount instead: ComponentWithWarning',\n+ );\n+ }).toLowPriorityWarnDev(\n+ ['componentWillMount is deprecated and will be removed'],\n+ {withoutStack: true},\n );\n expect(element.textContent).toBe('Hi');\n });\ndiff --git a\/packages\/react\/src\/__tests__\/ReactStrictMode-test.internal.js b\/packages\/react\/src\/__tests__\/ReactStrictMode-test.internal.js\nindex 7c0b308e67..14b33ce991 100644\n--- a\/packages\/react\/src\/__tests__\/ReactStrictMode-test.internal.js\n+++ b\/packages\/react\/src\/__tests__\/ReactStrictMode-test.internal.js\n@@ -411,20 +411,29 @@ describe('ReactStrictMode', () => {\n \n let rendered;\n \n- expect(\n- () => (rendered = ReactTestRenderer.create()),\n- ).toWarnDev(\n- 'Unsafe lifecycle methods were found within a strict-mode tree:' +\n- '\\n in ConcurrentMode (at **)' +\n- '\\n in SyncRoot (at **)' +\n- '\\n\\ncomponentWillMount: Please update the following components ' +\n- 'to use componentDidMount instead: AsyncRoot, Parent' +\n- '\\n\\ncomponentWillReceiveProps: Please update the following components ' +\n- 'to use static getDerivedStateFromProps instead: Child, Parent' +\n- '\\n\\ncomponentWillUpdate: Please update the following components ' +\n- 'to use componentDidUpdate instead: AsyncRoot, Parent' +\n- '\\n\\nLearn more about this warning here:' +\n- '\\nhttps:\/\/fb.me\/react-strict-mode-warnings',\n+ expect(() => {\n+ expect(\n+ () => (rendered = ReactTestRenderer.create()),\n+ ).toWarnDev(\n+ 'Unsafe lifecycle methods were found within a strict-mode tree:' +\n+ '\\n in ConcurrentMode (at **)' +\n+ '\\n in SyncRoot (at **)' +\n+ '\\n\\ncomponentWillMount: Please update the following components ' +\n+ 'to use componentDidMount instead: AsyncRoot, Parent' +\n+ '\\n\\ncomponentWillReceiveProps: Please update the following components ' +\n+ 'to use static getDerivedStateFromProps instead: Child, Parent' +\n+ '\\n\\ncomponentWillUpdate: Please update the following components ' +\n+ 'to use componentDidUpdate instead: AsyncRoot, Parent' +\n+ '\\n\\nLearn more about this warning here:' +\n+ '\\nhttps:\/\/fb.me\/react-strict-mode-warnings',\n+ );\n+ }).toLowPriorityWarnDev(\n+ [\n+ 'componentWillMount is deprecated',\n+ 'componentWillReceiveProps is deprecated',\n+ 'componentWillUpdate is deprecated',\n+ ],\n+ {withoutStack: true},\n );\n \n \/\/ Dedupe\n@@ -489,24 +498,28 @@ describe('ReactStrictMode', () => {\n \n let rendered;\n \n- expect(\n- () => (rendered = ReactTestRenderer.create()),\n- ).toWarnDev([\n- 'Unsafe lifecycle methods were found within a strict-mode tree:' +\n- '\\n in ConcurrentMode (at **)' +\n- '\\n in AsyncRootOne (at **)' +\n- '\\n in div (at **)' +\n- '\\n in SyncRoot (at **)' +\n- '\\n\\ncomponentWillMount: Please update the following components ' +\n- 'to use componentDidMount instead: Bar, Foo',\n- 'Unsafe lifecycle methods were found within a strict-mode tree:' +\n- '\\n in ConcurrentMode (at **)' +\n- '\\n in AsyncRootTwo (at **)' +\n- '\\n in div (at **)' +\n- '\\n in SyncRoot (at **)' +\n- '\\n\\ncomponentWillMount: Please update the following components ' +\n- 'to use componentDidMount instead: Baz',\n- ]);\n+ expect(() => {\n+ expect(\n+ () => (rendered = ReactTestRenderer.create()),\n+ ).toWarnDev([\n+ 'Unsafe lifecycle methods were found within a strict-mode tree:' +\n+ '\\n in ConcurrentMode (at **)' +\n+ '\\n in AsyncRootOne (at **)' +\n+ '\\n in div (at **)' +\n+ '\\n in SyncRoot (at **)' +\n+ '\\n\\ncomponentWillMount: Please update the following components ' +\n+ 'to use componentDidMount instead: Bar, Foo',\n+ 'Unsafe lifecycle methods were found within a strict-mode tree:' +\n+ '\\n in ConcurrentMode (at **)' +\n+ '\\n in AsyncRootTwo (at **)' +\n+ '\\n in div (at **)' +\n+ '\\n in SyncRoot (at **)' +\n+ '\\n\\ncomponentWillMount: Please update the following components ' +\n+ 'to use componentDidMount instead: Baz',\n+ ]);\n+ }).toLowPriorityWarnDev(['componentWillMount is deprecated'], {\n+ withoutStack: true,\n+ });\n \n \/\/ Dedupe\n rendered = ReactTestRenderer.create();\ndiff --git a\/packages\/react\/src\/__tests__\/createReactClassIntegration-test.internal.js b\/packages\/react\/src\/__tests__\/createReactClassIntegration-test.internal.js\nindex 16c10c370a..b1bd7c9b1c 100644\n--- a\/packages\/react\/src\/__tests__\/createReactClassIntegration-test.internal.js\n+++ b\/packages\/react\/src\/__tests__\/createReactClassIntegration-test.internal.js\n@@ -9,119 +9,24 @@\n \n 'use strict';\n \n-let React;\n-let ReactFeatureFlags;\n-let createReactClass;\n-\n describe('create-react-class-integration', () => {\n- beforeEach(() => {\n- jest.resetModules();\n-\n- ReactFeatureFlags = require('shared\/ReactFeatureFlags');\n- ReactFeatureFlags.warnAboutDeprecatedLifecycles = true;\n-\n- React = require('react');\n- createReactClass = require('create-react-class\/factory')(\n- React.Component,\n- React.isValidElement,\n- new React.Component().updater,\n- );\n- });\n-\n- \/\/ TODO (RFC #6) Merge this back into createReactClassIntegration-test once\n- \/\/ the 'warnAboutDeprecatedLifecycles' feature flag has been removed.\n- it('isMounted works', () => {\n- const ReactDOM = require('react-dom');\n-\n- const ops = [];\n- let instance;\n- const Component = createReactClass({\n- displayName: 'MyComponent',\n- mixins: [\n- {\n- UNSAFE_componentWillMount() {\n- this.log('mixin.componentWillMount');\n- },\n- componentDidMount() {\n- this.log('mixin.componentDidMount');\n- },\n- UNSAFE_componentWillUpdate() {\n- this.log('mixin.componentWillUpdate');\n- },\n- componentDidUpdate() {\n- this.log('mixin.componentDidUpdate');\n- },\n- componentWillUnmount() {\n- this.log('mixin.componentWillUnmount');\n- },\n- },\n- ],\n- log(name) {\n- ops.push(`${name}: ${this.isMounted()}`);\n- },\n- getInitialState() {\n- this.log('getInitialState');\n- return {};\n- },\n- UNSAFE_componentWillMount() {\n- this.log('componentWillMount');\n- },\n- componentDidMount() {\n- this.log('componentDidMount');\n- },\n- UNSAFE_componentWillUpdate() {\n- this.log('componentWillUpdate');\n- },\n- componentDidUpdate() {\n- this.log('componentDidUpdate');\n- },\n- componentWillUnmount() {\n- this.log('componentWillUnmount');\n- },\n- render() {\n- instance = this;\n- this.log('render');\n- return

;\n- },\n- });\n-\n- const container = document.createElement('div');\n-\n- expect(() => ReactDOM.render(, container)).toWarnDev(\n- 'Warning: MyComponent: isMounted is deprecated. Instead, make sure to ' +\n- 'clean up subscriptions and pending requests in componentWillUnmount ' +\n- 'to prevent memory leaks.',\n- {withoutStack: true},\n- );\n-\n- \/\/ Dedupe\n- ReactDOM.render(, container);\n-\n- ReactDOM.unmountComponentAtNode(container);\n- instance.log('after unmount');\n- expect(ops).toEqual([\n- 'getInitialState: false',\n- 'mixin.componentWillMount: false',\n- 'componentWillMount: false',\n- 'render: false',\n- 'mixin.componentDidMount: true',\n- 'componentDidMount: true',\n- 'mixin.componentWillUpdate: true',\n- 'componentWillUpdate: true',\n- 'render: true',\n- 'mixin.componentDidUpdate: true',\n- 'componentDidUpdate: true',\n- 'mixin.componentWillUnmount: true',\n- 'componentWillUnmount: true',\n- 'after unmount: false',\n- ]);\n- });\n-\n describe('ReactNative NativeMethodsMixin', () => {\n+ let React;\n let ReactNative;\n let NativeMethodsMixin;\n+ let createReactClass;\n \n beforeEach(() => {\n+ jest.resetModules();\n+\n+ React = require('react');\n+\n+ createReactClass = require('create-react-class\/factory')(\n+ React.Component,\n+ React.isValidElement,\n+ new React.Component().updater,\n+ );\n+\n ReactNative = require('react-native-renderer');\n NativeMethodsMixin =\n ReactNative.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED\ndiff --git a\/packages\/react\/src\/__tests__\/createReactClassIntegration-test.js b\/packages\/react\/src\/__tests__\/createReactClassIntegration-test.js\nindex efc2bf3ba4..36b6bb0477 100644\n--- a\/packages\/react\/src\/__tests__\/createReactClassIntegration-test.js\n+++ b\/packages\/react\/src\/__tests__\/createReactClassIntegration-test.js\n@@ -546,15 +546,24 @@ describe('create-react-class-integration', () => {\n });\n \n expect(() => {\n- ReactDOM.render(, document.createElement('div'));\n- }).toWarnDev(\n- 'Unsafe legacy lifecycles will not be called for components using new component APIs.\\n\\n' +\n- 'Component uses getDerivedStateFromProps() but also contains the following legacy lifecycles:\\n' +\n- ' componentWillMount\\n' +\n- ' componentWillReceiveProps\\n' +\n- ' componentWillUpdate\\n\\n' +\n- 'The above lifecycles should be removed. Learn more about this warning here:\\n' +\n- 'https:\/\/fb.me\/react-async-component-lifecycle-hooks',\n+ expect(() => {\n+ ReactDOM.render(, document.createElement('div'));\n+ }).toWarnDev(\n+ 'Unsafe legacy lifecycles will not be called for components using new component APIs.\\n\\n' +\n+ 'Component uses getDerivedStateFromProps() but also contains the following legacy lifecycles:\\n' +\n+ ' componentWillMount\\n' +\n+ ' componentWillReceiveProps\\n' +\n+ ' componentWillUpdate\\n\\n' +\n+ 'The above lifecycles should be removed. Learn more about this warning here:\\n' +\n+ 'https:\/\/fb.me\/react-async-component-lifecycle-hooks',\n+ {withoutStack: true},\n+ );\n+ }).toLowPriorityWarnDev(\n+ [\n+ 'componentWillMount is deprecated',\n+ 'componentWillReceiveProps is deprecated',\n+ 'componentWillUpdate is deprecated',\n+ ],\n {withoutStack: true},\n );\n ReactDOM.render(, document.createElement('div'));\n@@ -581,15 +590,24 @@ describe('create-react-class-integration', () => {\n });\n \n expect(() => {\n- ReactDOM.render(, document.createElement('div'));\n- }).toWarnDev(\n- 'Unsafe legacy lifecycles will not be called for components using new component APIs.\\n\\n' +\n- 'Component uses getSnapshotBeforeUpdate() but also contains the following legacy lifecycles:\\n' +\n- ' componentWillMount\\n' +\n- ' componentWillReceiveProps\\n' +\n- ' componentWillUpdate\\n\\n' +\n- 'The above lifecycles should be removed. Learn more about this warning here:\\n' +\n- 'https:\/\/fb.me\/react-async-component-lifecycle-hooks',\n+ expect(() => {\n+ ReactDOM.render(, document.createElement('div'));\n+ }).toWarnDev(\n+ 'Unsafe legacy lifecycles will not be called for components using new component APIs.\\n\\n' +\n+ 'Component uses getSnapshotBeforeUpdate() but also contains the following legacy lifecycles:\\n' +\n+ ' componentWillMount\\n' +\n+ ' componentWillReceiveProps\\n' +\n+ ' componentWillUpdate\\n\\n' +\n+ 'The above lifecycles should be removed. Learn more about this warning here:\\n' +\n+ 'https:\/\/fb.me\/react-async-component-lifecycle-hooks',\n+ {withoutStack: true},\n+ );\n+ }).toLowPriorityWarnDev(\n+ [\n+ 'componentWillMount is deprecated',\n+ 'componentWillReceiveProps is deprecated',\n+ 'componentWillUpdate is deprecated',\n+ ],\n {withoutStack: true},\n );\n ReactDOM.render(, document.createElement('div'));\n@@ -627,7 +645,16 @@ describe('create-react-class-integration', () => {\n });\n \n const div = document.createElement('div');\n- ReactDOM.render(, div);\n+ expect(() =>\n+ ReactDOM.render(, div),\n+ ).toLowPriorityWarnDev(\n+ [\n+ 'componentWillMount is deprecated',\n+ 'componentWillReceiveProps is deprecated',\n+ 'componentWillUpdate is deprecated',\n+ ],\n+ {withoutStack: true},\n+ );\n expect(log).toEqual(['componentWillMount', 'UNSAFE_componentWillMount']);\n \n log.length = 0;\n@@ -640,4 +667,89 @@ describe('create-react-class-integration', () => {\n 'UNSAFE_componentWillUpdate',\n ]);\n });\n+\n+ it('isMounted works', () => {\n+ const ops = [];\n+ let instance;\n+ const Component = createReactClass({\n+ displayName: 'MyComponent',\n+ mixins: [\n+ {\n+ UNSAFE_componentWillMount() {\n+ this.log('mixin.componentWillMount');\n+ },\n+ componentDidMount() {\n+ this.log('mixin.componentDidMount');\n+ },\n+ UNSAFE_componentWillUpdate() {\n+ this.log('mixin.componentWillUpdate');\n+ },\n+ componentDidUpdate() {\n+ this.log('mixin.componentDidUpdate');\n+ },\n+ componentWillUnmount() {\n+ this.log('mixin.componentWillUnmount');\n+ },\n+ },\n+ ],\n+ log(name) {\n+ ops.push(`${name}: ${this.isMounted()}`);\n+ },\n+ getInitialState() {\n+ this.log('getInitialState');\n+ return {};\n+ },\n+ UNSAFE_componentWillMount() {\n+ this.log('componentWillMount');\n+ },\n+ componentDidMount() {\n+ this.log('componentDidMount');\n+ },\n+ UNSAFE_componentWillUpdate() {\n+ this.log('componentWillUpdate');\n+ },\n+ componentDidUpdate() {\n+ this.log('componentDidUpdate');\n+ },\n+ componentWillUnmount() {\n+ this.log('componentWillUnmount');\n+ },\n+ render() {\n+ instance = this;\n+ this.log('render');\n+ return

;\n+ },\n+ });\n+\n+ const container = document.createElement('div');\n+\n+ expect(() => ReactDOM.render(, container)).toWarnDev(\n+ 'Warning: MyComponent: isMounted is deprecated. Instead, make sure to ' +\n+ 'clean up subscriptions and pending requests in componentWillUnmount ' +\n+ 'to prevent memory leaks.',\n+ {withoutStack: true},\n+ );\n+\n+ \/\/ Dedupe\n+ ReactDOM.render(, container);\n+\n+ ReactDOM.unmountComponentAtNode(container);\n+ instance.log('after unmount');\n+ expect(ops).toEqual([\n+ 'getInitialState: false',\n+ 'mixin.componentWillMount: false',\n+ 'componentWillMount: false',\n+ 'render: false',\n+ 'mixin.componentDidMount: true',\n+ 'componentDidMount: true',\n+ 'mixin.componentWillUpdate: true',\n+ 'componentWillUpdate: true',\n+ 'render: true',\n+ 'mixin.componentDidUpdate: true',\n+ 'componentDidUpdate: true',\n+ 'mixin.componentWillUnmount: true',\n+ 'componentWillUnmount: true',\n+ 'after unmount: false',\n+ ]);\n+ });\n });\ndiff --git a\/packages\/shared\/ReactFeatureFlags.js b\/packages\/shared\/ReactFeatureFlags.js\nindex 9ace0090d6..990dedf247 100644\n--- a\/packages\/shared\/ReactFeatureFlags.js\n+++ b\/packages\/shared\/ReactFeatureFlags.js\n@@ -23,7 +23,7 @@ export const debugRenderPhaseSideEffectsForStrictMode = __DEV__;\n export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;\n \n \/\/ Warn about deprecated, async-unsafe lifecycles; relates to RFC #6:\n-export const warnAboutDeprecatedLifecycles = false;\n+export const warnAboutDeprecatedLifecycles = true;\n \n \/\/ Gather advanced timing metrics for Profiler subtrees.\n export const enableProfilerTimer = __PROFILE__;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js b\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\nindex e264fd3a34..38e036682c 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\n@@ -16,7 +16,7 @@ export const debugRenderPhaseSideEffects = false;\n export const debugRenderPhaseSideEffectsForStrictMode = false;\n export const enableUserTimingAPI = __DEV__;\n export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;\n-export const warnAboutDeprecatedLifecycles = false;\n+export const warnAboutDeprecatedLifecycles = true;\n export const enableProfilerTimer = __PROFILE__;\n export const enableSchedulerTracing = __PROFILE__;\n export const enableSuspenseServerRenderer = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.persistent.js b\/packages\/shared\/forks\/ReactFeatureFlags.persistent.js\nindex 2b048a0822..e5dc81c58b 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.persistent.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.persistent.js\n@@ -15,7 +15,7 @@ import typeof * as PersistentFeatureFlagsType from '.\/ReactFeatureFlags.persiste\n export const debugRenderPhaseSideEffects = false;\n export const debugRenderPhaseSideEffectsForStrictMode = false;\n export const enableUserTimingAPI = __DEV__;\n-export const warnAboutDeprecatedLifecycles = false;\n+export const warnAboutDeprecatedLifecycles = true;\n export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;\n export const enableProfilerTimer = __PROFILE__;\n export const enableSchedulerTracing = __PROFILE__;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\nindex 4b5df2e904..97fc3164eb 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\n@@ -15,7 +15,7 @@ import typeof * as PersistentFeatureFlagsType from '.\/ReactFeatureFlags.persiste\n export const debugRenderPhaseSideEffects = false;\n export const debugRenderPhaseSideEffectsForStrictMode = false;\n export const enableUserTimingAPI = __DEV__;\n-export const warnAboutDeprecatedLifecycles = false;\n+export const warnAboutDeprecatedLifecycles = true;\n export const replayFailedUnitOfWorkWithInvokeGuardedCallback = false;\n export const enableProfilerTimer = false;\n export const enableSchedulerTracing = false;\n","body":"","files":[{"path":"packages\/react-dom\/src\/__tests__\/ReactComponentLifeCycle-test.internal.js","status":"D"},{"path":"packages\/react-dom\/src\/__tests__\/ReactComponentLifeCycle-test.js","status":"M"},{"path":"packages\/react-dom\/src\/__tests__\/ReactDOMServerLifecycles-test.internal.js","status":"D"},{"path":"packages\/react-dom\/src\/__tests__\/ReactDOMServerLifecycles-test.js","status":"M"},{"path":"packages\/react-dom\/src\/__tests__\/ReactServerRenderingHydration-test.js","status":"M"},{"path":"packages\/react\/src\/__tests__\/ReactStrictMode-test.internal.js","status":"M"},{"path":"packages\/react\/src\/__tests__\/createReactClassIntegration-test.internal.js","status":"M"},{"path":"packages\/react\/src\/__tests__\/createReactClassIntegration-test.js","status":"M"},{"path":"packages\/shared\/ReactFeatureFlags.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.native-oss.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.persistent.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js","status":"M"}],"commit":{"authorName":"Brian Vaughn","authorEmail":"brian.david.vaughn@gmail.com","revision":"d8cb10f11fa0b0ab6ded66bbef86dc874b5e2d90","shortRevision":"d8cb10f11f","subject":"Enabled warnAboutDeprecatedLifecycles flag by default (#15186)","authoredAt":"2019-03-27T16:30:49-07:00"},"parents":["80f8b0d5123981969997e07c071bdc6e3884ef58"]}

dillon1000/react

Files changed