Merge remote-tracking branch 'origin/master' into pointer-events

# Conflicts: # scripts/rollup/results.json
facebook · Apr 16, 2018 · 9548c1c · 9548c1c
2 parents da440d7 + 5dfbfe9
commit 9548c1c
Show file tree

Hide file tree

Showing 58 changed files with 1,114 additions and 1,033 deletions.
diff --git a/dangerfile.js b/dangerfile.js
@@ -117,14 +117,12 @@ function git(args) {
     previousBuildResults
   );
 
-  const percentToWarrentShowing = 1;
   const packagesToShow = results
     .filter(
       r =>
-        Math.abs(r.prevFileSizeChange) >= percentToWarrentShowing ||
-        Math.abs(r.prevGzipSizeChange) >= percentToWarrentShowing
+        Math.abs(r.prevFileSizeAbsoluteChange) >= 300 || // bytes
+        Math.abs(r.prevGzipSizeAbsoluteChange) >= 100 // bytes
     )
-
     .map(r => r.packageName);
 
   if (packagesToShow.length) {

diff --git a/packages/react-dom/src/__tests__/findDOMNode-test.js b/packages/react-dom/src/__tests__/findDOMNode-test.js
@@ -65,9 +65,7 @@ describe('findDOMNode', () => {
   it('findDOMNode should reject random objects', () => {
     expect(function() {
       ReactDOM.findDOMNode({foo: 'bar'});
-    }).toThrowError(
-      'Element appears to be neither ReactComponent nor DOMNode. Keys: foo',
-    );
+    }).toThrowError('Argument appears to not be a ReactComponent. Keys: foo');
   });
 
   it('findDOMNode should reject unmounted objects with render func', () => {

diff --git a/packages/react-dom/src/client/ReactDOM.js b/packages/react-dom/src/client/ReactDOM.js
@@ -1147,20 +1147,7 @@ const ReactDOM: Object = {
       return (componentOrElement: any);
     }
 
-    const inst = ReactInstanceMap.get(componentOrElement);
-    if (inst) {
-      return DOMRenderer.findHostInstance(inst);
-    }
-
-    if (typeof componentOrElement.render === 'function') {
-      invariant(false, 'Unable to find node on an unmounted component.');
-    } else {
-      invariant(
-        false,
-        'Element appears to be neither ReactComponent nor DOMNode. Keys: %s',
-        Object.keys(componentOrElement),
-      );
-    }
+    return DOMRenderer.findHostInstance(componentOrElement);
   },
 
   hydrate(element: React$Node, container: DOMContainer, callback: ?Function) {