Hack around to fix RN bundle

facebook · Apr 4, 2017 · 59445a6 · 59445a6
1 parent 245c082
commit 59445a6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js
@@ -227,9 +227,11 @@ const bundles = [
     },
     entry: 'src/renderers/native/ReactNative.js',
     externals: [
+      'ExceptionsManager',
       'InitializeCore',
       'RCTEventEmitter',
       'UIManager',
+      'View',
       'deepDiffer',
       'flattenStyle',
       'TextInputState',

diff --git a/src/renderers/native/NativeMethodsMixin.js b/src/renderers/native/NativeMethodsMixin.js
@@ -21,8 +21,7 @@ var findNodeHandle = require('findNodeHandle');
 
 var ReactNative;
 
-// TODO: figure this out when we work on flat bundles in RN.
-// This might not be needed after all.
+// Works around a circular dependency in flat bundle.
 function injectReactNative(RN: $FlowFixMe) {
   ReactNative = RN;
 }
@@ -159,7 +158,6 @@ var NativeMethodsMixin = {
     TextInputState.blurTextInput(ReactNative.findNodeHandle(this));
   },
 
-  // Temporary hack to avoid a circular dependency
   __injectReactNative: injectReactNative,
 };
 

diff --git a/src/renderers/native/ReactNative.js b/src/renderers/native/ReactNative.js
@@ -12,12 +12,15 @@
 
 var ReactNativeFeatureFlags = require('ReactNativeFeatureFlags');
 var NativeMethodsMixin = require('NativeMethodsMixin');
+var takeSnapshot = require('takeSnapshot');
 
 var ReactNative = ReactNativeFeatureFlags.useFiber
   ? require('ReactNativeFiber')
   : require('ReactNativeStack');
 
+// Work around circular dependencies
 NativeMethodsMixin.__injectReactNative(ReactNative);
+takeSnapshot.__injectReactNative(ReactNative);
 
 ReactNative.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = {
   createReactNativeComponentClass: require('createReactNativeComponentClass'),

diff --git a/src/renderers/native/takeSnapshot.js b/src/renderers/native/takeSnapshot.js
@@ -11,9 +11,15 @@
  */
 'use strict';
 
-var ReactNative = require('ReactNative');
 var UIManager = require('UIManager');
 
+var ReactNative;
+
+// Works around a circular dependency in flat bundle.
+function injectReactNative(RN: $FlowFixMe) {
+  ReactNative = RN;
+}
+
 import type {Element} from 'React';
 
 /**
@@ -51,4 +57,6 @@ function takeSnapshot(
   return UIManager.__takeSnapshot(view, options);
 }
 
+takeSnapshot.__injectReactNative = injectReactNative;
+
 module.exports = takeSnapshot;