Applied recent changes to server rendering also

packages/react-dom/src/__tests__/ReactDOMServerLifecycles-test.internal.js

@@ -40,4 +40,30 @@ describe('ReactDOMServerLifecycles', () => {
     // De-duped
     ReactDOMServer.renderToString(<Component />);
   });
+
+  describe('react-lifecycles-compat', () => {
+    // TODO Replace this with react-lifecycles-compat once it's been published
+    function polyfill(Component) {
+      Component.prototype.componentWillMount = function() {};
+      Component.prototype.componentWillMount.__suppressDeprecationWarning = true;
+      Component.prototype.componentWillReceiveProps = function() {};
+      Component.prototype.componentWillReceiveProps.__suppressDeprecationWarning = true;
+    }
+
+    it('should not warn about deprecated cWM/cWRP for polyfilled components', () => {
+      class PolyfilledComponent extends React.Component {
+        state = {};
+        static getDerivedStateFromProps() {
+          return null;
+        }
+        render() {
+          return null;
+        }
+      }
+
+      polyfill(PolyfilledComponent);
+
+      ReactDOMServer.renderToString(<PolyfilledComponent />);
+    });
+  });
 });

packages/react-dom/src/__tests__/ReactDOMServerLifecycles-test.js

@@ -33,7 +33,7 @@ describe('ReactDOMServerLifecycles', () => {
     resetModules();
   });
 
-  it('should invoke the correct lifecycle hooks', () => {
+  it('should invoke the correct legacy lifecycle hooks', () => {
     const log = [];
 
     class Outer extends React.Component {
@@ -65,6 +65,59 @@ describe('ReactDOMServerLifecycles', () => {
     ]);
   });
 
+  it('should invoke the correct new lifecycle hooks', () => {
+    const log = [];
+
+    class Outer extends React.Component {
+      state = {};
+      static getDerivedStateFromProps() {
+        log.push('outer getDerivedStateFromProps');
+        return null;
+      }
+      render() {
+        log.push('outer render');
+        return <Inner />;
+      }
+    }
+
+    class Inner extends React.Component {
+      state = {};
+      static getDerivedStateFromProps() {
+        log.push('inner getDerivedStateFromProps');
+        return null;
+      }
+      render() {
+        log.push('inner render');
+        return null;
+      }
+    }
+
+    ReactDOMServer.renderToString(<Outer />);
+    expect(log).toEqual([
+      'outer getDerivedStateFromProps',
+      'outer render',
+      'inner getDerivedStateFromProps',
+      'inner render',
+    ]);
+  });
+
+  it('should not invoke cWM if static gDSFP is present', () => {
+    class Component extends React.Component {
+      state = {};
+      static getDerivedStateFromProps() {
+        return null;
+      }
+      UNSAFE_componentWillMount() {
+        throw Error('unexpected');
+      }
+      render() {
+        return null;
+      }
+    }
+
+    ReactDOMServer.renderToString(<Component />);
+  });
+
   it('should update instance.state with value returned from getDerivedStateFromProps', () => {
     class Grandparent extends React.Component {
       state = {

packages/react-dom/src/server/ReactPartialRenderer.js

@@ -514,7 +514,10 @@ function resolve(
     if (inst.UNSAFE_componentWillMount || inst.componentWillMount) {
       if (inst.componentWillMount) {
         if (__DEV__) {
-          if (warnAboutDeprecatedLifecycles) {
+          if (
+            warnAboutDeprecatedLifecycles &&
+            inst.componentWillMount.__suppressDeprecationWarning !== true
+          ) {
             const componentName = getComponentName(Component) || 'Unknown';
 
             if (!didWarnAboutDeprecatedWillMount[componentName]) {
@@ -534,8 +537,10 @@ function resolve(
           }
         }
 
-        inst.componentWillMount();
-      } else {
+        if (typeof Component.getDerivedStateFromProps !== 'function') {
+          inst.componentWillMount();
+        }
+      } else if (typeof Component.getDerivedStateFromProps !== 'function') {
         inst.UNSAFE_componentWillMount();
       }
       if (queue.length) {