diff --git a/gulpfile.js b/gulpfile.js index 452d0362c3..9a80c53b4e 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -23,6 +23,7 @@ var paths = { '!src/**/__benchmarks__/**/*.js', '!src/**/__tests__/**/*.js', '!src/**/__mocks__/**/*.js', + '!src/renderers/art/**/*.js', '!src/shared/vendor/**/*.js', ], lib: 'build/modules', diff --git a/src/renderers/art/ReactART.js b/src/renderers/art/ReactART.js index c1d61dbe37..e01df8939e 100644 --- a/src/renderers/art/ReactART.js +++ b/src/renderers/art/ReactART.js @@ -6,7 +6,7 @@ * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. * - * @providesModule ReactARTFifteen + * @providesModule ReactART */ 'use strict'; diff --git a/src/renderers/art/__tests__/ReactART-test.js b/src/renderers/art/__tests__/ReactART-test.js index 37a06a4d82..546a3cf296 100644 --- a/src/renderers/art/__tests__/ReactART-test.js +++ b/src/renderers/art/__tests__/ReactART-test.js @@ -14,7 +14,7 @@ 'use strict'; jest - .unmock('ReactARTFifteen'); + .unmock('ReactART'); var React = require('React'); var ReactDOM = require('ReactDOM'); @@ -27,7 +27,7 @@ var TestComponent; var Missing = {}; -var ReactART = require('ReactARTFifteen'); +var ReactART = require('ReactART'); var ARTSVGMode = require('art/modes/svg'); var ARTCurrentMode = require('art/modes/current'); diff --git a/src/renderers/shared/stack/reconciler/ReactMultiChild.js b/src/renderers/shared/stack/reconciler/ReactMultiChild.js index 70e39bcbff..96085235c7 100644 --- a/src/renderers/shared/stack/reconciler/ReactMultiChild.js +++ b/src/renderers/shared/stack/reconciler/ReactMultiChild.js @@ -154,11 +154,10 @@ if (__DEV__) { return inst._debugID; }; setParentForInstrumentation = function(child) { - invariant(child._debugID != null, 'mooooooooooooooooooo'); if (child._debugID !== 0) { ReactInstrumentation.debugTool.onSetParent( child._debugID, - getDebugID(this._debugID) + getDebugID(this) ); } }; diff --git a/src/renderers/shared/stack/reconciler/instantiateReactComponent.js b/src/renderers/shared/stack/reconciler/instantiateReactComponent.js index a66fc76ed3..bbedb68cfa 100644 --- a/src/renderers/shared/stack/reconciler/instantiateReactComponent.js +++ b/src/renderers/shared/stack/reconciler/instantiateReactComponent.js @@ -106,6 +106,11 @@ function instantiateReactComponent(node) { // representations. I.e. ART. Once those are updated to use the string // representation, we can drop this code path. instance = new element.type(element); + + // We renamed this. Allow the old name for compat. :( + if (!instance.getHostNode) { + instance.getHostNode = instance.getNativeNode; + } } else { instance = new ReactCompositeComponentWrapper(element); }