Fix trailing build issues (#7450)
Use relative path for addons UMD shim module Use explicit top level wrapper marker for top level elements
Sebastian Markbåge committed
Aug 9, 2016 at 12:52 UTC
34c4474472d6877f970c3763de4769d2b98718ab
3 files changed
+6
-6
grunt/config/browserify.js
+4
-2
@@ -19,7 +19,9 @@ var SECRET_INTERNALS_NAME = 'React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_
19
var shimSharedModules = globalShim.configure({
20
'./ReactCurrentOwner': SECRET_INTERNALS_NAME + '.ReactCurrentOwner',
21
'./ReactComponentTreeHook': SECRET_INTERNALS_NAME + '.ReactComponentTreeHook',
22
- // All these methods are shared are exposed.
22
+ // The methods we used here are exposed on the main React export.
23
+ // TODO: Change all renderer code to require the isomorphic React directly
24
+ // instead of these internals.
25
'./ReactElement': 'React',
26
'./ReactPropTypes': 'React.PropTypes',
27
'./ReactChildren': 'React.Children',
@@ -27,7 +29,7 @@ var shimSharedModules = globalShim.configure({
29
30
var shimDOMModules = aliasify.configure({
31
'aliases': {
30
- './ReactAddonsDOMDependencies': './build/modules/ReactAddonsDOMDependenciesUMDShim.js',
32
+ './ReactAddonsDOMDependencies': {relative: './ReactAddonsDOMDependenciesUMDShim'},
33
},
34
});
35
src/renderers/dom/client/ReactMount.js
+1
@@ -237,6 +237,7 @@ if (__DEV__) {
237
TopLevelWrapper.prototype.render = function() {
238
return this.props.child;
239
};
240
+TopLevelWrapper.isReactTopLevelWrapper = true;
241
242
/**
243
* Mounting is the process of initializing a React component by creating its
src/renderers/shared/stack/reconciler/ReactUpdates.js
+1
-4
@@ -160,10 +160,7 @@ function runBatchedUpdates(transaction) {
160
if (ReactFeatureFlags.logTopLevelRenders) {
161
var namedComponent = component;
162
// Duck type TopLevelWrapper. This is probably always true.
163
- if (
164
- component._currentElement.props.child ===
165
- component._renderedComponent._currentElement
166
- ) {
163
+ if (component._currentElement.type.isReactTopLevelWrapper) {
164
namedComponent = component._renderedComponent;
165
}
166
markerName = 'React update: ' + namedComponent.getName();