Fix ART after Native -> Host rename
Ben Alpert committed
May 14, 2016 at 14:46 UTC
769ab715c23f6f1e2e8a917029ea7892f8b36ae9
5 files changed
+10
-5
gulpfile.js
+1
@@ -23,6 +23,7 @@ var paths = {
23
'!src/**/__benchmarks__/**/*.js',
24
'!src/**/__tests__/**/*.js',
25
'!src/**/__mocks__/**/*.js',
26
+ '!src/renderers/art/**/*.js',
27
'!src/shared/vendor/**/*.js',
28
],
29
lib: 'build/modules',
src/renderers/art/ReactART.js
+1
-1
@@ -6,7 +6,7 @@
6
* LICENSE file in the root directory of this source tree. An additional grant
7
* of patent rights can be found in the PATENTS file in the same directory.
8
*
9
- * @providesModule ReactARTFifteen
9
+ * @providesModule ReactART
10
*/
11
12
'use strict';
src/renderers/art/__tests__/ReactART-test.js
+2
-2
@@ -14,7 +14,7 @@
14
'use strict';
15
16
jest
17
- .unmock('ReactARTFifteen');
17
+ .unmock('ReactART');
18
19
var React = require('React');
20
var ReactDOM = require('ReactDOM');
@@ -27,7 +27,7 @@ var TestComponent;
27
28
var Missing = {};
29
30
-var ReactART = require('ReactARTFifteen');
30
+var ReactART = require('ReactART');
31
var ARTSVGMode = require('art/modes/svg');
32
var ARTCurrentMode = require('art/modes/current');
33
src/renderers/shared/stack/reconciler/ReactMultiChild.js
+1
-2
@@ -154,11 +154,10 @@ if (__DEV__) {
154
return inst._debugID;
155
};
156
setParentForInstrumentation = function(child) {
157
- invariant(child._debugID != null, 'mooooooooooooooooooo');
157
if (child._debugID !== 0) {
158
ReactInstrumentation.debugTool.onSetParent(
159
child._debugID,
161
- getDebugID(this._debugID)
160
+ getDebugID(this)
161
);
162
}
163
};
src/renderers/shared/stack/reconciler/instantiateReactComponent.js
+5
@@ -106,6 +106,11 @@ function instantiateReactComponent(node) {
106
// representations. I.e. ART. Once those are updated to use the string
107
// representation, we can drop this code path.
108
instance = new element.type(element);
109
+
110
+ // We renamed this. Allow the old name for compat. :(
111
+ if (!instance.getHostNode) {
112
+ instance.getHostNode = instance.getNativeNode;
113
+ }
114
} else {
115
instance = new ReactCompositeComponentWrapper(element);
116
}